diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:22:19 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:22:19 +0200 |
| commit | a7291a7e7802633735cfcf40695527185d4fb837 (patch) | |
| tree | cfc04eb1b998c8ca4c1428eae52974f1865f6bf7 /libpathod/protocols | |
| parent | b889e9e1a2576b0f0aadb4180dd6f4c75db204d6 (diff) | |
| parent | 1a6e41c2002773bb82a5d95d8d9a8ab3aa422c98 (diff) | |
| download | mitmproxy-a7291a7e7802633735cfcf40695527185d4fb837.tar.gz mitmproxy-a7291a7e7802633735cfcf40695527185d4fb837.tar.bz2 mitmproxy-a7291a7e7802633735cfcf40695527185d4fb837.zip | |
Merge pull request #34 from mitmproxy/netlib-http1-refactor
Adjust to netlib changes
Diffstat (limited to 'libpathod/protocols')
| -rw-r--r-- | libpathod/protocols/http.py | 14 | ||||
| -rw-r--r-- | libpathod/protocols/http2.py | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libpathod/protocols/http.py b/libpathod/protocols/http.py index 0539b68d..531854d6 100644 --- a/libpathod/protocols/http.py +++ b/libpathod/protocols/http.py @@ -1,14 +1,12 @@ -from netlib import tcp, http, wsgi -from netlib.http import http1 -from .. import version, app, language, utils, log +from netlib import tcp, wsgi +from netlib.exceptions import HttpReadDisconnect +from netlib.http import http1, Request +from .. import version, language -class HTTPProtocol: +class HTTPProtocol(object): def __init__(self, pathod_handler): self.pathod_handler = pathod_handler - self.wire_protocol = http1.HTTP1Protocol( - self.pathod_handler - ) def make_error_response(self, reason, body): return language.http.make_error_response(reason, body) @@ -70,4 +68,4 @@ class HTTPProtocol: return self.pathod_handler.handle_http_request, None def read_request(self, lg=None): - return self.wire_protocol.read_request(allow_empty=True) + return http1.read_request(self.pathod_handler.rfile) diff --git a/libpathod/protocols/http2.py b/libpathod/protocols/http2.py index f57f56f8..a098a14e 100644 --- a/libpathod/protocols/http2.py +++ b/libpathod/protocols/http2.py @@ -14,7 +14,7 @@ class HTTP2Protocol: def read_request(self, lg=None): self.wire_protocol.perform_server_connection_preface() - return self.wire_protocol.read_request() + return self.wire_protocol.read_request(self.pathod_handler.rfile) def assemble(self, message): return self.wire_protocol.assemble(message) |