aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/http.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-11-01 18:07:32 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-11-01 18:07:32 +0100
commit8522c6ebd6004e7296f8cf5467a4fb3b294ab91d (patch)
tree04398d083fcf10246b323f0dec65d51858df1ab4 /libmproxy/protocol/http.py
parent3b0964f36555949d35659f306054876a49dbcfa1 (diff)
parentc4c42fa040f4e0177516e9830591ca36a3660f3f (diff)
downloadmitmproxy-8522c6ebd6004e7296f8cf5467a4fb3b294ab91d.tar.gz
mitmproxy-8522c6ebd6004e7296f8cf5467a4fb3b294ab91d.tar.bz2
mitmproxy-8522c6ebd6004e7296f8cf5467a4fb3b294ab91d.zip
Merge pull request #393 from onlywade/master
Fixing issue #392, adding tests.
Diffstat (limited to 'libmproxy/protocol/http.py')
-rw-r--r--libmproxy/protocol/http.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 3560f0bd..1472f2ca 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -251,7 +251,7 @@ class HTTPRequest(HTTPMessage):
- authority-form (CONNECT example.com:443)
Details: http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-25#section-5.3
- form_out: The request form which mitmproxy has send out to the
+ form_out: The request form which mitmproxy will send out to the
destination
timestamp_start: Timestamp indicating when request transmission started
@@ -401,9 +401,8 @@ class HTTPRequest(HTTPMessage):
form = form or self.form_out
if form == "relative":
- path = self.path if self.method != "OPTIONS" else "*"
request_line = '%s %s HTTP/%s.%s' % (
- self.method, path, self.httpversion[0], self.httpversion[1]
+ self.method, self.path, self.httpversion[0], self.httpversion[1]
)
elif form == "authority":
request_line = '%s %s:%s HTTP/%s.%s' % (