Skip to content

Fix: propagate stream read error on retried Response.content (#4965) #7447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trippusultan wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

Fix: propagate stream read error on retried Response.content (#4965) #7447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/requests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,17 @@ def content(self) -> bytes:
if self.status_code == 0 or self.raw is None:
self._content = None
else:
self._content = b"".join(self.iter_content(CONTENT_CHUNK_SIZE)) or b""
try:
self._content = b"".join(self.iter_content(CONTENT_CHUNK_SIZE)) or b""
except Exception as err:
# Issue #4965: propagate stream read error to subsequent .content
# accesses instead of silently discarding the state so a second
# call re-reads the now-empty raw stream.
self._content = err
self._content_consumed = True
if self.raw is not None:
self.raw.close()
raise

self._content_consumed = True
# don't need to release the connection; that's been handled by urllib3
Expand Down