Inflater handle empty streams #625
Merged
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
|
@LukaszMaslej seems like a reasonable enough workaround, although there are some RuboCop failures |
tarcieri
reviewed
Nov 9, 2020
lib/http/response/inflater.rb
Outdated
| @@ -16,7 +16,7 @@ def readpartial(*args) | |||
| if chunk | |||
| chunk = zstream.inflate(chunk) | |||
| elsif !zstream.closed? | |||
| zstream.finish | |||
| zstream.finish if zstream.total_in > 0 | |||
There was a problem hiding this comment.
RuboCop suggests the following here:
Suggested change
| zstream.finish if zstream.total_in > 0 | |
| zstream.finish if zstream.total_in.positive? |
tarcieri
reviewed
Nov 9, 2020
spec/support/dummy_server/servlet.rb
Outdated
Comment on lines
179
to
188
| res.body = case req["Accept-Encoding"] | ||
| when "gzip" then | ||
| res["Content-Encoding"] = "gzip" | ||
| "" | ||
| when "deflate" then | ||
| res["Content-Encoding"] = "deflate" | ||
| "" | ||
| else | ||
| "" | ||
| end |
There was a problem hiding this comment.
RuboCop suggests moving the "" out of the conditional since it's the same for all branches
Suggested change
| res.body = case req["Accept-Encoding"] | |
| when "gzip" then | |
| res["Content-Encoding"] = "gzip" | |
| "" | |
| when "deflate" then | |
| res["Content-Encoding"] = "deflate" | |
| "" | |
| else | |
| "" | |
| end | |
| res.body = "" | |
| case req["Accept-Encoding"] | |
| when "gzip" then | |
| res["Content-Encoding"] = "gzip" | |
| when "deflate" then | |
| res["Content-Encoding"] = "deflate" | |
| end |
There was a problem hiding this comment.
@tarcieri fair suggestions, fixed.
LukaszMaslej
force-pushed
the
inflater-handle-empty-streams
branch
from
7484c86
to
025e9b4
Compare
|
The test failures appear to be unrelated. Thanks for the fix! |
Merged
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.
Hello,
This prevents the issue of Zlib::BufError errors raised when reading
by Inflater empty streams (should fix #624).
Thanks!