Started analysis for HTTP/2.

Signed-off-by: Simone Bordet <[email protected]>

Author: sbordet

jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java

@@ -306,7 +306,7 @@ public void send(MetaData.Request request, MetaData.Response response, boolean l
             sendContent(request, content, last, callback);
     }
 
-    private void sendHeaders(MetaData.Request request, MetaData.Response response, ByteBuffer content, boolean last, Callback callback)
+    private void sendHeaders(MetaData.Request request, MetaData.Response response, ByteBuffer byteBuffer, boolean last, Callback callback)
     {
         _responseMetaData = response;
 
@@ -315,7 +315,9 @@ private void sendHeaders(MetaData.Request request, MetaData.Response response, B
         HeadersFrame trailersFrame = null;
 
         boolean isHeadRequest = HttpMethod.HEAD.is(request.getMethod());
-        boolean hasContent = BufferUtil.hasContent(content) && !isHeadRequest;
+        Object content = byteBuffer == Content.Sink.TRANSFER ? response.getContentSource() : byteBuffer;
+        long contentLength = byteBuffer == Content.Sink.TRANSFER ? response.getContentSource().getLength() : BufferUtil.length(byteBuffer);
+        boolean hasContent = contentLength > 0 && !isHeadRequest;
         int streamId = _stream.getId();
         if (HttpStatus.isInterim(response.getStatus()))
         {
@@ -334,20 +336,19 @@ private void sendHeaders(MetaData.Request request, MetaData.Response response, B
             committed = true;
             if (last)
             {
-                long realContentLength = BufferUtil.length(content);
-                long contentLength = response.getContentLength();
-                if (contentLength < 0)
+                long responseContentLength = response.getContentLength();
+                if (responseContentLength < 0)
                 {
                     _responseMetaData = new MetaData.Response(
                         response.getStatus(), response.getReason(), response.getHttpVersion(),
                         response.getHttpFields(),
-                        realContentLength,
+                        contentLength,
                         response.getTrailersSupplier()
                     );
                 }
-                else if (hasContent && contentLength != realContentLength)
+                else if (hasContent && responseContentLength != contentLength)
                 {
-                    callback.failed(new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, String.format("Incorrect Content-Length %d!=%d", contentLength, realContentLength)));
+                    callback.failed(new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, String.format("Incorrect Content-Length %d!=%d", responseContentLength, contentLength)));
                     return;
                 }
             }
@@ -360,17 +361,17 @@ else if (hasContent && contentLength != realContentLength)
                     HttpFields trailers = retrieveTrailers();
                     if (trailers == null)
                     {
-                        dataFrame = new DataFrame(streamId, content, true);
+                        dataFrame = new DataFrame(streamId, byteBuffer, true);
                     }
                     else
                     {
-                        dataFrame = new DataFrame(streamId, content, false);
+                        dataFrame = new DataFrame(streamId, byteBuffer, false);
                         trailersFrame = new HeadersFrame(streamId, new MetaData(HttpVersion.HTTP_2, trailers), null, true);
                     }
                 }
                 else
                 {
-                    dataFrame = new DataFrame(streamId, content, false);
+                    dataFrame = new DataFrame(streamId, byteBuffer, false);
                 }
             }
             else

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java

@@ -97,6 +97,8 @@ protected void onIdleExpired(TimeoutException timeout)
         super.onIdleExpired(timeout);
     }
 
+    // TODO: override onFail()
+
     @Override
     public SocketAddress getRemoteSocketAddress()
     {

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java

@@ -1256,9 +1256,7 @@ public void setTrailersSupplier(Supplier<HttpFields> trailers)
         @Override
         public void write(boolean last, ByteBuffer content, Callback callback)
         {
-            long length = BufferUtil.length(content);
-            if (length == 0 && _source != null)
-                length = _source.getLength();
+            long length = content == Content.Sink.TRANSFER ? _source.getLength() : BufferUtil.length(content);
 
             HttpChannelState httpChannelState;
             HttpStream stream;

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java

@@ -945,7 +945,7 @@ public Action process() throws Exception
                             default:
                                 Content.Source source = _info.getContentSource();
                                 if (source != null)
-                                    Content.copy(source, source.getLength(), _lastContent, getEndPoint(), this);
+                                    Content.transfer(source, source.getLength(), getEndPoint(), this);
                                 else
                                     succeeded();
                         }

jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ResponseContentSourceTest.java

@@ -64,7 +64,7 @@ public boolean handle(Request request, Response response, Callback callback)
 
         ContentResponse response = new CompletableResponseListener(client.newRequest(newURI(transportType)), contentLength)
             .send()
-            .get(5, TimeUnit.SECONDS);
+            .get(555, TimeUnit.SECONDS);
 
         assertEquals(HttpStatus.OK_200, response.getStatus());
         assertEquals(contentLength, response.getContent().length);