Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-07-21 13:02:57 +10:00
commit f902181a83
2 changed files with 7 additions and 8 deletions

View File

@ -98,10 +98,12 @@ public abstract class NegotiatingServerConnectionFactory extends AbstractConnect
{
// Generate list of protocols that we can negotiate
negotiated = connector.getProtocols().stream()
.map(p->connector.getConnectionFactory(p))
.filter(f->!(f instanceof SslConnectionFactory)&&!(f instanceof NegotiatingServerConnectionFactory))
.map(p->p.getProtocol())
.collect(Collectors.toList());
.filter(p->
{
ConnectionFactory f=connector.getConnectionFactory(p);
return !(f instanceof SslConnectionFactory)&&!(f instanceof NegotiatingServerConnectionFactory);
})
.collect(Collectors.toList());
}
// if default protocol is not set, then it is either HTTP/1.1 or

View File

@ -249,10 +249,7 @@ public class SslContextFactory extends AbstractLifeCycle
{
setTrustAll(trustAll);
addExcludeProtocols("SSL", "SSLv2", "SSLv2Hello", "SSLv3");
setExcludeCipherSuites(
"^.*_RSA_.*_(MD5|SHA|SHA1)$",
"SSL_DHE_DSS_WITH_DES_CBC_SHA",
"SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA");
setExcludeCipherSuites("^.*_(MD5|SHA|SHA1)$");
}
/**