173 if has_https and self.realhostport: # use CONNECT proxy |
173 if has_https and self.realhostport: # use CONNECT proxy |
174 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) |
174 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) |
175 self.sock.connect((self.host, self.port)) |
175 self.sock.connect((self.host, self.port)) |
176 if _generic_proxytunnel(self): |
176 if _generic_proxytunnel(self): |
177 # we do not support client X.509 certificates |
177 # we do not support client X.509 certificates |
178 self.sock = sslutil.ssl_wrap_socket(self.sock, None, None, None, |
178 self.sock = sslutil.wrapsocket(self.sock, None, None, None, |
179 serverhostname=self.host) |
179 serverhostname=self.host) |
180 else: |
180 else: |
181 keepalive.HTTPConnection.connect(self) |
181 keepalive.HTTPConnection.connect(self) |
182 |
182 |
183 def getresponse(self): |
183 def getresponse(self): |
184 proxyres = getattr(self, 'proxyres', None) |
184 proxyres = getattr(self, 'proxyres', None) |
336 |
336 |
337 host = self.host |
337 host = self.host |
338 if self.realhostport: # use CONNECT proxy |
338 if self.realhostport: # use CONNECT proxy |
339 _generic_proxytunnel(self) |
339 _generic_proxytunnel(self) |
340 host = self.realhostport.rsplit(':', 1)[0] |
340 host = self.realhostport.rsplit(':', 1)[0] |
341 self.sock = sslutil.ssl_wrap_socket( |
341 self.sock = sslutil.wrapsocket( |
342 self.sock, self.key_file, self.cert_file, serverhostname=host, |
342 self.sock, self.key_file, self.cert_file, serverhostname=host, |
343 **sslutil.sslkwargs(self.ui, host)) |
343 **sslutil.sslkwargs(self.ui, host)) |
344 sslutil.validator(self.ui, host)(self.sock) |
344 sslutil.validator(self.ui, host)(self.sock) |
345 |
345 |
346 class httpshandler(keepalive.KeepAliveHandler, urllib2.HTTPSHandler): |
346 class httpshandler(keepalive.KeepAliveHandler, urllib2.HTTPSHandler): |