Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-103472: close response in HTTPConnection._tunnel #103473

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

Merged
gpshead merged 8 commits into from
May 2, 2023
Merged

GH-103472: close response in HTTPConnection._tunnel #103473

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86952ce
GH-103472: close response in HTTPConnection._tunnel
graingert Apr 12, 2023
6508762
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 12, 2023
f88793c
Update Misc/NEWS.d/next/Library/2023-04-12-13-04-16.gh-issue-103472.C…
graingert Apr 12, 2023
959db96
Merge branch 'main' into close-response-in-http-client-tunnel
graingert Apr 25, 2023
5500734
Merge branch 'main' into close-response-in-http-client-tunnel
graingert Apr 25, 2023
2aa460c
test that HTTPConnection._tunnel closes the response on exceptions
graingert Apr 25, 2023
c2171c7
minor wording and ReST update to NEWS
gpshead May 2, 2023
bd079b1
word wrap news.
gpshead May 2, 2023
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
Next Next commit
GH-103472: close response in HTTPConnection._tunnel
  • Loading branch information
@graingert
graingert committed Apr 12, 2023
commit 86952ce000e32955b00532c2e3c5c8f66dd7f262
33 changes: 18 additions & 15 deletions Lib/http/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,23 +941,26 @@ def _tunnel(self):
del headers

response = self.response_class(self.sock, method=self._method)
(version, code, message) = response._read_status()
Comment thread
gpshead marked this conversation as resolved.
try:
(version, code, message) = response._read_status()

if code != http.HTTPStatus.OK:
self.close()
raise OSError(f"Tunnel connection failed: {code} {message.strip()}")
while True:
line = response.fp.readline(_MAXLINE + 1)
if len(line) > _MAXLINE:
raise LineTooLong("header line")
if not line:
# for sites which EOF without sending a trailer
break
if line in (b'\r\n', b'\n', b''):
break
if code != http.HTTPStatus.OK:
self.close()
Comment thread
gpshead marked this conversation as resolved.
raise OSError(f"Tunnel connection failed: {code} {message.strip()}")
while True:
line = response.fp.readline(_MAXLINE + 1)
if len(line) > _MAXLINE:
raise LineTooLong("header line")
if not line:
# for sites which EOF without sending a trailer
break
if line in (b'\r\n', b'\n', b''):
break

if self.debuglevel > 0:
print('header:', line.decode())
if self.debuglevel > 0:
print('header:', line.decode())
finally:
response.close()
Comment thread
gpshead marked this conversation as resolved.

def connect(self):
"""Connect to the host and port specified in __init__."""
Expand Down