diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-28 03:15:26 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-28 03:15:26 +0200 |
| commit | e73a2dbab12296d9787164b5b33320b6d31784d5 (patch) | |
| tree | ff58f54fd2e1b6ad0003d6a991fb4fa2a7d215a2 /netlib/test.py | |
| parent | 0e307964698379a973e8a1f96e3145188b9c0b8d (diff) | |
| download | mitmproxy-e73a2dbab12296d9787164b5b33320b6d31784d5.tar.gz mitmproxy-e73a2dbab12296d9787164b5b33320b6d31784d5.tar.bz2 mitmproxy-e73a2dbab12296d9787164b5b33320b6d31784d5.zip | |
minor changes
Diffstat (limited to 'netlib/test.py')
| -rw-r--r-- | netlib/test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/test.py b/netlib/test.py index 31a848a6..fb468907 100644 --- a/netlib/test.py +++ b/netlib/test.py @@ -64,7 +64,7 @@ class TServer(tcp.TCPServer): key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, raw) if self.ssl["v3_only"]: method = tcp.SSLv3_METHOD - options = tcp.OP_NO_SSLv2|tcp.OP_NO_TLSv1 + options = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_TLSv1 else: method = tcp.SSLv23_METHOD options = None @@ -80,7 +80,7 @@ class TServer(tcp.TCPServer): h.handle() h.finish() - def handle_error(self, request, client_address): + def handle_error(self, connection, client_address, fp=None): s = cStringIO.StringIO() - tcp.TCPServer.handle_error(self, request, client_address, s) + tcp.TCPServer.handle_error(self, connection, client_address, s) self.q.put(s.getvalue()) |