diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2014-12-01 11:10:12 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-12-01 11:10:12 (GMT) |
commit | 2205da43a6bb68b641d97fa7832b71c8a57efb77 (patch) | |
tree | d4430c58f2e61f4df8affc8ddcc713a2da805610 /Lib/http | |
parent | 988e2cfb2b679aa0d0835cf9f3db63210f3542d1 (diff) | |
parent | b491e0521fd6e1a2e6f3e6354a2a296c7c8a2915 (diff) | |
download | cpython-2205da43a6bb68b641d97fa7832b71c8a57efb77.zip cpython-2205da43a6bb68b641d97fa7832b71c8a57efb77.tar.gz cpython-2205da43a6bb68b641d97fa7832b71c8a57efb77.tar.bz2 |
Issue #21032. Fixed socket leak if HTTPConnection.getresponse() fails.
Original patch by Martin Panter.
Diffstat (limited to 'Lib/http')
-rw-r--r-- | Lib/http/client.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index 31d066b..4a8b4ee 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -1233,18 +1233,22 @@ class HTTPConnection: else: response = self.response_class(self.sock, method=self._method) - response.begin() - assert response.will_close != _UNKNOWN - self.__state = _CS_IDLE + try: + response.begin() + assert response.will_close != _UNKNOWN + self.__state = _CS_IDLE - if response.will_close: - # this effectively passes the connection to the response - self.close() - else: - # remember this, so we can tell when it is complete - self.__response = response + if response.will_close: + # this effectively passes the connection to the response + self.close() + else: + # remember this, so we can tell when it is complete + self.__response = response - return response + return response + except: + response.close() + raise try: import ssl |