skip compression on upgrade connection#187
Merged
elithrar merged 2 commits intogorilla:masterfrom Aug 19, 2020
Merged
Conversation
|
This issue has been automatically marked as stale because it hasn't seen a recent update. It'll be automatically closed in a few days. |
Contributor
Author
|
bump |
blixt
reviewed
Aug 7, 2020
compress.go
Outdated
Comment on lines
+105
to
+115
| var upgrade bool | ||
| for _, v := range strings.Split(r.Header.Get("Connection"), ",") { | ||
| if strings.ToLower(strings.TrimSpace(v)) == "upgrade" { | ||
| upgrade = true | ||
| break | ||
| } | ||
| } | ||
| if upgrade { | ||
| h.ServeHTTP(w, r) | ||
| return | ||
| } |
There was a problem hiding this comment.
This should be sufficient:
Suggested change
| var upgrade bool | |
| for _, v := range strings.Split(r.Header.Get("Connection"), ",") { | |
| if strings.ToLower(strings.TrimSpace(v)) == "upgrade" { | |
| upgrade = true | |
| break | |
| } | |
| } | |
| if upgrade { | |
| h.ServeHTTP(w, r) | |
| return | |
| } | |
| if r.Header.Get("Upgrade") != "" { | |
| h.ServeHTTP(w, r) | |
| return | |
| } |
elithrar
suggested changes
Aug 19, 2020
| return | ||
| } | ||
|
|
||
| if r.Header.Get("Upgrade") != "" { |
There was a problem hiding this comment.
Ah! The proposal I made was already pushed, these 4 lines checking the Upgrade header should work fine (I've been using a wrapper implementing exactly this in production on framer.com for many months and haven't run into any issues with WebSockets.)
elithrar
approved these changes
Aug 19, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #182
Summary of Changes