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

Server: Fix timeout errors when using SSL (particularly common when running the server on windows)

Browse Source 
I forgot to drain the internal SSL buffer in the read loop before
passing the socket to select()
This commit is contained in:
Kovid Goyal 2017-06-26 12:20:00 +05:30
parent 6d4c8e61d3
commit fae7613a08
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,14 @@ class Connection(object): # {{{
return return
raise raise
def drain_ssl_buffer(self):
try:
self.read_buffer.recv_from(self.socket)
except Exception:
# Ignore errors since we dont know if the SSL buffer had
# any data or not
pass
def close(self): def close(self):
self.ready = False self.ready = False
self.handle_event = None # prevent reference cycles self.handle_event = None # prevent reference cycles
@ -486,6 +494,7 @@ class ServerLoop(object):
def tick(self): def tick(self):
now = monotonic() now = monotonic()
read_needed, write_needed, readable, remove = [], [], [], [] read_needed, write_needed, readable, remove = [], [], [], []
has_ssl = self.ssl_context is not None
for s, conn in self.connection_map.iteritems(): for s, conn in self.connection_map.iteritems():
if now - conn.last_activity > self.opts.timeout: if now - conn.last_activity > self.opts.timeout:
if conn.handle_timeout(): if conn.handle_timeout():
@ -494,13 +503,19 @@ class ServerLoop(object):
remove.append((s, conn)) remove.append((s, conn))
continue continue
wf = conn.wait_for wf = conn.wait_for
if wf is READ: if wf is READ or wf is RDWR:
(readable if conn.read_buffer.has_data else read_needed).append(s) if wf is RDWR:
write_needed.append(s)
if conn.read_buffer.has_data:
readable.append(s)
else:
if has_ssl:
conn.drain_ssl_buffer()
(readable if conn.read_buffer.has_data else read_needed).append(s)
else:
read_needed.append(s)
elif wf is WRITE: elif wf is WRITE:
write_needed.append(s) write_needed.append(s)
elif wf is RDWR:
write_needed.append(s)
(readable if conn.read_buffer.has_data else read_needed).append(s)
for s, conn in remove: for s, conn in remove:
self.log('Closing connection because of extended inactivity: %s' % conn.state_description) self.log('Closing connection because of extended inactivity: %s' % conn.state_description)