Patchwork [5,of,6] url: remove use of sslkwargs

login
register
mail settings
Submitter Gregory Szorc
Date May 26, 2016, 3:03 a.m.
Message ID <80c4bffa1d3713f43561.1464231834@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/15216/
State Accepted
Headers show

Comments

Gregory Szorc - May 26, 2016, 3:03 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1464231422 25200
#      Wed May 25 19:57:02 2016 -0700
# Node ID 80c4bffa1d3713f43561689338210465c6b85b35
# Parent  5ea31af4040f1d1c59278b637d15cb13a9403792
url: remove use of sslkwargs

Patch

diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -350,17 +350,17 @@  if has_https:
             self.sock = _create_connection((self.host, self.port))
 
             host = self.host
             if self.realhostport: # use CONNECT proxy
                 _generic_proxytunnel(self)
                 host = self.realhostport.rsplit(':', 1)[0]
             self.sock = sslutil.wrapsocket(
                 self.sock, self.key_file, self.cert_file, ui=self.ui,
-                serverhostname=host, **sslutil.sslkwargs(self.ui, host))
+                serverhostname=host)
             sslutil.validatesocket(self.sock)
 
     class httpshandler(keepalive.KeepAliveHandler, urlreq.httpshandler):
         def __init__(self, ui):
             keepalive.KeepAliveHandler.__init__(self)
             urlreq.httpshandler.__init__(self)
             self.ui = ui
             self.pwmgr = passwordmgr(self.ui)