diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-26 21:29:45 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-26 21:29:45 +1300 |
commit | 7433dfceae3b2ac7e709fbcedd9e298800d2ac1b (patch) | |
tree | 24e14720a95dbb8ed82e156e7173baca6f5bbc5c /netlib/tcp.py | |
parent | e5b125eec8e732112af9884cf3ab35377913303a (diff) | |
download | mitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.tar.gz mitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.tar.bz2 mitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.zip |
Bump unit tests, fix two serious wee buglets discovered.
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r-- | netlib/tcp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index a79f3ac4..40bd4bde 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -185,7 +185,7 @@ class TCPClient: """ context = SSL.Context(method) if options is not None: - ctx.set_options(options) + context.set_options(options) if clientcert: try: context.use_privatekey_file(clientcert) @@ -220,7 +220,7 @@ class TCPClient: self.connection.settimeout(n) def gettimeout(self): - self.connection.gettimeout() + return self.connection.gettimeout() def close(self): """ |