Proposed fix for issue #103. Fixes an issue with _throw_away() and large chunked redirects. #110
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
dhalbert
requested changes
Jul 3, 2022
Co-authored-by: Dan Halbert <halbert@halwitz.org>
Co-authored-by: Dan Halbert <halbert@halwitz.org>
klocs
commented
Jul 3, 2022
| @@ -324,9 +324,8 @@ def _throw_away(self, nbytes: int) -> None: | |||
| to_read -= self._recv_into(buf, to_read) | |||
| remaining = nbytes % len_buf | |||
| if remaining: | |||
There was a problem hiding this comment.
Looking at it again, I think we can eliminate this if remaining: check also. What do you think?
I'm pretty new at working with github's UI so I'm not sure if I'm doing this right.
There was a problem hiding this comment.
You're right, it's redundant! I made a release but go ahead and make another PR, and I'll make another reelase.
There was a problem hiding this comment.
maybe to_read and remaining could have the same name.
There was a problem hiding this comment.
Sounds good. I'll work on it and see if it makes sense to combine the variables. It might be confusing though. I'll send another pull request in a bit, may not be today.
dhalbert
approved these changes
Jul 3, 2022
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Jul 4, 2022
Updating https://github.com/adafruit/Adafruit_CircuitPython_Thermistor to 3.4.4 from 3.4.3: > Merge pull request adafruit/Adafruit_CircuitPython_Thermistor#20 from tcfranks/main Updating https://github.com/adafruit/Adafruit_CircuitPython_Requests to 1.12.4 from 1.12.2: > Merge pull request adafruit/Adafruit_CircuitPython_Requests#111 from klocs/throw_away_cleanup > Merge pull request adafruit/Adafruit_CircuitPython_Requests#110 from klocs/chunked_redirect_bug
This was referenced Jul 6, 2022
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.
I found that
Reponse._throw_away()worked fine unless the bytes returned from_recv_into()wasn't the full size of the throw away buffer. Simple fix once I figured out what was happening. Also including a unit test the reproduces the problem.