fix: support both old and new websockets request headers format #1588
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
csukuangfj
reviewed
Dec 3, 2024
| @@ -641,7 +641,11 @@ async def process_request( | |||
| path: str, | |||
| request_headers: websockets.Headers, | |||
| ) -> Optional[Tuple[http.HTTPStatus, websockets.Headers, bytes]]: | |||
| if "sec-websocket-key" not in request_headers: | |||
| if "sec-websocket-key" not in ( | |||
There was a problem hiding this comment.
Could you also fix streaming_server.py?
There was a problem hiding this comment.
It has been also fixed now.
|
Thank you for your contribution! |
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.
Add compatibility check for request_headers format in websocket handling. New version of websockets has a 'headers' attribute in request_headers, while old version uses request_headers directly.
This change ensures the server can properly handle requests from different versions of the websockets library.
In older versions of python 3.8 websockets, Headers class was located at websockets.datastructures.Headers
In newer versions of python 3.10 websockets, Headers class was moved to websockets.http11.Request