Mercurial > hg-stable

changeset 12906:ae163a0a3cd0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
url: fix https client authentication through proxy There is no tests for this, but the parameter order was obviously wrong.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 01 Nov 2010 01:56:12 +0100
parents 593ee3a2a098
children e255a5dc29e6
files mercurial/url.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/url.py	Mon Nov 01 12:45:45 2010 -0500
+++ b/mercurial/url.py	Mon Nov 01 01:56:12 2010 +0100
@@ -540,8 +540,8 @@
                 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 self.sock.connect((self.host, self.port))
                 if _generic_proxytunnel(self):
-                    self.sock = _ssl_wrap_socket(self.sock, self.cert_file,
-                                                 self.key_file)
+                    self.sock = _ssl_wrap_socket(self.sock, self.key_file,
+                            self.cert_file)
             else:
                 BetterHTTPS.connect(self)