Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

read_http_body -> read_http_body_request/response

This commit is contained in:
Aldo Cortesi 2012-06-23 15:08:01 +12:00
parent 874649f134
commit e7c75933e7
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmproxy/proxy.py
View File

@ -114,7 +114,7 @@ class ServerConnection(tcp.TCPClient):
if request.method == "HEAD" or code == 204 or code == 304: if request.method == "HEAD" or code == 204 or code == 304:
content = "" content = ""
else: else:
content = http.read_http_body(self.rfile, headers, True, self.config.body_size_limit) content = http.read_http_body_response(self.rfile, headers, True, self.config.body_size_limit)
return flow.Response(request, httpversion, code, msg, headers, content, self.cert) return flow.Response(request, httpversion, code, msg, headers, content, self.cert)
def terminate(self): def terminate(self):
@ -157,10 +157,7 @@ class ProxyHandler(tcp.BaseHandler):
def handle_request(self, cc): def handle_request(self, cc):
try: try:
request, err = None, None request, err = None, None
try: request = self.read_request(cc)
request = self.read_request(cc)
except IOError, v:
raise IOError, "Reading request: %s"%v
if request is None: if request is None:
return return
cc.requestcount += 1 cc.requestcount += 1
@ -184,10 +181,7 @@ class ProxyHandler(tcp.BaseHandler):
scheme, host, port = request.scheme, request.host, request.port scheme, host, port = request.scheme, request.host, request.port
self.server_connect(scheme, host, port) self.server_connect(scheme, host, port)
self.server_conn.send(request) self.server_conn.send(request)
try: response = self.server_conn.read_response(request)
response = self.server_conn.read_response(request)
except IOError, v:
raise IOError, "Reading response: %s"%v
response = response._send(self.mqueue) response = response._send(self.mqueue)
if response is None: if response is None:
self.server_conn.terminate() self.server_conn.terminate()