v1.5.2

qwj · web-flow · commit 19afb6858cf6 · 2018-08-08T16:51:17.000+08:00
diff --git a/pproxy/__init__.py b/pproxy/__init__.py
@@ -2,7 +2,7 @@
 from pproxy import proto
 
 __title__ = 'pproxy'
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 __description__ = "Proxy server that can tunnel among remote servers by regex rules."
 __author__ = "Qian Wenjie"
 __license__ = "MIT License"
diff --git a/pproxy/proto.py b/pproxy/proto.py
@@ -130,10 +130,11 @@ async def parse(self, reader, writer, auth, authtable, **kw):
         writer.write(b'\x05\x00\x00' + header + data)
         return host_name, port, b''
     async def connect(self, reader_remote, writer_remote, rauth, host_name, port, initbuf, **kw):
-        writer_remote.write((b'\x05\x01\x02\x01' + b''.join(packstr(i) for i in rauth.split(b':', 1)) if rauth else b'\x05\x01\x00') + b'\x05\x01\x00\x03' + packstr(host_name.encode()) + port.to_bytes(2, 'big') + initbuf)
+        writer_remote.write((b'\x05\x01\x02\x01' + b''.join(packstr(i) for i in rauth.split(b':', 1)) if rauth else b'\x05\x01\x00') + b'\x05\x01\x00\x03' + packstr(host_name.encode()) + port.to_bytes(2, 'big'))
         await reader_remote.read_until(b'\x00\x05\x00\x00')
         header = (await reader_remote.read_n(1))[0]
         await reader_remote.read_n(6 if header == 1 else (18 if header == 4 else (await reader_remote.read_n(1))[0]+2))
+        writer_remote.write(initbuf)
 
 class HTTP(BaseProtocol):
     name = 'http'
@@ -174,8 +175,9 @@ async def parse(self, header, reader, writer, auth, authtable, httpget, **kw):
             newpath = url._replace(netloc='', scheme='').geturl()
             return host_name, port, f'{method} {newpath} {ver}\r\n{lines}\r\n\r\n'.encode()
     async def connect(self, reader_remote, writer_remote, rauth, host_name, port, initbuf, **kw):
-        writer_remote.write(f'CONNECT {host_name}:{port} HTTP/1.1'.encode() + (b'\r\nProxy-Authorization: Basic '+base64.b64encode(rauth) if rauth else b'') + b'\r\n\r\n' + initbuf)
+        writer_remote.write(f'CONNECT {host_name}:{port} HTTP/1.1'.encode() + (b'\r\nProxy-Authorization: Basic '+base64.b64encode(rauth) if rauth else b'') + b'\r\n\r\n')
         await reader_remote.read_until(b'\r\n\r\n')
+        writer_remote.write(initbuf)
     async def channel(self, reader, writer, stat_bytes, *args):
         try:
             while True:
