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

don't duplicate checks in handshake selector 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-09-12 16:46:47 +10:00
parent 17b17cb2b9
commit 5a08e48fe7
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,13 +22,15 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.server.Handshaker; import org.eclipse.jetty.websocket.core.server.Handshaker;
import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
/**
* Selects between the two Handshaker implementations,
* RFC6455 (HTTP/1.1 WebSocket Upgrades)
* and RFC68441 (HTTP/2 WebSocket Upgrades)
*/
public class HandshakerSelector implements Handshaker public class HandshakerSelector implements Handshaker
{ {
private final RFC6455Handshaker rfc6455 = new RFC6455Handshaker(); private final RFC6455Handshaker rfc6455 = new RFC6455Handshaker();
@ -37,19 +39,8 @@ public class HandshakerSelector implements Handshaker
@Override @Override
public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, FrameHandler.Customizer defaultCustomizer) throws IOException public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, FrameHandler.Customizer defaultCustomizer) throws IOException
{ {
Request baseRequest = Request.getBaseRequest(request); // Try HTTP/1.1 WS upgrade, if this fails try an HTTP/2 WS upgrade if no response was committed.
String method = request.getMethod(); return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer) ||
HttpVersion httpVersion = baseRequest.getHttpVersion(); !response.isCommitted() && rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer);
if (HttpMethod.GET.is(method) && HttpVersion.HTTP_1_1.equals(httpVersion))
{
return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer);
}
else if (HttpMethod.CONNECT.is(method) && HttpVersion.HTTP_2.equals(httpVersion))
{
return rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer);
}
return false;
} }
} }