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

fix build issues 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-09-12 11:04:05 +10:00
parent d69a1f0f58
commit 3068b4c8ae
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
View File

@ -408,9 +408,10 @@ public class HttpChannelOverHttp extends HttpChannel implements HttpParser.Reque
} }
@Override @Override
protected void checkAndPrepareUpgrade() protected boolean checkAndPrepareUpgrade()
{ {
// TODO: move the code from HttpConnection.upgrade() here? // TODO: move the code from HttpConnection.upgrade() here?
return false;
} }
/** /**

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
View File

@ -41,11 +41,11 @@ public class HandshakerSelector implements Handshaker
String method = request.getMethod(); String method = request.getMethod();
HttpVersion httpVersion = baseRequest.getHttpVersion(); HttpVersion httpVersion = baseRequest.getHttpVersion();
if (HttpMethod.GET.equals(method) && HttpVersion.HTTP_1_1.equals(httpVersion)) if (HttpMethod.GET.is(method) && HttpVersion.HTTP_1_1.equals(httpVersion))
{ {
return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer); return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer);
} }
else if (HttpMethod.CONNECT.equals(method) && HttpVersion.HTTP_2.equals(httpVersion)) else if (HttpMethod.CONNECT.is(method) && HttpVersion.HTTP_2.equals(httpVersion))
{ {
return rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer); return rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer);
} }