diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 18:16:05 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 18:16:05 +0100 |
| commit | 0336a53aa8f1f75d28bd3014cbca013c07fa3855 (patch) | |
| tree | 2b6263255fc34d72f12c4d40dcc8e78318a3ba47 | |
| parent | a188ae5ac55c4f9564d7590c827be9a7eb9afba4 (diff) | |
| parent | e222858f01095c61178590123eea7b49b5d7853b (diff) | |
| download | mitmproxy-0336a53aa8f1f75d28bd3014cbca013c07fa3855.tar.gz mitmproxy-0336a53aa8f1f75d28bd3014cbca013c07fa3855.tar.bz2 mitmproxy-0336a53aa8f1f75d28bd3014cbca013c07fa3855.zip | |
Merge branch 'master' of https://github.com/mitmproxy/netlib
| -rw-r--r-- | netlib/http/http2/connections.py | 5 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/netlib/http/http2/connections.py b/netlib/http/http2/connections.py index 91133121..5e877286 100644 --- a/netlib/http/http2/connections.py +++ b/netlib/http/http2/connections.py @@ -8,11 +8,6 @@ from .. import Headers, Response, Request from hyperframe import frame -# TODO: remove once hyperframe released a new version > 3.1.1 -# wrapper for deprecated name in old hyperframe release -frame.SettingsFrame.MAX_FRAME_SIZE = frame.SettingsFrame.SETTINGS_MAX_FRAME_SIZE -frame.SettingsFrame.MAX_HEADER_LIST_SIZE = frame.SettingsFrame.SETTINGS_MAX_HEADER_LIST_SIZE - class TCPHandler(object): @@ -19,8 +19,8 @@ deps = { "pyOpenSSL>=0.15.1, <0.16", "cryptography>=1.2.2, <1.3", "passlib>=1.6.5, <1.7", - "hpack>=2.0.1, <3.0", - "hyperframe>=3.1.1, <4.0", + "hpack>=2.1.0, <3.0", + "hyperframe>=3.2.0, <4.0", "six>=1.10.0, <1.11", "certifi>=2015.11.20.1", # no semver here - this should always be on the last release! "backports.ssl_match_hostname>=3.5.0.1, <3.6", |