drop pipe_response

Author: phuslu

local/proxy.py

@@ -2140,13 +2140,10 @@ def do_METHOD_FWD(self):
             if response.status in (400, 405):
                 common.GAE_CRLF = 0
             self.wfile.write(('HTTP/1.1 %s\r\n%s\r\n' % (response.status, ''.join('%s: %s\r\n' % (k.title(), v) for k, v in response.getheaders() if k.title() != 'Transfer-Encoding'))))
-            queue = Queue.Queue()
-            threading._start_new_thread(pipe_response_to_queue, (response, queue, 8192))
             while True:
-                data = queue.get()
-                if data is StopIteration or isinstance(data, Exception):
-                    response.close()
-                    return
+                data = response.read(8192)
+                if not data:
+                    break
                 self.wfile.write(data)
             response.close()
         except NetWorkIOError as e:
@@ -2268,11 +2265,9 @@ def do_METHOD_AGENT(self):
                     start, end, length = tuple(int(x) for x in re.search(r'bytes (\d+)-(\d+)/(\d+)', content_range).group(1, 2, 3))
                 else:
                     start, end, length = 0, content_length-1, content_length
-                queue = Queue.Queue()
-                threading._start_new_thread(pipe_response_to_queue, (response, queue, 8192))
                 while True:
-                    data = queue.get()
-                    if data is StopIteration or isinstance(data, Exception):
+                    data = response.read(8192)
+                    if not data:
                         response.close()
                         return
                     start += len(data)
@@ -2549,11 +2544,9 @@ def do_METHOD_AGENT(self):
                 self.wfile.write('HTTP/1.1 %s\r\n%s\r\n' % (response.status, ''.join('%s: %s\r\n' % (k, v) for k, v in response.getheaders())))
 
             cipher = response.status == 200 and response.getheader('Content-Type', '') == 'image/gif' and XORCipher(common.PHP_PASSWORD[0])
-            queue = Queue.Queue()
-            threading._start_new_thread(pipe_response_to_queue, (response, queue, 8192))
             while True:
-                data = queue.get()
-                if data is StopIteration or isinstance(data, Exception):
+                data = response.read(8192)
+                if not data:
                     response.close()
                     break
                 if cipher: