Mercurial > hg-stable

changeset 19809:50d721553198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
httpconnection: properly inject ssl_wrap_socket into httpclient (issue4038) This causes httpclient to use the same SSL settings as the rest of Mercurial, and adds an easy extension point for later modifications to our ssl handling.
author Augie Fackler <raf@durin42.com>
date Fri, 20 Sep 2013 09:16:07 -0400
parents 3b82d412e9e8
children c80feeb715d1
files mercurial/httpconnection.py
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/httpconnection.py	Fri Sep 20 09:15:43 2013 -0400
+++ b/mercurial/httpconnection.py	Fri Sep 20 09:16:07 2013 -0400
@@ -275,14 +275,13 @@
             if '[' in host:
                 host = host[1:-1]
 
-        if keyfile:
-            kwargs['keyfile'] = keyfile
-        if certfile:
-            kwargs['certfile'] = certfile
+        kwargs['keyfile'] = keyfile
+        kwargs['certfile'] = certfile
 
         kwargs.update(sslutil.sslkwargs(self.ui, host))
 
         con = HTTPConnection(host, port, use_ssl=True,
+                             ssl_wrap_socket=sslutil.ssl_wrap_socket,
                              ssl_validator=sslutil.validator(self.ui, host),
                              **kwargs)
         return con