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

Oops, forgot to make the actual connection sockets non-blocking

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-16 10:06:56 +05:30
parent ef765ff73e
commit b1c059a6e9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,10 +137,10 @@ class Connection(object): # {{{
self.socket = self.ssl_context.wrap_socket(socket, server_side=True, do_handshake_on_connect=False) self.socket = self.ssl_context.wrap_socket(socket, server_side=True, do_handshake_on_connect=False)
self.set_state(RDWR, self.do_ssl_handshake) self.set_state(RDWR, self.do_ssl_handshake)
else: else:
self.ready = True
self.socket = socket self.socket = socket
self.connection_ready() self.connection_ready()
self.last_activity = monotonic() self.last_activity = monotonic()
self.ready = True
def optimize_for_sending_packet(self): def optimize_for_sending_packet(self):
start_cork(self.socket) start_cork(self.socket)
@ -173,8 +173,8 @@ class Connection(object): # {{{
self.set_state(READ, self.do_ssl_handshake) self.set_state(READ, self.do_ssl_handshake)
except ssl.SSLWantWriteError: except ssl.SSLWantWriteError:
self.set_state(WRITE, self.do_ssl_handshake) self.set_state(WRITE, self.do_ssl_handshake)
self.ready = True else:
self.connection_ready() self.connection_ready()
def send(self, data): def send(self, data):
try: try:
@ -561,7 +561,9 @@ class ServerLoop(object):
def accept(self): def accept(self):
try: try:
return self.socket.accept() sock, addr = self.socket.accept()
set_socket_inherit(sock, False), sock.setblocking(False)
return sock, addr
except socket.error: except socket.error:
return None, None return None, None