Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-06 13:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6698 from eclipse/jetty-10.0.x-6696-WebSocketUpgradeRequest

Browse Source 
Issue #6696 - don't keep Request object in the WebSocketNegotiation after upgrade
This commit is contained in:
Lachlan 2021-09-08 19:03:54 +10:00 committed by GitHub
commit aa75d0430c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
View File

@ -31,10 +31,10 @@ import org.eclipse.jetty.websocket.core.WebSocketComponents;
public abstract class WebSocketNegotiation public abstract class WebSocketNegotiation
{ {
private final Request baseRequest;
private final HttpServletRequest request; private final HttpServletRequest request;
private final HttpServletResponse response; private final HttpServletResponse response;
private final WebSocketComponents components; private final WebSocketComponents components;
private Request baseRequest;
private String version; private String version;
private List<ExtensionConfig> offeredExtensions; private List<ExtensionConfig> offeredExtensions;
private List<ExtensionConfig> negotiatedExtensions; private List<ExtensionConfig> negotiatedExtensions;
@ -54,6 +54,11 @@ public abstract class WebSocketNegotiation
return baseRequest; return baseRequest;
} }
public void upgrade()
{
this.baseRequest = null;
}
public HttpServletRequest getRequest() public HttpServletRequest getRequest()
{ {
return request; return request;

1
jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
View File

@ -167,6 +167,7 @@ public abstract class AbstractHandshaker implements Handshaker
// Save state from request/response and remove reference to the base request/response. // Save state from request/response and remove reference to the base request/response.
upgradeRequest.upgrade(); upgradeRequest.upgrade();
upgradeResponse.upgrade(); upgradeResponse.upgrade();
negotiation.upgrade();
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("upgrade connection={} session={} framehandler={}", connection, coreSession, handler); LOG.debug("upgrade connection={} session={} framehandler={}", connection, coreSession, handler);