Adding http tunnel in httplib

Let urllib2 use http tunnel for https proxy.


Index: https-proxy/urllib2.py
===================================================================
--- https-proxy.orig/urllib2.py	2008-02-06 01:16:16.000000000 -0800
+++ https-proxy/urllib2.py	2008-02-06 11:47:57.000000000 -0800
@@ -192,6 +192,7 @@ class Request:
         # 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,12 @@ class Request:
         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 get_origin_req_host(self):
         return self.origin_req_host
@@ -678,7 +683,7 @@ class ProxyHandler(BaseHandler):
             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:
@@ -1068,6 +1073,8 @@ class AbstractHTTPHandler(BaseHandler):
         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()
Index: https-proxy/httplib.py
===================================================================
--- https-proxy.orig/httplib.py	2008-02-06 01:16:16.000000000 -0800
+++ https-proxy/httplib.py	2008-02-06 11:47:57.000000000 -0800
@@ -631,11 +631,17 @@ class HTTPConnection:
         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):
+        self._tunnel_host = host
+        self._tunnel_port = port
+
     def _set_hostport(self, host, port):
         if port is None:
             i = host.rfind(':')
@@ -656,6 +662,18 @@ class HTTPConnection:
     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__."""
         msg = "getaddrinfo returns an empty list"
@@ -677,6 +695,8 @@ class HTTPConnection:
             break
         if not self.sock:
             raise socket.error, msg
+        if self._tunnel_host:
+            self._tunnel()
 
     def close(self):
         """Close the connection to the HTTP server."""
@@ -1128,6 +1148,9 @@ class HTTPSConnection(HTTPConnection):
 
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.connect((self.host, self.port))
+        if self._tunnel_host:
+            self.sock = sock
+            self._tunnel()
         ssl = socket.ssl(sock, self.key_file, self.cert_file)
         self.sock = FakeSocket(sock, ssl)