Merge pull request #1278 from ropalka/UNDERTOW-2002

[UNDERTOW-2002] Fixing StackOverflowError upon AJP read timeout
undertow-io · Feb 5, 2022 · fca2af5 · fca2af5
2 parents 6ae481e + d5ed8b8
commit fca2af5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/io/undertow/server/protocol/ajp/AjpReadListener.java b/core/src/main/java/io/undertow/server/protocol/ajp/AjpReadListener.java
@@ -266,10 +266,12 @@ private void handleBadRequest() {
     }
 
     private void handleCPing() {
-        sendMessages(CPONG);
+        if (sendMessages(CPONG)) {
+            AjpReadListener.this.handleEvent(connection.getChannel().getSourceChannel());
+        }
     }
 
-    private void sendMessages(final byte[]... rawMessages) {
+    private boolean sendMessages(final byte[]... rawMessages) {
         state = new AjpRequestParseState();
         final StreamConnection underlyingChannel = connection.getChannel();
         underlyingChannel.getSourceChannel().suspendReads();
@@ -310,13 +312,14 @@ public void handleEvent(ConduitStreamSinkChannel channel) {
                         }
                     });
                     underlyingChannel.getSinkChannel().resumeWrites();
-                    return;
+                    return false;
                 }
             } while (buffer.hasRemaining());
-            AjpReadListener.this.handleEvent(underlyingChannel.getSourceChannel());
+            return true;
         } catch (IOException e) {
             UndertowLogger.REQUEST_IO_LOGGER.ioException(e);
             safeClose(connection);
+            return false;
         }
     }