aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-03 01:11:07 -0700
committerAldo Cortesi <aldo@nullcube.com>2012-06-03 01:11:07 -0700
commit491f9bdceef039ec641e6e77d0d1e7e5fef1e50b (patch)
treeda35910615e9ce53f0118b8f9b6b9352b8f61f66 /libmproxy/proxy.py
parentb36e37f9dad880f3071c6e65bce13e78988f3dba (diff)
downloadmitmproxy-491f9bdceef039ec641e6e77d0d1e7e5fef1e50b.tar.gz
mitmproxy-491f9bdceef039ec641e6e77d0d1e7e5fef1e50b.tar.bz2
mitmproxy-491f9bdceef039ec641e6e77d0d1e7e5fef1e50b.zip
Add unit tests for console/help.py
Diffstat (limited to 'libmproxy/proxy.py')
-rw-r--r--libmproxy/proxy.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 912f3f31..92bdf5f4 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -146,14 +146,13 @@ def parse_request_line(request):
except ValueError:
raise ProxyError(400, "Can't parse request")
port = int(port)
- else:
- if url.startswith("/") or url == "*":
+ elif url.startswith("/") or url == "*":
scheme, port, host, path = None, None, None, url
- else:
- parts = utils.parse_url(url)
- if not parts:
- raise ProxyError(400, "Invalid url: %s"%url)
- scheme, host, port, path = parts
+ else:
+ parts = utils.parse_url(url)
+ if not parts:
+ raise ProxyError(400, "Invalid url: %s"%url)
+ scheme, host, port, path = parts
if not protocol.startswith("HTTP/"):
raise ProxyError(400, "Unsupported protocol")
major,minor = protocol.split('/')[1].split('.')