diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 14:19:48 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 14:19:48 +1300 |
| commit | eb93cc22ceee1ea4878235600398831f4bab48f8 (patch) | |
| tree | fa69961bae270b2ed8ac08518efda8a789ee7608 /libmproxy | |
| parent | efe11a0782a668b4310849f7696cc89004d82f45 (diff) | |
| download | mitmproxy-eb93cc22ceee1ea4878235600398831f4bab48f8.tar.gz mitmproxy-eb93cc22ceee1ea4878235600398831f4bab48f8.tar.bz2 mitmproxy-eb93cc22ceee1ea4878235600398831f4bab48f8.zip | |
Fine-tune threading and fix an exception.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/flow.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 30 |
2 files changed, 20 insertions, 12 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 296b6738..3548bf3e 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -9,6 +9,7 @@ class ReplayConnection: pass +# begin nocover class ReplayThread(threading.Thread): def __init__(self, flow, masterq): self.flow, self.masterq = flow, masterq @@ -22,6 +23,7 @@ class ReplayThread(threading.Thread): except proxy.ProxyError, v: err = proxy.Error(self.flow.connection, v.msg) err.send(self.masterq) +# end nocover class Flow: diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 5e8da3e4..9715bb5a 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -305,9 +305,11 @@ class ServerConnection: def read_response(self): proto = self.rfile.readline() + if not proto: + raise ProxyError(200, "Blank server response.") parts = proto.strip().split(" ", 2) if not len(parts) == 3: - raise ProxyError(200, "Invalid server response.") + raise ProxyError(200, "Invalid server response: %s."%proto) proto, code, msg = parts code = int(code) headers = utils.Headers() @@ -415,21 +417,25 @@ class ProxyHandler(SocketServer.StreamRequestHandler): self.terminate(self.connection, self.wfile, self.rfile) def send_error(self, code, body): - import BaseHTTPServer - response = BaseHTTPServer.BaseHTTPRequestHandler.responses[code][0] - self.wfile.write("HTTP/1.0 %s %s\r\n" % (code, response)) - self.wfile.write("Server: %s\r\n"%NAME) - self.wfile.write("Content-type: text/html\r\n") - self.wfile.write("\r\n") - self.wfile.write('<html><head>\n<title>%d %s</title>\n</head>\n' - '<body>\n%s\n</body>\n</html>' % (code, response, body)) - self.wfile.flush() - self.wfile.close() - self.rfile.close() + try: + import BaseHTTPServer + response = BaseHTTPServer.BaseHTTPRequestHandler.responses[code][0] + self.wfile.write("HTTP/1.0 %s %s\r\n" % (code, response)) + self.wfile.write("Server: %s\r\n"%NAME) + self.wfile.write("Content-type: text/html\r\n") + self.wfile.write("\r\n") + self.wfile.write('<html><head>\n<title>%d %s</title>\n</head>\n' + '<body>\n%s\n</body>\n</html>' % (code, response, body)) + self.wfile.flush() + self.wfile.close() + self.rfile.close() + except IOError: + pass ServerBase = SocketServer.ThreadingTCPServer class ProxyServer(ServerBase): + request_queue_size = 20 allow_reuse_address = True def __init__(self, port): self.port = port |