Author: remm
Date: Fri Jul 17 11:14:31 2015
New Revision: 1691517
URL: http://svn.apache.org/r1691517
Log:
Remove bad NPN protocol list.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1691517&r1=1691516&r2=1691517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Fri Jul 17 11:14:31 2015
@@ -396,10 +396,6 @@ public class OpenSSLContext implements o
}
});
}
- String[] protos = new
OpenSSLProtocols(enabledProtocol).getProtocols();
- SSLContext.setNpnProtos(ctx, protos,
SSL.SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL);
-
- sessionContext = new OpenSSLServerSessionContext(ctx);
if (negotiableProtocols != null && negotiableProtocols.size() > 0)
{
byte[] protocols = buildAlpnConfig(negotiableProtocols);
@@ -408,6 +404,7 @@ public class OpenSSLContext implements o
}
}
+ sessionContext = new OpenSSLServerSessionContext(ctx);
sslHostConfig.setOpenSslContext(Long.valueOf(ctx));
initialized = true;
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
