aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/proxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-03-24 12:03:50 +1300
committerAldo Cortesi <aldo@corte.si>2018-04-01 09:46:32 +1200
commita2d45193546962e2e14d1959e1bf008c83b9f3cf (patch)
tree29aa797f13e7ae5ec0c1a3e2ee17f3dc008282a8 /mitmproxy/proxy
parentb5c3883b7886a73043b6cc292ce4a51066ca260a (diff)
downloadmitmproxy-a2d45193546962e2e14d1959e1bf008c83b9f3cf.tar.gz
mitmproxy-a2d45193546962e2e14d1959e1bf008c83b9f3cf.tar.bz2
mitmproxy-a2d45193546962e2e14d1959e1bf008c83b9f3cf.zip
asyncio: brutally rip out our old queue mechanism
Diffstat (limited to 'mitmproxy/proxy')
-rw-r--r--mitmproxy/proxy/protocol/http_replay.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mitmproxy/proxy/protocol/http_replay.py b/mitmproxy/proxy/protocol/http_replay.py
index 0f3be1ea..bd3ecb98 100644
--- a/mitmproxy/proxy/protocol/http_replay.py
+++ b/mitmproxy/proxy/protocol/http_replay.py
@@ -1,3 +1,4 @@
+import asyncio
import queue
import threading
import typing
@@ -25,6 +26,7 @@ class RequestReplayThread(basethread.BaseThread):
self,
opts: options.Options,
f: http.HTTPFlow,
+ loop: asyncio.AbstractEventLoop,
event_queue: typing.Optional[queue.Queue],
should_exit: threading.Event
) -> None:
@@ -36,7 +38,7 @@ class RequestReplayThread(basethread.BaseThread):
self.f = f
f.live = True
if event_queue:
- self.channel = controller.Channel(event_queue, should_exit)
+ self.channel = controller.Channel(loop, event_queue, should_exit)
else:
self.channel = None
super().__init__(