websocket: don't set a WSS multiaddr for accepted unencrypted conns #2199
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
MarcoPolo
reviewed
Mar 17, 2023
| @@ -96,7 +100,7 @@ func (l *listener) serve() { | |||
|
|
|||
| func (l *listener) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| scheme := "ws" | |||
| if l.server.TLSConfig != nil { | |||
| if l.isWss { | |||
There was a problem hiding this comment.
Should we fix the other checks as well?
There was a problem hiding this comment.
I guess there's just the other one in serve
MarcoPolo
approved these changes
Mar 17, 2023
marten-seemann
force-pushed
the
fix-websocket-address-wss
branch
from
2c5f801
to
e5fed8e
Compare
marten-seemann
added a commit
that referenced
this pull request
May 11, 2023
* Revert "websocket: don't set a WSS multiaddr for accepted unencrypted conns (#2199)" This reverts commit eeb685f. * Revert "websocket: Don't limit message sizes in the websocket reader (#2193)" This reverts commit 2fe6600. * Revert "websocket: Replace gorilla websocket transport with nhooyr websocket transport (#1982)" * websocket: don't set a WSS multiaddr for accepted unencrypted conns
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 #2198.