This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5720

keepalive: implement _close_conn() so closes are known
ClosedPublic

Authored by indygreg on Jan 26 2019, 5:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG44d752efdbce: keepalive: implement _close_conn() so closes are known
Summary

Keepalives were not working on Python 3 because
http.client.HTTPResponse was refactored to call _close_conn()
instead of close(). Our custom close() is what returns inactive
connections to the available state.

We better support Python 3 by implementing a _close_conn().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 26 2019, 5:33 PM
Closed by commit rHG44d752efdbce: keepalive: implement _close_conn() so closes are known (authored by indygreg). · Explain WhyJan 29 2019, 10:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/keepalive.py (8 lines)

Diff 13547

mercurial/keepalive.py

self._handler = None # inserted by the handler later self._handler = None # inserted by the handler later
self._host = None # (same) self._host = None # (same)
self._url = None # (same) self._url = None # (same)
self._connection = None # (same) self._connection = None # (same)
_raw_read = httplib.HTTPResponse.read _raw_read = httplib.HTTPResponse.read
_raw_readinto = getattr(httplib.HTTPResponse, 'readinto', None) _raw_readinto = getattr(httplib.HTTPResponse, 'readinto', None)
# Python 2.7 has a single close() which closes the socket handle.
# This method was effectively renamed to _close_conn() in Python 3. But
# there is also a close(). _close_conn() is called by methods like
# read().
def close(self): def close(self):
if self.fp: if self.fp:
self.fp.close() self.fp.close()
self.fp = None self.fp = None
if self._handler: if self._handler:
self._handler._request_closed(self, self._host, self._handler._request_closed(self, self._host,
self._connection) self._connection)
def _close_conn(self):
self.close()
def close_connection(self): def close_connection(self):
self._handler._remove_connection(self._host, self._connection, close=1) self._handler._remove_connection(self._host, self._connection, close=1)
self.close() self.close()
def info(self): def info(self):
return self.headers return self.headers
def geturl(self): def geturl(self):