diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-09-07 09:53:53 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-09-07 09:53:53 +1200 |
| commit | 362fdf9bae85250634c59d07b60158ff642a12c0 (patch) | |
| tree | 1385367050b6bae4af0747cbb3c528f76d762a07 /libmproxy/controller.py | |
| parent | 7629a43d82bb6090ebf9101383603f81f6f9940a (diff) | |
| parent | e5bded7deecb396bef33ebc0a5e345e4d8cf7928 (diff) | |
| download | mitmproxy-362fdf9bae85250634c59d07b60158ff642a12c0.tar.gz mitmproxy-362fdf9bae85250634c59d07b60158ff642a12c0.tar.bz2 mitmproxy-362fdf9bae85250634c59d07b60158ff642a12c0.zip | |
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 756e51e6..67ce2460 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -80,6 +80,8 @@ class Master: return changed def run(self): + global should_exit + should_exit = False if self.server: slave = Slave(self.masterq, self.server) slave.start() |