Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated after merge to fix tests 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2019-08-27 11:33:06 +10:00
parent 5164f7bb41
commit 15e2f72264
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java
View File

@ -376,10 +376,9 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
}
@Override
protected void checkAndPrepareUpgrade()
protected boolean checkAndPrepareUpgrade()
{
if (isTunnel())
getHttpTransport().prepareUpgrade();
return isTunnel() && getHttpTransport().prepareUpgrade();
}
@Override

5
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java
View File

@ -322,7 +322,7 @@ public class HttpTransportOverHTTP2 implements HttpTransport
return transportCallback.onIdleTimeout(failure);
}
void prepareUpgrade()
boolean prepareUpgrade()
{
HttpChannelOverHTTP2 channel = (HttpChannelOverHTTP2)stream.getAttachment();
Request request = channel.getRequest();
@ -331,7 +331,8 @@ public class HttpTransportOverHTTP2 implements HttpTransport
endPoint.upgrade(connection);
stream.setAttachment(endPoint);
if (request.getHttpInput().hasContent())
channel.sendErrorOrAbort("Unexpected content in CONNECT request");
return channel.sendErrorOrAbort("Unexpected content in CONNECT request");
return true;
}
@Override

13
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -491,11 +491,15 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
if (sendErrorOrAbort("Insufficient content written"))
break;
}
// Check if an update is done (if so, do not close)
if (checkAndPrepareUpgrade())
break;
// TODO Currently a blocking/aborting consumeAll is done in the handling of the TERMINATED
// TODO Action triggered by the completed callback below. It would be possible to modify the
// TODO callback to do a non-blocking consumeAll at this point and only call completed when
// TODO that is done.
checkAndPrepareUpgrade();
// Set a close callback on the HttpOutput to make it an async callback
_response.closeOutput(Callback.from(_state::completed));
@ -731,9 +735,12 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
* response is sent back to the client.</p>
* <p>This avoids a race where the server is unprepared if the client sends
* data immediately after having received the upgrade response.</p>
* @return true if the channel is not complete and more processing is required,
* either because the upgrade has succeeded or sendError has been called.
*/
protected void checkAndPrepareUpgrade()
protected boolean checkAndPrepareUpgrade()
{
return false;
}
public void onCompleted()
@ -791,7 +798,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
if (handler != null)
content = handler.badMessageError(status, reason, fields);
sendResponse(new MetaData.Response(HttpVersion.HTTP_1_1, status, reason, fields, BufferUtil.length(content)), content, true);
sendResponse(new MetaData.Response(HttpVersion.HTTP_1_1, status, null, fields, BufferUtil.length(content)), content, true);
}
}
catch (IOException e)