Author: remy.maucherat(a)jboss.com Date: 2008-12-08 07:10:50 -0500 (Mon, 08 Dec 2008) New Revision: 876 Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java trunk/webapps/docs/changelog.xml Log: - JSSE configuration for SSL session options. Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-12-05 17:07:59 UTC (rev 875) +++ trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-12-08 12:10:50 UTC (rev 876) @@ -49,6 +49,7 @@ import javax.net.ssl.SSLException; import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; +import javax.net.ssl.SSLSessionContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; @@ -88,6 +89,9 @@ private static final String defaultKeystoreFile = System.getProperty("user.home") + "/.keystore"; private static final String defaultKeyPass = "changeit"; + private static final int defaultSessionCacheSize = 0; + private static final int defaultSessionTimeout = 86400; + static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(JSSESocketFactory.class); @@ -413,6 +417,28 @@ trustAlgorithm), new SecureRandom()); + // Configure SSL session cache + int sessionCacheSize; + if (attributes.get("sessionCacheSize") != null) { + sessionCacheSize = Integer.parseInt( + (String)attributes.get("sessionCacheSize")); + } else { + sessionCacheSize = defaultSessionCacheSize; + } + int sessionCacheTimeout; + if (attributes.get("sessionCacheTimeout") != null) { + sessionCacheTimeout = Integer.parseInt( + (String)attributes.get("sessionCacheTimeout")); + } else { + sessionCacheTimeout = defaultSessionTimeout; + } + SSLSessionContext sessionContext = + context.getServerSessionContext(); + if (sessionContext != null) { + sessionContext.setSessionCacheSize(sessionCacheSize); + sessionContext.setSessionTimeout(sessionCacheTimeout); + } + // create proxy sslProxy = context.getServerSocketFactory(); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-12-05 17:07:59 UTC (rev 875) +++ trunk/webapps/docs/changelog.xml 2008-12-08 12:10:50 UTC (rev 876) @@ -69,6 +69,13 @@ </update> </changelog> </subsection> + <subsection name="Coyote"> + <changelog> + <fix> + JSSE configuration for SSL sessions. (markt) + </fix> + </changelog> + </subsection> <subsection name="Jasper"> <changelog> <fix>