Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forgot the SSLWantRead is a subclass of socket.error

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-23 11:30:13 +05:30
parent d3586a79a9
commit 3574807c34
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/srv/loop.py
View File

@ -232,6 +232,8 @@ class Connection(object): # {{{
self.ready = False self.ready = False
return 0 return 0
return bytes_read return bytes_read
except ssl.SSLWantReadError:
return 0
except socket.error as e: except socket.error as e:
if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr: if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr:
return 0 return 0
@ -239,8 +241,6 @@ class Connection(object): # {{{
self.ready = False self.ready = False
return 0 return 0
raise raise
except ssl.SSLWantReadError:
return 0
def fill_read_buffer(self): def fill_read_buffer(self):
try: try:
@ -250,6 +250,8 @@ class Connection(object): # {{{
# a closed connection is indicated by signaling # a closed connection is indicated by signaling
# a read condition, and having recv() return 0. # a read condition, and having recv() return 0.
self.ready = False self.ready = False
except ssl.SSLWantReadError:
return
except socket.error as e: except socket.error as e:
if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr: if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr:
return return
@ -257,8 +259,6 @@ class Connection(object): # {{{
self.ready = False self.ready = False
return return
raise raise
except ssl.SSLWantReadError:
return
def close(self): def close(self):
self.ready = False self.ready = False