Mercurial > hg
comparison mercurial/url.py @ 29252:f1fe92c6c03c
url: remove use of sslkwargs
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 25 May 2016 19:57:02 -0700 |
| parents | e6de6ef3e426 |
| children | 2c019aac6b99 |
comparison
equal
deleted
inserted
replaced
| 29251:31acc78c632a | 29252:f1fe92c6c03c |
|---|---|
| 353 if self.realhostport: # use CONNECT proxy | 353 if self.realhostport: # use CONNECT proxy |
| 354 _generic_proxytunnel(self) | 354 _generic_proxytunnel(self) |
| 355 host = self.realhostport.rsplit(':', 1)[0] | 355 host = self.realhostport.rsplit(':', 1)[0] |
| 356 self.sock = sslutil.wrapsocket( | 356 self.sock = sslutil.wrapsocket( |
| 357 self.sock, self.key_file, self.cert_file, ui=self.ui, | 357 self.sock, self.key_file, self.cert_file, ui=self.ui, |
| 358 serverhostname=host, **sslutil.sslkwargs(self.ui, host)) | 358 serverhostname=host) |
| 359 sslutil.validatesocket(self.sock) | 359 sslutil.validatesocket(self.sock) |
| 360 | 360 |
| 361 class httpshandler(keepalive.KeepAliveHandler, urlreq.httpshandler): | 361 class httpshandler(keepalive.KeepAliveHandler, urlreq.httpshandler): |
| 362 def __init__(self, ui): | 362 def __init__(self, ui): |
| 363 keepalive.KeepAliveHandler.__init__(self) | 363 keepalive.KeepAliveHandler.__init__(self) |