[Python-checkins] r74203 - in python/branches/release26-maint: Lib/httplib.py Lib/test/test_urllib2.py Lib/urllib2.py Misc/NEWS
senthil.kumaran
python-checkins at python.org
Sun Jul 26 14:36:09 CEST 2009
Author: senthil.kumaran
Date: Sun Jul 26 14:36:08 2009
New Revision: 74203
Log:
Backporting the changes made in revision 72880 as fix for Issue1424152.
Modified:
python/branches/release26-maint/Lib/httplib.py
python/branches/release26-maint/Lib/test/test_urllib2.py
python/branches/release26-maint/Lib/urllib2.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/httplib.py
==============================================================================
--- python/branches/release26-maint/Lib/httplib.py (original)
+++ python/branches/release26-maint/Lib/httplib.py Sun Jul 26 14:36:08 2009
@@ -652,11 +652,18 @@
self.__response = None
self.__state = _CS_IDLE
self._method = None
+ self._tunnel_host = None
+ self._tunnel_port = None
self._set_hostport(host, port)
if strict is not None:
self.strict = strict
+ def _set_tunnel(self, host, port=None):
+ """ Sets up the host and the port for the HTTP CONNECT Tunnelling."""
+ self._tunnel_host = host
+ self._tunnel_port = port
+
def _set_hostport(self, host, port):
if port is None:
i = host.rfind(':')
@@ -677,11 +684,30 @@
def set_debuglevel(self, level):
self.debuglevel = level
+ def _tunnel(self):
+ self._set_hostport(self._tunnel_host, self._tunnel_port)
+ self.send("CONNECT %s:%d HTTP/1.0\r\n\r\n" % (self.host, self.port))
+ response = self.response_class(self.sock, strict = self.strict,
+ method = self._method)
+ (version, code, message) = response._read_status()
+
+ if code != 200:
+ self.close()
+ raise socket.error, "Tunnel connection failed: %d %s" % (code,
+ message.strip())
+ while True:
+ line = response.fp.readline()
+ if line == '\r\n': break
+
+
def connect(self):
"""Connect to the host and port specified in __init__."""
self.sock = socket.create_connection((self.host,self.port),
self.timeout)
+ if self._tunnel_host:
+ self._tunnel()
+
def close(self):
"""Close the connection to the HTTP server."""
if self.sock:
@@ -1070,6 +1096,9 @@
"Connect to a host on a given (SSL) port."
sock = socket.create_connection((self.host, self.port), self.timeout)
+ if self._tunnel_host:
+ self.sock = sock
+ self._tunnel()
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)
__all__.append("HTTPSConnection")
Modified: python/branches/release26-maint/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllib2.py (original)
+++ python/branches/release26-maint/Lib/test/test_urllib2.py Sun Jul 26 14:36:08 2009
@@ -943,6 +943,21 @@
self.assertEqual([(handlers[0], "http_open")],
[tup[0:2] for tup in o.calls])
+ def test_proxy_https(self):
+ o = OpenerDirector()
+ ph = urllib2.ProxyHandler(dict(https='proxy.example.com:3128'))
+ o.add_handler(ph)
+ meth_spec = [
+ [("https_open","return response")]
+ ]
+ handlers = add_ordered_mock_handlers(o, meth_spec)
+ req = Request("https://www.example.com/")
+ self.assertEqual(req.get_host(), "www.example.com")
+ r = o.open(req)
+ self.assertEqual(req.get_host(), "proxy.example.com:3128")
+ self.assertEqual([(handlers[0], "https_open")],
+ [tup[0:2] for tup in o.calls])
+
def test_basic_auth(self, quote_char='"'):
opener = OpenerDirector()
password_manager = MockPasswordManager()
Modified: python/branches/release26-maint/Lib/urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/urllib2.py (original)
+++ python/branches/release26-maint/Lib/urllib2.py Sun Jul 26 14:36:08 2009
@@ -192,6 +192,7 @@
# self.__r_type is what's left after doing the splittype
self.host = None
self.port = None
+ self._tunnel_host = None
self.data = data
self.headers = {}
for key, value in headers.items():
@@ -252,8 +253,13 @@
return self.__r_host
def set_proxy(self, host, type):
- self.host, self.type = host, type
- self.__r_host = self.__original
+ if self.type == 'https' and not self._tunnel_host:
+ self._tunnel_host = self.host
+ else:
+ self.type = type
+ self.__r_host = self.__original
+
+ self.host = host
def has_proxy(self):
return self.__r_host == self.__original
@@ -700,7 +706,7 @@
req.add_header('Proxy-authorization', 'Basic ' + creds)
hostport = unquote(hostport)
req.set_proxy(hostport, proxy_type)
- if orig_type == proxy_type:
+ if orig_type == proxy_type or orig_type == 'https':
# let other handlers take care of it
return None
else:
@@ -1098,6 +1104,10 @@
headers["Connection"] = "close"
headers = dict(
(name.title(), val) for name, val in headers.items())
+
+ if req._tunnel_host:
+ h._set_tunnel(req._tunnel_host)
+
try:
h.request(req.get_method(), req.get_selector(), req.data, headers)
r = h.getresponse()
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sun Jul 26 14:36:08 2009
@@ -67,6 +67,9 @@
Library
-------
+- Issue #1424152: Fix for httplib, urllib2 to support SSL while working through
+ proxy. Original patch by Christopher Li, changes made by Senthil Kumaran.
+
- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was
unconditionally calling "os.close(sys.stdin.fileno())" resulting in file
descriptor errors
More information about the Python-checkins
mailing list