Issue #5170 - fix NPE during websocket upgrade #5213
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
gregw
reviewed
Sep 1, 2020
jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
Show resolved
Hide resolved
sbordet
requested changes
Sep 1, 2020
...core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
Outdated
Show resolved
Hide resolved
...core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
approved these changes
Sep 2, 2020
lachlan-roberts
referenced
this pull request
Sep 21, 2020
Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #5170
During the WebSocket client upgrade, if the upgrade response completes before the upgrade request then we NPE or potentially just lose the initial bytes of the websocket connection which would corrupt or lose the initial websocket frames.
This change makes it so during an upgrade we do not release the network buffer in the
HttpReceiverOverHttpuntilonUpgradeFrom()is called. This prevents the NPE and we do not lose the data for the initial websocket buffer.