aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/protocols
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-16 20:12:53 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-16 20:12:53 +0200
commit1a6e41c2002773bb82a5d95d8d9a8ab3aa422c98 (patch)
treecfc04eb1b998c8ca4c1428eae52974f1865f6bf7 /libpathod/protocols
parent9f26d68f47bc7729b0727ed67253503e047ea0f9 (diff)
downloadmitmproxy-1a6e41c2002773bb82a5d95d8d9a8ab3aa422c98.tar.gz
mitmproxy-1a6e41c2002773bb82a5d95d8d9a8ab3aa422c98.tar.bz2
mitmproxy-1a6e41c2002773bb82a5d95d8d9a8ab3aa422c98.zip
minor fixes
Diffstat (limited to 'libpathod/protocols')
-rw-r--r--libpathod/protocols/http.py6
-rw-r--r--libpathod/protocols/http2.py2
2 files changed, 2 insertions, 6 deletions
diff --git a/libpathod/protocols/http.py b/libpathod/protocols/http.py
index ac6cb374..531854d6 100644
--- a/libpathod/protocols/http.py
+++ b/libpathod/protocols/http.py
@@ -68,8 +68,4 @@ class HTTPProtocol(object):
return self.pathod_handler.handle_http_request, None
def read_request(self, lg=None):
- try:
- return http1.read_request(self.pathod_handler.rfile)
- except HttpReadDisconnect:
- # TODO: This is
- return Request("", b"", b"", b"", b"", b"", b"", None, b"")
+ return http1.read_request(self.pathod_handler.rfile)
diff --git a/libpathod/protocols/http2.py b/libpathod/protocols/http2.py
index 44a51410..a098a14e 100644
--- a/libpathod/protocols/http2.py
+++ b/libpathod/protocols/http2.py
@@ -5,7 +5,7 @@ class HTTP2Protocol:
def __init__(self, pathod_handler):
self.pathod_handler = pathod_handler
- self.wire_protocol = http2.connections.HTTP2Protocol(
+ self.wire_protocol = http2.HTTP2Protocol(
self.pathod_handler, is_server=True, dump_frames=self.pathod_handler.http2_framedump
)