diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-26 00:40:01 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-26 00:40:01 +0200 |
| commit | a163dba582e6aac103262bac50fcd390ebce0c72 (patch) | |
| tree | 29ddc906581e63a00a333aaf7d8e8ec24a03acc8 | |
| parent | 2f670bac99943404952ebd5e76490e9643e50297 (diff) | |
| download | mitmproxy-a163dba582e6aac103262bac50fcd390ebce0c72.tar.gz mitmproxy-a163dba582e6aac103262bac50fcd390ebce0c72.tar.bz2 mitmproxy-a163dba582e6aac103262bac50fcd390ebce0c72.zip | |
adjust to netlib request model changes
| -rw-r--r-- | libpathod/pathoc.py | 2 | ||||
| -rw-r--r-- | test/test_pathod.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 2dcb6082..4bfe7c7d 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -410,7 +410,7 @@ class Pathoc(tcp.TCPClient): req = language.serve(r, self.wfile, self.settings) self.wfile.flush() - resp = self.protocol.read_response(self.rfile, treq(method=req["method"])) + resp = self.protocol.read_response(self.rfile, treq(method=req["method"].encode())) resp.sslinfo = self.sslinfo except HttpException as v: lg("Invalid server response: %s" % v) diff --git a/test/test_pathod.py b/test/test_pathod.py index 1da2633f..f8c45ad8 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -228,6 +228,7 @@ class CommonTests(tutils.DaemonTests): ws_read_limit=1, timeout=1 ) + # FIXME: Race Condition? assert "Parse error" in self.d.text_log() def test_websocket_frame_disconnect_error(self): |