Skip to content
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

Jump to bottom

Fix file descriptor leak due to stack frame reference #549

Merged
merged 2 commits into from
Feb 16, 2015
Merged

Fix file descriptor leak due to stack frame reference #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
431e806
Fix circular stack frame reference in HTTPConnectionPool.urlopen()
ianpreston Feb 14, 2015
a6671b7
Remove local reference to socket object in util.connection.create_con…
ianpreston Feb 14, 2015
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
5 changes: 2 additions & 3 deletions urllib3/connectionpool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,13 @@ def urlopen(self, method, url, body=None, headers=None, retries=None,
conn.close()
conn = None

stacktrace = sys.exc_info()[2]
if isinstance(e, SocketError) and self.proxy:
e = ProxyError('Cannot connect to proxy.', e)
elif isinstance(e, (SocketError, HTTPException)):
e = ProtocolError('Connection aborted.', e)

retries = retries.increment(method, url, error=e,
_pool=self, _stacktrace=stacktrace)
retries = retries.increment(method, url, error=e, _pool=self,
_stacktrace=sys.exc_info()[2])
retries.sleep()

# Keep track of the error for the retry warning.
Expand Down
1 change: 1 addition & 0 deletions urllib3/util/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
err = _
if sock is not None:
sock.close()
sock = None

if err is not None:
raise err
Expand Down