JETTY-1245 Do not use direct buffers with NIO SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2118 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
1fe1ca1b35
commit
b3ef44b8ce
|
@ -3,6 +3,7 @@ jetty-7.2-SNAPSHOT
|
||||||
+ 319370 WebAppClassLoader.Context
|
+ 319370 WebAppClassLoader.Context
|
||||||
+ 319519 Warn about duplicate configuration files
|
+ 319519 Warn about duplicate configuration files
|
||||||
+ 319655 Reset HEAD status
|
+ 319655 Reset HEAD status
|
||||||
|
+ JETTY-1245 Do not use direct buffers with NIO SSL
|
||||||
+ JETTY-1247 synchronize recylcing of SSL NIO buffers
|
+ JETTY-1247 synchronize recylcing of SSL NIO buffers
|
||||||
+ JETTY-1249 Apply max idle time to all connectors
|
+ JETTY-1249 Apply max idle time to all connectors
|
||||||
+ JETTY-1251 Replace then close selector for JVM bugs
|
+ JETTY-1251 Replace then close selector for JVM bugs
|
||||||
|
|
|
@ -89,22 +89,11 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
|
||||||
private SSLContext _context;
|
private SSLContext _context;
|
||||||
Buffers _sslBuffers;
|
Buffers _sslBuffers;
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------ */
|
||||||
/**
|
public SslSelectChannelConnector()
|
||||||
* Return the chain of X509 certificates used to negotiate the SSL Session.
|
{
|
||||||
* <p>
|
setUseDirectBuffers(false);
|
||||||
* 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. <br>
|
|
||||||
* Will be null if the chain is missing or empty.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
/**
|
/**
|
||||||
|
@ -145,11 +134,6 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
|
||||||
SslCertificates.customize(sslSession,endpoint,request);
|
SslCertificates.customize(sslSession,endpoint,request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
public SslSelectChannelConnector()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
/**
|
/**
|
||||||
* @return True if SSL re-negotiation is allowed (default false)
|
* @return True if SSL re-negotiation is allowed (default false)
|
||||||
|
|
Loading…
Reference in New Issue