fix rebase

This commit is contained in:
benoitc 2010-05-31 13:21:19 +02:00 committed by Paul J. Davis
parent 27cc404f1f
commit 1ae47ef82f
3 changed files with 4 additions and 4 deletions

View File

@ -3,5 +3,5 @@
# This file is part of gunicorn released under the MIT license. # This file is part of gunicorn released under the MIT license.
# See the NOTICE for more information. # See the NOTICE for more information.
version_info = (0, 9, 1) version_info = (0, 10, "0-dev")
__version__ = ".".join(map(str, version_info)) __version__ = ".".join(map(str, version_info))

View File

@ -60,7 +60,7 @@ class AsyncWorker(base.Worker):
try: try:
debug = self.cfg.get("debug", False) debug = self.cfg.get("debug", False)
resp, environ = wsgi.create(req, sock, addr, self.address, debug) resp, environ = wsgi.create(req, sock, addr, self.address, debug)
respiter = self.app(environ, resp.start_response) respiter = self.wsgi(environ, resp.start_response)
if respiter == ALREADY_HANDLED: if respiter == ALREADY_HANDLED:
return False return False
for item in respiter: for item in respiter:

View File

@ -91,9 +91,9 @@ class SyncWorker(base.Worker):
def handle_request(self, req, client, addr): def handle_request(self, req, client, addr):
try: try:
debug = self.cfg.get("debug", False) debug = self.cfg.debug or False
resp, environ = wsgi.create(req, client, addr, self.address, debug) resp, environ = wsgi.create(req, client, addr, self.address, debug)
respiter = self.app(environ, resp.start_response) respiter = self.wsgi(environ, resp.start_response)
for item in respiter: for item in respiter:
resp.write(item) resp.write(item)
resp.close() resp.close()