sys.exit(1)
if setlog:
logging.basicConfig(format="ashd-wsgi(%(name)s): %(levelname)s: %(message)s")
+log = logging.getLogger("ashd-wsgi")
try:
handlermod = __import__(args[0], fromlist = ["dummy"])
env["SCRIPT_NAME"] = name
env["PATH_INFO"] = pi
if "Host" in req: env["SERVER_NAME"] = req["Host"]
+ if "X-Ash-Server-Address" in req: env["SERVER_ADDR"] = req["X-Ash-Server-Address"]
if "X-Ash-Server-Port" in req: env["SERVER_PORT"] = req["X-Ash-Server-Port"]
if "X-Ash-Protocol" in req and req["X-Ash-Protocol"] == "https": env["HTTPS"] = "on"
if "X-Ash-Address" in req: env["REMOTE_ADDR"] = req["X-Ash-Address"]
- if "Content-Type" in req: env["CONTENT_TYPE"] = req["Content-Type"]
- if "Content-Length" in req: env["CONTENT_LENGTH"] = req["Content-Length"]
+ if "X-Ash-Port" in req: env["REMOTE_PORT"] = req["X-Ash-Port"]
+ if "Content-Type" in req:
+ env["CONTENT_TYPE"] = req["Content-Type"]
+ # The CGI specification does not strictly require this, but
+ # many actualy programs and libraries seem to.
+ del env["HTTP_CONTENT_TYPE"]
+ if "Content-Length" in req:
+ env["CONTENT_LENGTH"] = req["Content-Length"]
+ del env["HTTP_CONTENT_LENGTH"]
if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"])
if "X-Ash-Protocol" in req: env["wsgi.url_scheme"] = req["X-Ash-Protocol"]
env["wsgi.input"] = req.sk
reqevent = ashd.perf.request(env)
exc = (None, None, None)
try:
- respiter = handler(env, startreq)
try:
+ respiter = handler(env, startreq)
try:
for data in respiter:
write(data)
if resp:
flushreq()
- except closed:
- pass
- finally:
- if hasattr(respiter, "close"):
- respiter.close()
+ finally:
+ if hasattr(respiter, "close"):
+ respiter.close()
+ except closed:
+ pass
if resp:
reqevent.response(resp)
except:
flightlock.notify()
finally:
flightlock.release()
+ except:
+ log.error("exception occurred in handler thread", exc_info=True)
finally:
self.req.close()