From 94fbf066f772032d9ccfdf351c2e50c1488c1d68 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 18 Aug 2014 01:47:39 +0200 Subject: fix script tests --- libmproxy/proxy/connection.py | 2 ++ libmproxy/script.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'libmproxy') diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py index a269dab1..07129d6a 100644 --- a/libmproxy/proxy/connection.py +++ b/libmproxy/proxy/connection.py @@ -17,6 +17,7 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject): self.rfile = None self.address = None self.clientcert = None + self.ssl_established = None self.timestamp_start = utils.timestamp() self.timestamp_end = None @@ -30,6 +31,7 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject): ) _stateobject_attributes = dict( + ssl_established=bool, timestamp_start=float, timestamp_end=float, timestamp_ssl_setup=float diff --git a/libmproxy/script.py b/libmproxy/script.py index b8d6e731..e582c4e8 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -120,7 +120,7 @@ def _handle_concurrent_reply(fn, o, *args, **kwargs): def run(): fn(*args, **kwargs) - o.reply() + o.reply() # If the script did not call .reply(), we have to do it now. threading.Thread(target=run, name="ScriptThread").start() -- cgit v1.2.3