entrouvert
/
debian-quixote3
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactor QuixoteHandler(), remove conn.close() call. 

We should not close the connection inside the handle_connection()
method, the caller will call shutdown() and then close().  Refactor
so that 'input' and 'output' file descriptors are closed on errors.
This commit is contained in:
Neil Schemenauer 2016-05-26 18:08:04 +00:00
parent f9651c3957
commit 641f5e9bb3
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
quixote/server/scgi_server.py
View File

@ -10,29 +10,31 @@ class QuixoteHandler(scgi_server.SCGIHandler):
self.publisher = create_publisher()
self.script_name = script_name
def _set_script_name(self, env):
# mod_scgi doesn't know SCRIPT_NAME :-(
prefix = self.script_name
path = env['SCRIPT_NAME']
assert path[:len(prefix)] == prefix, (
"path %r doesn't start with script_name %r" % (path, prefix))
env['SCRIPT_NAME'] = prefix
env['PATH_INFO'] = path[len(prefix):] + env.get('PATH_INFO', '')
def handle_connection(self, conn):
input = conn.makefile("rb")
output = conn.makefile("wb")
env = self.read_env(input)
if self.script_name is not None:
# mod_scgi doesn't know SCRIPT_NAME :-(
prefix = self.script_name
path = env['SCRIPT_NAME']
assert path[:len(prefix)] == prefix, (
"path %r doesn't start with script_name %r" % (path, prefix))
env['SCRIPT_NAME'] = prefix
env['PATH_INFO'] = path[len(prefix):] + env.get('PATH_INFO', '')
response = self.publisher.process(input, env)
try:
response.write(output)
env = self.read_env(input)
if self.script_name is not None:
self._set_script_name(env)
response = self.publisher.process(input, env)
try:
response.write(output)
except IOError as err:
self.publisher.log("IOError while sending response "
"ignored: %s" % err)
finally:
input.close()
output.close()
conn.close()
except IOError as err:
self.publisher.log("IOError while sending response "
"ignored: %s" % err)
def run(create_publisher, host='localhost', port=3000, script_name=None,