aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/http_replay.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-03 17:01:25 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-03 17:01:25 +0200
commitf4272de5ec77fb57723e2274e4ddc50d73489e1e (patch)
tree2f7ad35411c29c15199f2498bb43571047c0d066 /libmproxy/protocol/http_replay.py
parent1f6d05f89fada5fe360aa79abfa80a3c91ce54da (diff)
downloadmitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.tar.gz
mitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.tar.bz2
mitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.zip
remove ServerConnectionMixin.reconnect
Diffstat (limited to 'libmproxy/protocol/http_replay.py')
-rw-r--r--libmproxy/protocol/http_replay.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/protocol/http_replay.py b/libmproxy/protocol/http_replay.py
index 2759a019..a9ee5506 100644
--- a/libmproxy/protocol/http_replay.py
+++ b/libmproxy/protocol/http_replay.py
@@ -6,7 +6,7 @@ from netlib.http.http1 import HTTP1Protocol
from netlib.tcp import NetLibError
from ..controller import Channel
from ..models import Error, HTTPResponse, ServerConnection, make_connect_request
-from .base import Log, Kill
+from .base import Kill
# TODO: Doesn't really belong into libmproxy.protocol...
@@ -89,8 +89,9 @@ class RequestReplayThread(threading.Thread):
if self.channel:
self.channel.ask("error", self.flow)
except Kill:
- # KillSignal should only be raised if there's a channel in the
+ # Kill should only be raised if there's a channel in the
# first place.
+ from ..proxy.root_context import Log
self.channel.tell("log", Log("Connection killed", "info"))
finally:
r.form_out = form_out_backup