HTTP: Don't attempt to needlessly decompress redirect body #2798
+1
−1
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
This change fixes a regression where redirect body would needlessly be decompressed even though it was to be ignored anyway. As it happens this causes secondary issues since there appears to be a bug in apache2 that it in certain conditions generates a corrupt zlib response. The regression was created by commit: dbcced8 Discovered-by: Harry Sintonen
bagder
approved these changes
Jul 27, 2018
jay
reviewed
Jul 27, 2018
| @@ -797,7 +797,7 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |||
| nread); | |||
| } | |||
| } | |||
| else | |||
| else if(!k->ignorebody) | |||
| result = Curl_unencode_write(conn, k->writer_stack, k->str, nread); | |||
There was a problem hiding this comment.
result is checked right after this in all cases so i'd add this
else
result = CURLE_OK;because what if it's set to CURLE_AGAIN and or something at that point, otherwise it's just going to return that and it shouldn't, (unless I'm reading it wrong)
There was a problem hiding this comment.
It is set to CURLE_OK at the top of the function and then it gets checked every time it gets assigned so I don't think there's a risk for that...
|
Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This change fixes a regression where redirect body would needlessly be decompressed even though it was to be ignored anyway. As it happens this causes secondary issues since there appears to be a bug in apache2 that it in certain conditions generates a corrupt zlib response. The regression was created by commit: dbcced8
To reproduce the issue use a affectred curl version and attempt to:
curl --referer something --compressed -L http://morph.zoneWith this change the problem disappears (read: the server bug is happily ignored).