You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/04/23 23:57:58 UTC
svn commit: r1096244 - in /tomcat/trunk:
java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Sat Apr 23 21:57:58 2011
New Revision: 1096244
URL: http://svn.apache.org/viewvc?rev=1096244&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51095
Don't trigger a NullPointerException when the SSL handshake fails with the HTTP-APR connector.
Patch provided by Mike Glazer.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1096244&r1=1096243&r2=1096244&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sat Apr 23 21:57:58 2011
@@ -1681,6 +1681,7 @@ public class AprEndpoint extends Abstrac
// Close socket and pool
destroySocket(socket.getSocket().longValue());
socket = null;
+ return;
}
// Process the request from this socket
Handler.SocketState state = handler.process(socket);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1096244&r1=1096243&r2=1096244&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Apr 23 21:57:58 2011
@@ -120,6 +120,11 @@
calculating connection and keep-alive timeouts for the HTTP BIO
connector. (markt)
</fix>
+ <fix>
+ <bug>51095</bug>: Don't trigger a NullPointerException when the SSL
+ handshake fails with the HTTP-APR connector. Patch provided by Mike
+ Glazer. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org