Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Sep 14, 2020 · c9cd27e · c9cd27e
1 parent 48a8e2f
commit c9cd27e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
@@ -52,6 +52,7 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
     private boolean shutdown;
     private boolean complete;
     private boolean unsolicited;
+    private int status;
 
     public HttpReceiverOverHTTP(HttpChannelOverHTTP channel)
     {
@@ -132,17 +133,18 @@ private void releaseNetworkBuffer()
 
     protected ByteBuffer onUpgradeFrom()
     {
+        ByteBuffer upgradeBuffer = null;
         if (networkBuffer.hasRemaining())
         {
             HttpClient client = getHttpDestination().getHttpClient();
-            ByteBuffer upgradeBuffer = BufferUtil.allocate(networkBuffer.remaining(), client.isUseInputDirectByteBuffers());
+            upgradeBuffer = BufferUtil.allocate(networkBuffer.remaining(), client.isUseInputDirectByteBuffers());
             BufferUtil.clearToFill(upgradeBuffer);
             BufferUtil.put(networkBuffer.getBuffer(), upgradeBuffer);
             BufferUtil.flipToFlush(upgradeBuffer, 0);
-            return upgradeBuffer;
         }
+
         releaseNetworkBuffer();
-        return null;
+        return upgradeBuffer;
     }
 
     private void process()
@@ -230,15 +232,19 @@ private boolean parse()
             if (LOG.isDebugEnabled())
                 LOG.debug("Parse complete={}, remaining {} {}", complete, networkBuffer.remaining(), parser);
 
+            if (complete)
+            {
+                int status = this.status;
+                this.status = 0;
+                if (status == HttpStatus.SWITCHING_PROTOCOLS_101)
+                    return true;
+            }
+
             if (networkBuffer.isEmpty())
                 return false;
 
             if (complete)
             {
-                HttpExchange httpExchange = getHttpExchange();
-                if (httpExchange != null && httpExchange.getResponse().getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101)
-                    return true;
-
                 if (LOG.isDebugEnabled())
                     LOG.debug("Discarding unexpected content after response: {}", networkBuffer);
                 networkBuffer.clear();
@@ -281,6 +287,7 @@ public void startResponse(HttpVersion version, int status, String reason)
         if (exchange == null)
             return;
 
+        this.status = status;
         String method = exchange.getRequest().getMethod();
         parser.setHeadResponse(HttpMethod.HEAD.is(method) ||
             (HttpMethod.CONNECT.is(method) && status == HttpStatus.OK_200));

diff --git a/...ests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java b/...ests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java
@@ -116,7 +116,7 @@ public void onOpen(CoreSession coreSession, Callback callback)
         serverSocket.getOutputStream().write(toByteArray(closeFrame));
 
         // First payload sent with upgrade request, delay to ensure HttpConnection is not still reading from network.
-        Thread.sleep(4000);
+        Thread.sleep(1000);
         onOpenWait.countDown();
         assertTrue(clientEndpoint.openLatch.await(5, TimeUnit.SECONDS));
         assertThat(clientEndpoint.textMessages.poll(5, TimeUnit.SECONDS), is("first message payload"));