diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-02-18 10:22:33 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-02-18 10:22:33 +1300 |
| commit | 46abde94a4f164255ec6821e40db0e09c2140fba (patch) | |
| tree | 668ac59e7369910167cbd6f558181b3148a191e8 | |
| parent | c914ad754af1e3f5abbcddeb0c4bf22839e6c628 (diff) | |
| parent | 262b4bc482381d8ce4caee7c16cc4c4d0d96d002 (diff) | |
| download | mitmproxy-46abde94a4f164255ec6821e40db0e09c2140fba.tar.gz mitmproxy-46abde94a4f164255ec6821e40db0e09c2140fba.tar.bz2 mitmproxy-46abde94a4f164255ec6821e40db0e09c2140fba.zip | |
Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2
| -rw-r--r-- | mitmproxy/mitmproxy/protocol/http2.py | 15 | ||||
| -rw-r--r-- | mitmproxy/setup.py | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/mitmproxy/mitmproxy/protocol/http2.py b/mitmproxy/mitmproxy/protocol/http2.py index c121637c..3fbc500a 100644 --- a/mitmproxy/mitmproxy/protocol/http2.py +++ b/mitmproxy/mitmproxy/protocol/http2.py @@ -9,8 +9,6 @@ from netlib.exceptions import HttpException from netlib.http import Headers from netlib.utils import http2_read_raw_frame -import hyperframe -import h2 from h2.connection import H2Connection from h2.events import * @@ -232,19 +230,6 @@ class Http2Layer(Layer): stream.zombie = time.time() return - frame, _ = hyperframe.frame.Frame.parse_frame_header(raw_frame[:9]) - - if is_server: - list = self.server_reset_streams - else: - list = self.client_reset_streams - if frame.stream_id in list: - # this frame belongs to a reset stream - just ignore it - if isinstance(frame, hyperframe.frame.HeadersFrame) or isinstance(frame, hyperframe.frame.ContinuationFrame): - # we need to keep the hpack-decoder happy too - source_conn.h2.decoder.decode(raw_frame[9:]) - continue - events = source_conn.h2.receive_data(raw_frame) source_conn.send(source_conn.h2.data_to_send()) diff --git a/mitmproxy/setup.py b/mitmproxy/setup.py index 9d796ebb..e2035a42 100644 --- a/mitmproxy/setup.py +++ b/mitmproxy/setup.py @@ -54,7 +54,7 @@ setup( # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ "netlib=={}".format(version.VERSION), - "h2>=2.1.0, <2.2", + "h2>=2.1.2, <3.0", "tornado>=4.3, <4.4", "configargparse>=0.10, <0.11", "pyperclip>=1.5.22, <1.6", |