diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 13:32:24 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 13:32:24 +1300 |
| commit | efe11a0782a668b4310849f7696cc89004d82f45 (patch) | |
| tree | 70169d8f7074480e5df469a3a2c9482cb28298da /libmproxy/proxy.py | |
| parent | 077272ec9703ff1b3f20f69c971adf63a6dd05c1 (diff) | |
| download | mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.tar.gz mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.tar.bz2 mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.zip | |
Kill deadlock that sometimes occurred on shutdown.
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index f3b9fe53..5e8da3e4 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -85,7 +85,6 @@ class Request(controller.Msg): self.connection = connection self.host, self.port, self.scheme = host, port, scheme self.method, self.path, self.headers, self.content = method, path, headers, content - self.kill = False controller.Msg.__init__(self) def get_state(self): @@ -161,7 +160,6 @@ class Response(controller.Msg): self.request = request self.code, self.proto, self.msg = code, proto, msg self.headers, self.content = headers, content - self.kill = False controller.Msg.__init__(self) def get_state(self): @@ -341,13 +339,13 @@ class ProxyHandler(SocketServer.StreamRequestHandler): try: request = self.read_request(bc) request = request.send(self.mqueue) - if request.kill: + if request is None: self.finish() return server = ServerConnection(request) response = server.read_response() response = response.send(self.mqueue) - if response.kill: + if response is None: server.terminate() self.finish() return @@ -405,6 +403,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): self.wfile.flush() def terminate(self, connection, wfile, rfile): + self.request.close() try: if not getattr(wfile, "closed", False): wfile.flush() |