mercurial/url.py
branchstable
changeset 12906 ae163a0a3cd0
parent 12862 9d6adddc8eea
child 13115 bda5f35fbf67
child 13163 2fa2e6444645
equal deleted inserted replaced
12905:593ee3a2a098 12906:ae163a0a3cd0
   538         def connect(self):
   538         def connect(self):
   539             if self.realhostport: # use CONNECT proxy
   539             if self.realhostport: # use CONNECT proxy
   540                 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
   540                 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
   541                 self.sock.connect((self.host, self.port))
   541                 self.sock.connect((self.host, self.port))
   542                 if _generic_proxytunnel(self):
   542                 if _generic_proxytunnel(self):
   543                     self.sock = _ssl_wrap_socket(self.sock, self.cert_file,
   543                     self.sock = _ssl_wrap_socket(self.sock, self.key_file,
   544                                                  self.key_file)
   544                             self.cert_file)
   545             else:
   545             else:
   546                 BetterHTTPS.connect(self)
   546                 BetterHTTPS.connect(self)
   547 
   547 
   548     class httpshandler(keepalive.KeepAliveHandler, urllib2.HTTPSHandler):
   548     class httpshandler(keepalive.KeepAliveHandler, urllib2.HTTPSHandler):
   549         def __init__(self, ui):
   549         def __init__(self, ui):