diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-02-07 16:26:19 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-02-07 16:26:19 +0100 |
| commit | 53fadd05f4e015657cf8815d9dedc6486a4b3f02 (patch) | |
| tree | 1aaa1291e21a4768a4a85e71692e43a540b3fb52 /libmproxy/script.py | |
| parent | 0d608c1fb3724c9399842ca6f6c97b147cb23936 (diff) | |
| download | mitmproxy-53fadd05f4e015657cf8815d9dedc6486a4b3f02.tar.gz mitmproxy-53fadd05f4e015657cf8815d9dedc6486a4b3f02.tar.bz2 mitmproxy-53fadd05f4e015657cf8815d9dedc6486a4b3f02.zip | |
fix #451
Diffstat (limited to 'libmproxy/script.py')
| -rw-r--r-- | libmproxy/script.py | 10 |
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): |