From ed7ef84557452bf43190b94a7b5c3393bb796178 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 5 Jan 2013 20:36:06 +1300 Subject: Implement and unit test not-after-connect option. --- libpathod/pathod.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'libpathod/pathod.py') 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 -- cgit v1.2.3