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

Issue #3530 - Warning on attempt to use WebSocket Bootstrap on HTTP/2 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-04-08 10:00:53 -05:00
parent 3eda16988c
commit dd5c2e315f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
View File

@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -514,7 +513,14 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
if (!"HTTP/1.1".equals(request.getProtocol())) if (!"HTTP/1.1".equals(request.getProtocol()))
{ {
LOG.debug("Not a 'HTTP/1.1' request (was [" + request.getProtocol() + "])"); if ("HTTP/2".equals(request.getProtocol()))
{
LOG.warn("WebSocket Bootstrap from HTTP/2 (RFC8441) not supported in Jetty 9.x");
}
else
{
LOG.warn("Not a 'HTTP/1.1' request (was [" + request.getProtocol() + "])");
}
return false; return false;
} }
@ -562,6 +568,7 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
{ {
throw new IllegalStateException("Not a 'WebSocket: Upgrade' request"); throw new IllegalStateException("Not a 'WebSocket: Upgrade' request");
} }
if (!"HTTP/1.1".equals(request.getHttpVersion())) if (!"HTTP/1.1".equals(request.getHttpVersion()))
{ {
throw new IllegalStateException("Not a 'HTTP/1.1' request"); throw new IllegalStateException("Not a 'HTTP/1.1' request");