From 61c9895a783d6fd7dc3d801ed38e103793d697a1 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 23 Apr 2011 21:57:58 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1096244 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/AprEndpoint.java | 1 + webapps/docs/changelog.xml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 6f4cb65aa..e26a9388d 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -1681,6 +1681,7 @@ public class AprEndpoint extends AbstractEndpoint { // Close socket and pool destroySocket(socket.getSocket().longValue()); socket = null; + return; } // Process the request from this socket Handler.SocketState state = handler.process(socket); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 28548fab9..c1a5647ae 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -120,6 +120,11 @@ calculating connection and keep-alive timeouts for the HTTP BIO connector. (markt) + + 51095: Don't trigger a NullPointerException when the SSL + handshake fails with the HTTP-APR connector. Patch provided by Mike + Glazer. (markt) + -- 2.11.0