diff options
| author | Shadab Zafar <dufferzafar0@gmail.com> | 2016-06-16 18:13:36 +0530 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-16 17:08:06 -0700 |
| commit | cd5ef042bbbe3155efd29a749a7aefa52728f98e (patch) | |
| tree | bbf237da5346f45585dabdc9d8f0277591929258 /pathod | |
| parent | 500bf18023e9fecc5a3aace94bbe731c9cbd49d2 (diff) | |
| download | mitmproxy-cd5ef042bbbe3155efd29a749a7aefa52728f98e.tar.gz mitmproxy-cd5ef042bbbe3155efd29a749a7aefa52728f98e.tar.bz2 mitmproxy-cd5ef042bbbe3155efd29a749a7aefa52728f98e.zip | |
Py3: pathoc should send bytes over wire
Diffstat (limited to 'pathod')
| -rw-r--r-- | pathod/pathoc.py | 4 | ||||
| -rw-r--r-- | pathod/protocols/http.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py index 478ce2a2..b539fec4 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -241,8 +241,8 @@ class Pathoc(tcp.TCPClient): def http_connect(self, connect_to): self.wfile.write( - 'CONNECT %s:%s HTTP/1.1\r\n' % tuple(connect_to) + - '\r\n' + b'CONNECT %s:%d HTTP/1.1\r\n' % (connect_to[0].encode(), connect_to[1]) + + b'\r\n' ) self.wfile.flush() try: diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py index 7736df4b..9756c266 100644 --- a/pathod/protocols/http.py +++ b/pathod/protocols/http.py @@ -17,9 +17,9 @@ class HTTPProtocol(object): """ self.pathod_handler.wfile.write( - 'HTTP/1.1 200 Connection established\r\n' + - ('Proxy-agent: %s\r\n' % version.PATHOD) + - '\r\n' + b'HTTP/1.1 200 Connection established\r\n' + + (b'Proxy-agent: %s\r\n' % version.PATHOD.encode()) + + b'\r\n' ) self.pathod_handler.wfile.flush() if not self.pathod_handler.server.ssloptions.not_after_connect: |