fix #4660: incrementing the fetch for ping/pong

eclipse-vertx · Apr 14, 2023 · 6d6d440 · 6d6d440
1 parent 800bc18
commit 6d6d440
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java b/src/main/java/io/vertx/core/http/impl/WebSocketImplBase.java
@@ -547,6 +547,10 @@ private void receiveFrame(WebSocketFrameInternal frame) {
           context.dispatch(frame.binaryData(), handler);
         }
         break;
+      case PING:
+      case PONG:
+        fetch(1);
+        break;
     }
   }
 

diff --git a/src/test/java/io/vertx/core/http/WebSocketTest.java b/src/test/java/io/vertx/core/http/WebSocketTest.java
@@ -2480,6 +2480,31 @@ public void testServerWebSocketPingPong() {
     }));
     await();
   }
+
+  @Test
+  public void testWebSocketPausePing() throws InterruptedException {
+    server = vertx.createHttpServer(new HttpServerOptions().setIdleTimeout(1).setPort(DEFAULT_HTTP_PORT).setHost(HttpTestBase.DEFAULT_HTTP_HOST));
+    server.webSocketHandler(ws -> {
+      ws.pongHandler(buff -> {
+        assertEquals("ping", buff.toString());
+        ws.close();
+      });
+      ws.writePing(Buffer.buffer("ping"));
+    }).listen(onSuccess(v -> {
+      client = vertx.createHttpClient();
+      client.webSocket(DEFAULT_HTTP_PORT, HttpTestBase.DEFAULT_HTTP_HOST, "/").onComplete(onSuccess(ws -> {
+        ws.pause();
+        ws.handler(buff -> {
+          fail("Should not receive a buffer");
+        });
+        ws.fetch(1);
+        ws.endHandler(v2 -> {
+          testComplete();
+        });
+      }));
+    }));
+    await();
+  }
 
   @Test
   public void testServerWebSocketPingExceeds125Bytes() {