fix: websocket multi-value connection upgrades #489
Merged
+13
−3
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
rschmukler
force-pushed
the
rs/websocket-upgrade-fix
branch
from
5aa8893 to
7c82ab3
Compare
|
Thank you for the fix! Could you change the commit description to: This just makes it more consistent with the other commits in Ring. |
rschmukler
force-pushed
the
rs/websocket-upgrade-fix
branch
from
7c82ab3 to
c0a5e3a
Compare
|
@weavejester Done! Also changed the impl to handle |
weavejester
requested changes
Dec 6, 2023
ring-core/src/ring/websocket.clj
Outdated
Comment on lines
69
to
75
| (let [headers (:headers request) | ||
| conn-header (get headers "connection") | ||
| upgrade-header (get headers "upgrade")] | ||
| (and conn-header | ||
| upgrade-header | ||
| (re-find #"\b(?i)upgrade\b" conn-header) | ||
| (.equalsIgnoreCase "websocket" upgrade-header)))) |
There was a problem hiding this comment.
What about:
(let [{{:strs [connection upgrade]} :headers} request]
(and connection upgrade
(re-find #"\b(?i)upgrade\b" connection)
(.equalsIgnoreCase "websocket" upgrade)))Just makes it a little neater and more concise.
|
No problem at all! Yours looks good! I can submit an amended commit tomorrow (about 12 hours) or you're welcome to commit whatever you feel is best. Cheers! |
Fix an issue where browsers could send Keep-Alive and Upgrade in the same request causing upgrade-request? to return false.
rschmukler
force-pushed
the
rs/websocket-upgrade-fix
branch
from
c0a5e3a to
a24d724
Compare
|
@weavejester I've submitted a new commit with the suggested implementation. Thanks again! |
weavejester
approved these changes
Dec 7, 2023
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.
Fixes an issue where browsers could send
keep-aliveandUpgradein the same request causing thews/upgrade-request?to return false.