Folded django.core.handlers.modpython.populate_apache_request into ModPythonHandler.__call__() to save the overhead of a function call, and because that logic didn't need to be abstracted.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
15e7805ae4
commit
beeb719c12
|
@ -160,23 +160,20 @@ class ModPythonHandler(BaseHandler):
|
||||||
dispatcher.send(signal=signals.request_finished)
|
dispatcher.send(signal=signals.request_finished)
|
||||||
|
|
||||||
# Convert our custom HttpResponse object back into the mod_python req.
|
# Convert our custom HttpResponse object back into the mod_python req.
|
||||||
populate_apache_request(response, req)
|
req.content_type = response['Content-Type']
|
||||||
return 0 # mod_python.apache.OK
|
for key, value in response.headers.items():
|
||||||
|
if key != 'Content-Type':
|
||||||
|
req.headers_out[key] = value
|
||||||
|
for c in response.cookies.values():
|
||||||
|
req.headers_out.add('Set-Cookie', c.output(header=''))
|
||||||
|
req.status = response.status_code
|
||||||
|
try:
|
||||||
|
for chunk in response:
|
||||||
|
req.write(chunk)
|
||||||
|
finally:
|
||||||
|
response.close()
|
||||||
|
|
||||||
def populate_apache_request(http_response, mod_python_req):
|
return 0 # mod_python.apache.OK
|
||||||
"Populates the mod_python request object with an HttpResponse"
|
|
||||||
mod_python_req.content_type = http_response['Content-Type']
|
|
||||||
for key, value in http_response.headers.items():
|
|
||||||
if key != 'Content-Type':
|
|
||||||
mod_python_req.headers_out[key] = value
|
|
||||||
for c in http_response.cookies.values():
|
|
||||||
mod_python_req.headers_out.add('Set-Cookie', c.output(header=''))
|
|
||||||
mod_python_req.status = http_response.status_code
|
|
||||||
try:
|
|
||||||
for chunk in http_response:
|
|
||||||
mod_python_req.write(chunk)
|
|
||||||
finally:
|
|
||||||
http_response.close()
|
|
||||||
|
|
||||||
def handler(req):
|
def handler(req):
|
||||||
# mod_python hooks into this function.
|
# mod_python hooks into this function.
|
||||||
|
|
Loading…
Reference in New Issue