[patch] 2011-02-14_tc55_50744_JSSESocketFactory.patch

2011-02-14_tc55_50744_JSSESocketFactory.patch (text/plain), 1.95 KB, created by Konstantin Kolinko on 2011-02-14 10:04:07 UTC

(hide)

Description: 2011-02-14_tc55_50744_JSSESocketFactory.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2011-02-14 10:04:07 UTC

Size: 1.95 KB

patch

obsolete

>Index: connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java >=================================================================== >--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (revision 1070402) >+++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (working copy) >@@ -418,10 +418,21 @@ > */ > protected void checkConfig() throws IOException { > // Create an unbound server socket >- ServerSocket socket = >- JdkCompat.getJdkCompat().getUnboundSocket(sslProxy); >+ ServerSocket socket; >+ try { >+ socket = JdkCompat.getJdkCompat().getUnboundSocket(sslProxy); >+ } catch (IOException ex) { >+ // Bug 50744 - some old JDKs do not implement unbound sockets >+ if (log.isDebugEnabled()) { >+ log.debug(sm.getString("jsse.ssl_conf_unbound_socket"), ex); >+ } >+ return; >+ } > if (socket == null) { >- // Can create unbound sockets (1.3 JVM) - can't test the connection >+ // Can't create unbound sockets (1.3 JVM) - can't test the connection >+ if (log.isDebugEnabled()) { >+ log.debug(sm.getString("jsse.ssl_conf_unbound_socket")); >+ } > return; > } > initServerSocket(socket); >Index: connectors/util/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties >=================================================================== >--- connectors/util/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties (revision 1070402) >+++ connectors/util/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties (working copy) >@@ -15,3 +15,4 @@ > > jsse.alias_no_key_entry=Alias name {0} does not identify a key entry > jsse.invalid_ssl_conf=SSL configuration is invalid due to {0} >+jsse.ssl_conf_unbound_socket=Unable to create an unbound server socket. SSL configuration check will be skipped. View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]