aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-28 01:51:13 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-28 01:51:13 +0200
commit1cc48345e13917aadc1e0fd93d6011139e78e3d9 (patch)
tree9758b20f95587104807fc74e545e35ec9a9cdef3 /libmproxy/protocol
parenta86491eeed13c7889356e5102312f52bd86c3c66 (diff)
downloadmitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.gz
mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.bz2
mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.zip
clean up config/cmdline, fix bugs, remove cruft
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 4472cb2a..56d7d57f 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -10,6 +10,7 @@ from email.utils import parsedate_tz, formatdate, mktime_tz
import netlib
from netlib import http, tcp, odict, utils, encoding
from netlib.http import cookies, http1, http2
+from netlib.http.http1 import HTTP1Protocol
from netlib.http.semantics import CONTENT_MISSING
from .tcp import TCPHandler
@@ -757,7 +758,6 @@ class RequestReplayThread(threading.Thread):
server.send(self.flow.server_conn.protocol.assemble(r))
self.flow.server_conn = server
- self.flow.server_conn.protocol = http1.HTTP1Protocol(self.flow.server_conn)
self.flow.response = HTTPResponse.from_protocol(
self.flow.server_conn.protocol,
r.method,