Ticket #1774: twisted-web-proxy.patch

web/client.py

@@ -34 +34 @@
 
     def connectionMade(self):
         method = getattr(self.factory, 'method', 'GET')
-        self.sendCommand(method, self.factory.path)
+        addr = (self.factory.host, self.factory.port)
+        if getattr(self.transport, 'addr', addr) == addr:
+            getpath = self.factory.path
+        else:
+            getpath = "%s://%s:%s%s" % (self.factory.scheme,
+                                        self.factory.host,
+                                        self.factory.port,
+                                        self.factory.path)
+        self.sendCommand(method, getpath)
         self.sendHeader('Host', self.factory.headers.get("host", self.factory.host))
         self.sendHeader('User-Agent', self.factory.agent)
         if self.factory.cookies:
             l=[]
-            for cookie, cookval in self.factory.cookies.items():  
+            for cookie, cookval in self.factory.cookies.items():
                 l.append('%s=%s' % (cookie, cookval))
             self.sendHeader('Cookie', '; '.join(l))
         data = getattr(self.factory, 'postdata', None)

web/http.py

@@ -559 +559 @@
 
         self.method, self.uri = command, path
         self.clientproto = version
-        x = self.uri.split('?')
+        
+        if '://' in path:
+            path = '/'+path.split('/', 3)[-1]
+        
+        x = path.split('?')
 
         if len(x) == 1:
-            self.path = self.uri
+            self.path = path
         else:
             if len(x) != 2:
                 log.msg("May ignore parts of this invalid URI: %s"
@@ -597 +601 @@
                         self.channel.transport.loseConnection()
                         return
                     raise
-
+        
         self.process()
 
     def __repr__(self):

web/proxy.py

@@ -113 +113 @@
             headers['host'] = host
         self.content.seek(0, 0)
         s = self.content.read()
-        clientFactory = class_(self.method, rest, self.clientproto, headers,
+        clientFactory = class_(self.method, self.uri, self.clientproto, headers,
                                s, self)
         reactor.connectTCP(host, port, clientFactory)