diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 20:36:06 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 20:36:06 +1300 |
commit | ed7ef84557452bf43190b94a7b5c3393bb796178 (patch) | |
tree | 5e47832996de048260e5330e65bd4b9875b0fcf2 /libpathod/pathod.py | |
parent | 5493925ea07aabc569d0f6cddffff49fda59383c (diff) | |
download | mitmproxy-ed7ef84557452bf43190b94a7b5c3393bb796178.tar.gz mitmproxy-ed7ef84557452bf43190b94a7b5c3393bb796178.tar.bz2 mitmproxy-ed7ef84557452bf43190b94a7b5c3393bb796178.zip |
Implement and unit test not-after-connect option.
Diffstat (limited to 'libpathod/pathod.py')
-rw-r--r-- | libpathod/pathod.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index fa5d519c..ce64acf9 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -70,15 +70,16 @@ class PathodHandler(tcp.BaseHandler): '\r\n' ) self.wfile.flush() - try: - self.convert_to_ssl( - self.server.ssloptions.certfile, - self.server.ssloptions.keyfile, - ) - except tcp.NetLibError, v: - s = str(v) - self.info(s) - return False, dict(type = "error", msg = s) + if not self.server.ssloptions.not_after_connect: + try: + self.convert_to_ssl( + self.server.ssloptions.certfile, + self.server.ssloptions.keyfile, + ) + except tcp.NetLibError, v: + s = str(v) + self.info(s) + return False, dict(type = "error", msg = s) return True, None elif m(http.parse_init_proxy(line)): method, _, _, _, path, httpversion = m.v |