Revert "[fix] jruby hang with TLS due not executing task"

This reverts commit d1731a5.
kares · May 31, 2022 · 3c5727f · 3c5727f
1 parent d1731a5
commit 3c5727f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/ext/puma_http11/org/jruby/puma/MiniSSL.java b/ext/puma_http11/org/jruby/puma/MiniSSL.java
@@ -355,6 +355,14 @@ private SSLEngineResult doOp(SSLOperation sslOp, MiniSSLBuffer src, MiniSSLBuffe
       }
     }
 
+    // after each op, run any delegated tasks if needed
+    if(res.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+      Runnable runnable;
+      while ((runnable = engine.getDelegatedTask()) != null) {
+        runnable.run();
+      }
+    }
+
     return res;
   }
 
@@ -372,31 +380,25 @@ public IRubyObject read() {
 
       HandshakeStatus handshakeStatus = engine.getHandshakeStatus();
       boolean done = false;
+      SSLEngineResult res = null;
       while (!done) {
-        SSLEngineResult res;
         switch (handshakeStatus) {
           case NEED_WRAP:
             res = doOp(SSLOperation.WRAP, inboundAppData, outboundNetData);
-            handshakeStatus = res.getHandshakeStatus();
             break;
           case NEED_UNWRAP:
             res = doOp(SSLOperation.UNWRAP, inboundNetData, inboundAppData);
             if (res.getStatus() == Status.BUFFER_UNDERFLOW) {
               // need more data before we can shake more hands
               done = true;
             }
-            handshakeStatus = res.getHandshakeStatus();
-            break;
-          case NEED_TASK:
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-              runnable.run();
-            }
-            handshakeStatus = engine.getHandshakeStatus();
             break;
           default:
             done = true;
         }
+        if (!done) {
+          handshakeStatus = res.getHandshakeStatus();
+        }
       }
 
       if (inboundNetData.hasRemaining()) {