[tomcat] branch 9.0.x updated: Further fix for BZ 66508

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 17bef2420b Further fix for BZ 66508
17bef2420b is described below

commit 17bef2420b20b4c12f2618397fea8917833deea1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 16 14:41:44 2023 +0000

    Further fix for BZ 66508
    
    Address the other code path where error handling needs to clear any
    in-progress write before trying to write a close message.
    
    https://bz.apache.org/bugzilla/show_bug.cgi?id=66508
---
 java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 12ee14835f..3cae80d730 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -173,6 +173,8 @@ public class WsHttpUpgradeHandler implements 
InternalHttpUpgradeHandler {
                 }
                 break;
             case ERROR:
+                // Need to clear any in-progress writes before trying to send 
a close frame
+                wsRemoteEndpointServer.clearHandler(socketWrapper.getError(), 
false);
                 String msg = sm.getString("wsHttpUpgradeHandler.closeOnError");
                 wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, msg),
                         new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg));


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