diff --git a/VERSION.txt b/VERSION.txt index 1308011f5ae..791982737c3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -3,6 +3,7 @@ jetty-7.2-SNAPSHOT + 319370 WebAppClassLoader.Context + 319519 Warn about duplicate configuration files + 319655 Reset HEAD status + + JETTY-1245 Do not use direct buffers with NIO SSL + JETTY-1247 synchronize recylcing of SSL NIO buffers + JETTY-1249 Apply max idle time to all connectors + JETTY-1251 Replace then close selector for JVM bugs diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java index bafd48363af..cc91ff798b2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java @@ -89,22 +89,11 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements private SSLContext _context; Buffers _sslBuffers; - - /** - * Return the chain of X509 certificates used to negotiate the SSL Session. - *
- * Note: in order to do this we must convert a
- * javax.security.cert.X509Certificate[], as used by JSSE to a
- * java.security.cert.X509Certificate[],as required by the Servlet specs.
- *
- * @param sslSession
- * the javax.net.ssl.SSLSession to use as the source of the
- * cert chain.
- * @return the chain of java.security.cert.X509Certificates used to
- * negotiate the SSL connection.
- * Will be null if the chain is missing or empty.
- */
-
+ /* ------------------------------------------------------------ */
+ public SslSelectChannelConnector()
+ {
+ setUseDirectBuffers(false);
+ }
/* ------------------------------------------------------------ */
/**
@@ -145,11 +134,6 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
SslCertificates.customize(sslSession,endpoint,request);
}
- /* ------------------------------------------------------------ */
- public SslSelectChannelConnector()
- {
- }
-
/* ------------------------------------------------------------ */
/**
* @return True if SSL re-negotiation is allowed (default false)