Implement #8057 103 Early Hint

Fixed flake. @sbordet please review this commit!
jetty · May 30, 2022 · 01bf0f4 · 01bf0f4
1 parent 9451723
commit 01bf0f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 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
@@ -187,9 +187,12 @@ private void process()
                 }
                 else if (read == 0)
                 {
-                    releaseNetworkBuffer();
-                    fillInterested();
-                    return;
+                    if (networkBuffer.isEmpty())
+                    {
+                        releaseNetworkBuffer();
+                        fillInterested();
+                        return;
+                    }
                 }
                 else
                 {
@@ -245,19 +248,22 @@ private boolean parse()
                 this.method = null;
                 if (getHttpChannel().isTunnel(method, status))
                     return true;
-            }
 
-            if (networkBuffer.isEmpty())
-                return false;
+                if (networkBuffer.isEmpty())
+                    return false;
 
-            if (complete)
-            {
-                // TODO this can clean a pipelined response after a 1xx
-                if (LOG.isDebugEnabled())
-                    LOG.debug("Discarding unexpected content after response: {}", networkBuffer);
-                networkBuffer.clear();
+                if (!HttpStatus.isInformational(status))
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("Discarding unexpected content after response {}: {}", status, networkBuffer);
+                    LOG.info("Discarding unexpected content after response {}: {}", status, networkBuffer);
+                    networkBuffer.clear();
+                }
                 return false;
             }
+
+            if (networkBuffer.isEmpty())
+                return false;
         }
     }
 

diff --git a/...ient-transport/src/test/java/org/eclipse/jetty/http/client/InformationalResponseTest.java b/...ient-transport/src/test/java/org/eclipse/jetty/http/client/InformationalResponseTest.java
@@ -222,10 +222,10 @@ public void onComplete(Result result)
         };
         scenario.client.newRequest(scenario.newURI())
             .method("GET")
-            .timeout(10, TimeUnit.SECONDS)
+            .timeout(5, TimeUnit.SECONDS)
             .send(listener);
 
-        assertTrue(complete.await(10, TimeUnit.SECONDS));
+        assertTrue(complete.await(5, TimeUnit.SECONDS));
         assertThat(response.get().getStatus(), is(200));
         assertThat(listener.getContentAsString(), is("OK"));
         assertThat(hints, contains("one", "two", "three"));