Fix request body handling in gthread worker #3303
Open
Conversation
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
oallenj
force-pushed
the
3301-request-body-handling
branch
from
dde5abe to
461e87f
Compare
oallenj
force-pushed
the
3301-request-body-handling
branch
from
461e87f to
8c41618
Compare
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 #3301.
The problem is that if the request body is not read and the gthread worker finishes handling a request with a large request body, it will see that the socket is still readable and call on_client_socket_readable. However, the readable bytes are just the rest of the request body. The part of the code annotated "Discard any unread body of the previous message" will discard that request body, but gthread will then proceed to subsequently try and read a full HTTP request, which may have not been sent. This change will discard the request body after handling a request, and before on_client_socket_readable can be called so this doesn't happen.
I'm not sure how to make a test for this because it requires multiple connections and doesn't seem to fit in with the rest of gunicorn's test suite.