diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-07-17 09:37:57 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-07-22 15:30:51 +0200 |
| commit | 4617ab8a3a981f3abd8d62b561c80f9ad141e57b (patch) | |
| tree | 714bedbc37b482f4b24019f910309d48aaa5a2c1 /netlib/http/http2/protocol.py | |
| parent | 808b294865257fc3f52b33ed2a796009658b126f (diff) | |
| download | mitmproxy-4617ab8a3a981f3abd8d62b561c80f9ad141e57b.tar.gz mitmproxy-4617ab8a3a981f3abd8d62b561c80f9ad141e57b.tar.bz2 mitmproxy-4617ab8a3a981f3abd8d62b561c80f9ad141e57b.zip | |
add Request class and unify read_request interface
Diffstat (limited to 'netlib/http/http2/protocol.py')
| -rw-r--r-- | netlib/http/http2/protocol.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/netlib/http/http2/protocol.py b/netlib/http/http2/protocol.py index 0d6eac85..1dfdda21 100644 --- a/netlib/http/http2/protocol.py +++ b/netlib/http/http2/protocol.py @@ -187,11 +187,25 @@ class HTTP2Protocol(object): self._create_body(body, stream_id))) def read_response(self, *args): - stream_id_, headers, body = self._receive_transmission() - return http.Response("HTTP/2", headers[':status'], "", headers, body) + stream_id, headers, body = self._receive_transmission() + + response = http.Response("HTTP/2", headers[':status'], "", headers, body) + response.stream_id = stream_id + return response def read_request(self): - return self._receive_transmission() + stream_id, headers, body = self._receive_transmission() + + form_in = "" + method = headers.get(':method', '') + scheme = headers.get(':scheme', '') + host = headers.get(':host', '') + port = '' # TODO: parse port number? + path = headers.get(':path', '') + + request = http.Request(form_in, method, scheme, host, port, path, "HTTP/2", headers, body) + request.stream_id = stream_id + return request def _receive_transmission(self): body_expected = True |