aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-01-20 19:13:36 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-04 09:52:02 +0100
commit94977e0e3ddc16c70386b1f4d443984ff84320ac (patch)
tree0c373501d74f883d9a556ccff2f8c32d359ad4de
parent26b7ff95251885dd321fc7ed4bee90b229f409b8 (diff)
downloadmitmproxy-94977e0e3ddc16c70386b1f4d443984ff84320ac.tar.gz
mitmproxy-94977e0e3ddc16c70386b1f4d443984ff84320ac.tar.bz2
mitmproxy-94977e0e3ddc16c70386b1f4d443984ff84320ac.zip
remove manual settings acknowledge
-rw-r--r--libmproxy/protocol/http.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index d770c937..dad97fc3 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -16,7 +16,6 @@ from netlib.tcp import Address, ssl_read_select
import h2
from h2.connection import H2Connection
from h2.events import *
-from hyperframe import frame
from .base import Layer, Kill
from .. import utils
@@ -163,11 +162,6 @@ class SafeH2Connection(H2Connection):
pass
self.conn.send(self.data_to_send())
- def safe_acknowledge_settings(self, event):
- with self.conn.h2.lock:
- self.conn.h2.acknowledge_settings(event)
- self.conn.send(self.data_to_send())
-
def safe_update_settings(self, new_settings):
with self.conn.h2.lock:
self.update_settings(new_settings)
@@ -274,7 +268,6 @@ class Http2Layer(Layer):
other_stream_id = self.streams[eid].server_stream_id
other_conn.h2.safe_reset_stream(other_stream_id, event.error_code)
elif isinstance(event, RemoteSettingsChanged):
- source_conn.h2.safe_acknowledge_settings(event)
new_settings = dict([(id, cs.new_value) for (id, cs) in event.changed_settings.iteritems()])
other_conn.h2.safe_update_settings(new_settings)
elif isinstance(event, ConnectionTerminated):
@@ -356,14 +349,6 @@ class Http2SingleStreamLayer(_HttpLayer, threading.Thread):
def is_zombie(self, h2_conn, stream_id):
if self.zombie:
return True
-
- # try:
- # # TODO: replace private API call
- # h2_conn._get_stream_by_id(stream_id)
- # except Exception as e:
- # if isinstance(e, h2.exceptions.StreamClosedError):
- # return true
-
return False
def read_request(self):