aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/script.py
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/script.py')
-rw-r--r--libmproxy/script.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/libmproxy/script.py b/libmproxy/script.py
index b559615b..9cf402b7 100644
--- a/libmproxy/script.py
+++ b/libmproxy/script.py
@@ -36,7 +36,7 @@ class ScriptContext:
Replay the request on the current flow. The response will be added
to the flow object.
"""
- self._master.replay_request(f)
+ return self._master.replay_request(f, block=True, run_scripthooks=False)
@property
def app_registry(self):
@@ -139,8 +139,12 @@ def _handle_concurrent_reply(fn, o, *args, **kwargs):
def run():
fn(*args, **kwargs)
- o.reply() # If the script did not call .reply(), we have to do it now.
- threading.Thread(target=run, name="ScriptThread").start()
+ reply_proxy() # If the script did not call .reply(), we have to do it now.
+ ScriptThread(target=run).start()
+
+
+class ScriptThread(threading.Thread):
+ name = "ScriptThread"
def concurrent(fn):