8282600: SSLSocketImpl should not use user_canceled workaround when n…

…ot necessary Backport-of: 7e88ff8a82cefa2a20acc9d5a9e42858d60fe3a3
openjdk · Nov 2, 2022 · eef3c96 · eef3c96 · openjdk-notifier · Nov 2, 2022
1 parent e609398
commit eef3c96
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -639,8 +639,12 @@ private void duplexCloseOutput() throws IOException {
             if (!conContext.protocolVersion.useTLS13PlusSpec()) {
                 hasCloseReceipt = true;
             } else {
-                // Use a user_canceled alert for TLS 1.3 duplex close.
-                useUserCanceled = true;
+                // Do not use user_canceled workaround if the other side has
+                // already half-closed the connection
+                if (!conContext.isInboundClosed()) {
+                    // Use a user_canceled alert for TLS 1.3 duplex close.
+                    useUserCanceled = true;
+                }
             }
         } else if (conContext.handshakeContext != null) {   // initial handshake
             // Use user_canceled alert regardless the protocol versions.