[tomcat] 02/02: Back-port. Improve the handling of exceptions during TLS handshakes.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit afb73ad4385ab7f6c344e644b2ad60c753211bc3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 11 17:22:02 2018 +0000

    Back-port. Improve the handling of exceptions during TLS handshakes.
---
 java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java | 4 ++--
 webapps/docs/changelog.xml                                      | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java 
b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
index 0147b71..c844418 100644
--- a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
+++ b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
@@ -410,9 +410,9 @@ public class AsyncChannelWrapperSecure implements 
AsyncChannelWrapper {
                         }
                     }
                 }
-            } catch (SSLException | InterruptedException |
-                    ExecutionException e) {
+            } catch (Exception e) {
                 hFuture.fail(e);
+                return;
             }
 
             hFuture.complete(null);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fedb79c..c0fcc2a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -462,6 +462,14 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="WebSocket">
+    <changelog>
+      <fix>
+        Improve the handling of exceptions during TLS handshakes for the
+        WebSocket client. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Web applications">
     <changelog>
       <fix>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org