diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-13 06:24:08 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-13 06:24:08 +0100 |
| commit | 969595cca70edc4d02d5f676221267edf01e4252 (patch) | |
| tree | 566f0a304c65a62790774f356a39f1d286811305 | |
| parent | 22aae5fb6654e685e5a1f42ad0f0ea5864f0e2c8 (diff) | |
| download | mitmproxy-969595cca70edc4d02d5f676221267edf01e4252.tar.gz mitmproxy-969595cca70edc4d02d5f676221267edf01e4252.tar.bz2 mitmproxy-969595cca70edc4d02d5f676221267edf01e4252.zip | |
add requirements.txt, small changes
| -rw-r--r-- | netlib/http.py | 4 | ||||
| -rw-r--r-- | netlib/http_auth.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/netlib/http.py b/netlib/http.py index 7060b688..e160bd79 100644 --- a/netlib/http.py +++ b/netlib/http.py @@ -233,6 +233,10 @@ def parse_init(line): def parse_init_connect(line): + """ + Returns (host, port, httpversion) if line is a valid CONNECT line. + http://tools.ietf.org/html/draft-luotonen-web-proxy-tunneling-01 section 3.1 + """ v = parse_init(line) if not v: return None diff --git a/netlib/http_auth.py b/netlib/http_auth.py index 69bee5c1..8f062826 100644 --- a/netlib/http_auth.py +++ b/netlib/http_auth.py @@ -126,8 +126,6 @@ class AuthAction(Action): """ def __call__(self, parser, namespace, values, option_string=None): passman = self.getPasswordManager(values) - if not passman: - raise ArgumentTypeError("Error creating password manager for proxy authentication.") authenticator = BasicProxyAuth(passman, "mitmproxy") setattr(namespace, self.dest, authenticator) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..ede8bf4a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +pyasn1>=0.1.7 +pyOpenSSL>=0.13 +nose>=1.3.0 +pathod>=0.9.2
\ No newline at end of file |