[PATCH 1 of 2] url: fix https client authentication through proxy
Mads Kiilerich
mads at kiilerich.com
Sun Oct 31 20:11:37 CDT 2010
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1288572972 -3600
# Branch stable
# Node ID 191f4f62a3ae7d9f27b3b16267c4f1400fd2451f
# Parent bc91a79fa3d04b365a7149989ec52888d88b256b
url: fix https client authentication through proxy
There is no tests for this, but the parameter order was obviously wrong.
diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -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)
More information about the Mercurial-devel
mailing list