diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-11-04 10:22:13 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-11-04 10:22:13 +1300 |
| commit | 34d419ead8f4062818593916475f1af86db1ee2d (patch) | |
| tree | 9a60b3c84ea6cc4d78ab186046ba08ff6d87b10c /libmproxy | |
| parent | d0de490ef1ced7597471c1867d30213b162a7e89 (diff) | |
| parent | 8522c6ebd6004e7296f8cf5467a4fb3b294ab91d (diff) | |
| download | mitmproxy-34d419ead8f4062818593916475f1af86db1ee2d.tar.gz mitmproxy-34d419ead8f4062818593916475f1af86db1ee2d.tar.bz2 mitmproxy-34d419ead8f4062818593916475f1af86db1ee2d.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/protocol/http.py | 5 | ||||
| -rw-r--r-- | libmproxy/proxy/config.py | 4 |
2 files changed, 4 insertions, 5 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' % ( diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index fe2b45f4..a228192a 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -43,9 +43,9 @@ class ProxyConfig: self.body_size_limit = body_size_limit if mode == "transparent": - self.mode = TransparentProxyMode(platform.resolver(), TRANSPARENT_SSL_PORTS) + self.mode = TransparentProxyMode(platform.resolver(), ssl_ports) elif mode == "socks5": - self.mode = Socks5ProxyMode(TRANSPARENT_SSL_PORTS) + self.mode = Socks5ProxyMode(ssl_ports) elif mode == "reverse": self.mode = ReverseProxyMode(upstream_server) elif mode == "upstream": |