aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-10-26 14:49:48 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-10-26 14:49:48 +1300
commit28fd3bd461f17ce6b1af09eca7e84965dbb41c9d (patch)
treec662d7946c4706f15bf394c5774e9c8de3d5b53f /libmproxy
parent3b246f7e278c485a98a5c3b37a21c82b18fd1fee (diff)
parent17facd8b72c0c0ae8b1e9d594aab2f42587a2c8c (diff)
downloadmitmproxy-28fd3bd461f17ce6b1af09eca7e84965dbb41c9d.tar.gz
mitmproxy-28fd3bd461f17ce6b1af09eca7e84965dbb41c9d.tar.bz2
mitmproxy-28fd3bd461f17ce6b1af09eca7e84965dbb41c9d.zip
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/proxy.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 7b6e695f..32057c24 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -214,6 +214,8 @@ class ServerConnection:
if not line:
raise ProxyError(502, "Blank server response.")
parts = line.strip().split(" ", 2)
+ if len(parts) == 2: # handle missing message gracefully
+ parts.append("")
if not len(parts) == 3:
raise ProxyError(502, "Invalid server response: %s."%line)
proto, code, msg = parts