aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-02-16 16:43:35 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-02-16 16:43:35 +1300
commit66349c97836c5885919f9fd2bce75ddd04bfc39a (patch)
treea5d170848515d8b293de80c196760848552308ed /libmproxy/proxy.py
parent27f0765cdd6bb29fe1dd00aaa24b17ae50888368 (diff)
downloadmitmproxy-66349c97836c5885919f9fd2bce75ddd04bfc39a.tar.gz
mitmproxy-66349c97836c5885919f9fd2bce75ddd04bfc39a.tar.bz2
mitmproxy-66349c97836c5885919f9fd2bce75ddd04bfc39a.zip
FlowMaster bugfixes and unit tests.
Diffstat (limited to 'libmproxy/proxy.py')
-rw-r--r--libmproxy/proxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 6093c936..e2c25966 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -433,7 +433,7 @@ class ServerConnection:
if code >= 100 and code <= 199:
return self.read_response()
if self.request.method == "HEAD" or code == 204 or code == 304:
- content = None
+ content = ""
else:
content = read_http_body(self.rfile, self, headers, True)
return Response(self.request, code, msg, headers, content)