aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http2/protocol.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-08 23:08:43 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-08 23:08:43 +1200
commit6b9c2739c20c4c4115e49b5c120554ec89da8c38 (patch)
tree3fdbcd20f7a7b7b2ca13335cad94c0ac81862207 /netlib/http2/protocol.py
parent9c48bfb2a53bf3ac3c29408511e3126ada16afd8 (diff)
parent4666d1e7bbf77b470d938d873d1a760283963adf (diff)
downloadmitmproxy-6b9c2739c20c4c4115e49b5c120554ec89da8c38.tar.gz
mitmproxy-6b9c2739c20c4c4115e49b5c120554ec89da8c38.tar.bz2
mitmproxy-6b9c2739c20c4c4115e49b5c120554ec89da8c38.zip
Merge pull request #66 from Kriechi/improve-alpn-support
improve ALPN support on travis
Diffstat (limited to 'netlib/http2/protocol.py')
-rw-r--r--netlib/http2/protocol.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/netlib/http2/protocol.py b/netlib/http2/protocol.py
index 459c2293..feac220c 100644
--- a/netlib/http2/protocol.py
+++ b/netlib/http2/protocol.py
@@ -61,7 +61,6 @@ class HTTP2Protocol(object):
assert settings_ack_frame.flags & frame.Frame.FLAG_ACK
assert len(settings_ack_frame.settings) == 0
-
def next_stream_id(self):
if self.current_stream_id is None:
self.current_stream_id = 1
@@ -89,7 +88,10 @@ class HTTP2Protocol(object):
self.http2_settings[setting] = value
- self.send_frame(frame.SettingsFrame(state=self, flags=frame.Frame.FLAG_ACK))
+ self.send_frame(
+ frame.SettingsFrame(
+ state=self,
+ flags=frame.Frame.FLAG_ACK))
def _create_headers(self, headers, stream_id, end_stream=True):
# TODO: implement max frame size checks and sending in chunks