diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-08-11 11:47:07 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-08-11 11:47:07 +1200 |
| commit | 2da57ecff0e9572e45663dbad1c5f520e57c531f (patch) | |
| tree | f655fc4459f551ebab723ba876f76080caa2b418 /netlib | |
| parent | b9f06b473cd464e82bc53a973c5e190f93377bce (diff) | |
| download | mitmproxy-2da57ecff0e9572e45663dbad1c5f520e57c531f.tar.gz mitmproxy-2da57ecff0e9572e45663dbad1c5f520e57c531f.tar.bz2 mitmproxy-2da57ecff0e9572e45663dbad1c5f520e57c531f.zip | |
Correct order of precedence for SSL errors.
Diffstat (limited to 'netlib')
| -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 df1f8fea..f4a8acf9 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -130,8 +130,6 @@ class Reader(_FileLike): data = self.o.read(rlen) except SSL.ZeroReturnError: break - except SSL.Error, v: - raise NetLibSSLError(v.message) except SSL.WantReadError: if (time.time() - start) < self.o.gettimeout(): time.sleep(0.1) @@ -144,6 +142,8 @@ class Reader(_FileLike): raise NetLibDisconnect except SSL.SysCallError: raise NetLibDisconnect + except SSL.Error, v: + raise NetLibSSLError(v.message) self.first_byte_timestamp = self.first_byte_timestamp or time.time() if not data: break |