From 79af9e89c44597e58e6db0486a54e133e9def704 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 9 Jul 2012 11:18:03 +1200 Subject: Test replay corner cases. Fix discovered bugs. --- libmproxy/proxy.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index bc7051d4..e7b2c409 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -67,11 +67,9 @@ class RequestReplayThread(threading.Thread): self.flow.request, httpversion, code, msg, headers, content, server.cert ) response._send(self.masterq) - except (ProxyError, http.HttpError), v: - err = flow.Error(self.flow.request, v.msg) + except (ProxyError, http.HttpError, tcp.NetLibError), v: + err = flow.Error(self.flow.request, str(v)) err._send(self.masterq) - except tcp.NetLibError, v: - raise ProxyError(502, v) class ServerConnection(tcp.TCPClient): -- cgit v1.2.3