Fixes #3766 - Introduce HTTP/2 API to batch frames.

Fixed HttpTransportOverHTTP2.sendHeaders() - HEADERS frame for trailers was missing the stream id. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Sep 1, 2020 · 7822cc5 · 7822cc5
1 parent 97a8a15
commit 7822cc5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...tp2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java b/...tp2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java
@@ -148,7 +148,7 @@ else if (hasContent && contentLength != realContentLength)
                         else
                         {
                             dataFrame = new DataFrame(stream.getId(), content, false);
-                            trailersFrame = new HeadersFrame(new MetaData(HttpVersion.HTTP_2, trailers), null, true);
+                            trailersFrame = new HeadersFrame(stream.getId(), new MetaData(HttpVersion.HTTP_2, trailers), null, true);
                         }
                     }
                     else
@@ -168,7 +168,7 @@ else if (hasContent && contentLength != realContentLength)
                         else
                         {
                             headersFrame = new HeadersFrame(stream.getId(), info, null, false);
-                            trailersFrame = new HeadersFrame(new MetaData(HttpVersion.HTTP_2, trailers), null, true);
+                            trailersFrame = new HeadersFrame(stream.getId(), new MetaData(HttpVersion.HTTP_2, trailers), null, true);
                         }
                     }
                     else