mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
...
This commit is contained in:
parent
0f6e191bf8
commit
be2c8a35ee
@ -489,7 +489,7 @@ class HTTPPair(object):
|
|||||||
def generate_static_output(self, name, generator):
|
def generate_static_output(self, name, generator):
|
||||||
return generate_static_output(self.server_loop.gso_cache, self.server_loop.gso_lock, name, generator)
|
return generate_static_output(self.server_loop.gso_cache, self.server_loop.gso_lock, name, generator)
|
||||||
|
|
||||||
def response(self):
|
def respond(self):
|
||||||
if self.chunked_read:
|
if self.chunked_read:
|
||||||
self.input_reader = ChunkedReader(self.conn.socket_file, self.max_request_body_size)
|
self.input_reader = ChunkedReader(self.conn.socket_file, self.max_request_body_size)
|
||||||
else:
|
else:
|
||||||
|
@ -395,6 +395,7 @@ class WorkerThread(Thread): # {{{
|
|||||||
self.ready = False
|
self.ready = False
|
||||||
self.serving = False
|
self.serving = False
|
||||||
self.server_loop = server_loop
|
self.server_loop = server_loop
|
||||||
|
self.conn = None
|
||||||
Thread.__init__(self, name='ServerWorker')
|
Thread.__init__(self, name='ServerWorker')
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
@ -402,7 +403,7 @@ class WorkerThread(Thread): # {{{
|
|||||||
self.ready = True
|
self.ready = True
|
||||||
while True:
|
while True:
|
||||||
self.serving = False
|
self.serving = False
|
||||||
conn = self.server_loop.requests.get()
|
self.conn = conn = self.server_loop.requests.get()
|
||||||
if conn is None:
|
if conn is None:
|
||||||
return # Clean exit
|
return # Clean exit
|
||||||
with conn, self:
|
with conn, self:
|
||||||
|
@ -65,7 +65,10 @@ class MultiDict(dict): # {{{
|
|||||||
return dict.__getitem__(self, key)
|
return dict.__getitem__(self, key)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
return []
|
return []
|
||||||
return self.__getitem__(key)
|
try:
|
||||||
|
return self.__getitem__(key)
|
||||||
|
except KeyError:
|
||||||
|
return default
|
||||||
|
|
||||||
def pop(self, key, default=None, all=False):
|
def pop(self, key, default=None, all=False):
|
||||||
ans = dict.pop(self, key, default)
|
ans = dict.pop(self, key, default)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user