| hg-reviewers |
This will ensure that any customizations we perform to HTTPConnection
will be available to httpsconnection.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/keepalive.py (4 lines) | |||
| M | mercurial/url.py (4 lines) |
| r = getattr(self, '_broken_pipe_resp', None) | r = getattr(self, '_broken_pipe_resp', None) | ||||
| if r is not None: | if r is not None: | ||||
| return r | return r | ||||
| return cls.getresponse(self) | return cls.getresponse(self) | ||||
| safegetresponse.__doc__ = cls.getresponse.__doc__ | safegetresponse.__doc__ = cls.getresponse.__doc__ | ||||
| return safegetresponse | return safegetresponse | ||||
| class HTTPConnection(httplib.HTTPConnection): | class HTTPConnection(httplib.HTTPConnection): | ||||
| # url.httpsconnection inherits from this. So when adding/removing | |||||
| # attributes, be sure to audit httpsconnection() for unintended | |||||
| # consequences. | |||||
| # use the modified response class | # use the modified response class | ||||
| response_class = HTTPResponse | response_class = HTTPResponse | ||||
| send = safesend | send = safesend | ||||
| getresponse = wrapgetresponse(httplib.HTTPConnection) | getresponse = wrapgetresponse(httplib.HTTPConnection) | ||||
| ######################################################################### | ######################################################################### | ||||
| ##### TEST FUNCTIONS | ##### TEST FUNCTIONS | ||||
| def createconnection(*args, **kwargs): | def createconnection(*args, **kwargs): | ||||
| sock = socket.create_connection(*args, **kwargs) | sock = socket.create_connection(*args, **kwargs) | ||||
| return util.makeloggingsocket(self._logfh, sock, self._logname, | return util.makeloggingsocket(self._logfh, sock, self._logname, | ||||
| **self._observeropts) | **self._observeropts) | ||||
| return logginghttpconnection(createconnection, *args, **kwargs) | return logginghttpconnection(createconnection, *args, **kwargs) | ||||
| if has_https: | if has_https: | ||||
| class httpsconnection(httplib.HTTPConnection): | class httpsconnection(keepalive.HTTPConnection): | ||||
| response_class = keepalive.HTTPResponse | response_class = keepalive.HTTPResponse | ||||
| default_port = httplib.HTTPS_PORT | default_port = httplib.HTTPS_PORT | ||||
| # must be able to send big bundle as stream. | # must be able to send big bundle as stream. | ||||
| send = _gen_sendfile(keepalive.safesend) | send = _gen_sendfile(keepalive.safesend) | ||||
| getresponse = keepalive.wrapgetresponse(httplib.HTTPConnection) | getresponse = keepalive.wrapgetresponse(httplib.HTTPConnection) | ||||
| def __init__(self, host, port=None, key_file=None, cert_file=None, | def __init__(self, host, port=None, key_file=None, cert_file=None, | ||||
| *args, **kwargs): | *args, **kwargs): | ||||
| httplib.HTTPConnection.__init__(self, host, port, *args, **kwargs) | keepalive.HTTPConnection.__init__(self, host, port, *args, **kwargs) | ||||
| self.key_file = key_file | self.key_file = key_file | ||||
| self.cert_file = cert_file | self.cert_file = cert_file | ||||
| def connect(self): | def connect(self): | ||||
| self.sock = socket.create_connection((self.host, self.port)) | self.sock = socket.create_connection((self.host, self.port)) | ||||
| host = self.host | host = self.host | ||||
| if self.realhostport: # use CONNECT proxy | if self.realhostport: # use CONNECT proxy | ||||