summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-09-12 21:28:01 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-09-12 21:28:01 +0000
commitd2321e37eb149fdd20c5332ac8b648b3244e0b39 (patch)
tree2711004070ed03fe339aa261e42b426481cfc77b
parent1aef132090f5717add930e5e5da2287235b85b68 (diff)
Fixed #11660 -- Corrected the CONTENT_TYPE and CONTENT_LENGTH headers provided by the mod_python handler. Thanks to Nowell Strite and Tareque Hossain for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS3
-rw-r--r--django/core/handlers/modpython.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 907deb0df2..4ba21fe0d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -202,6 +202,7 @@ answer newbie questions, and generally made Django that much better:
Kieran Holland <http://www.kieranholland.com>
Sung-Jin Hong <serialx.net@gmail.com>
Leo "hylje" Honkanen <sealage@gmail.com>
+ Tareque Hossain <http://www.codexn.com>
Richard House <Richard.House@i-logue.com>
Robert Rock Howard <http://djangomojo.com/>
John Huddleston <huddlej@wwu.edu>
@@ -402,7 +403,7 @@ answer newbie questions, and generally made Django that much better:
Vasiliy Stavenko <stavenko@gmail.com>
Thomas Steinacher <http://www.eggdrop.ch/>
Johan C. Stöver <johan@nilling.nl>
- nowell strite
+ Nowell Strite <http://nowell.strite.org/>
Thomas Stromberg <tstromberg@google.com>
Pascal Varet
SuperJared
diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py
index c6dcf23e9a..b1e3e17227 100644
--- a/django/core/handlers/modpython.py
+++ b/django/core/handlers/modpython.py
@@ -134,8 +134,8 @@ class ModPythonRequest(http.HttpRequest):
if not hasattr(self, '_meta'):
self._meta = {
'AUTH_TYPE': self._req.ap_auth_type,
- 'CONTENT_LENGTH': self._req.clength, # This may be wrong
- 'CONTENT_TYPE': self._req.content_type, # This may be wrong
+ 'CONTENT_LENGTH': self._req.headers_in.get('content-length', 0),
+ 'CONTENT_TYPE': self._req.headers_in.get('content-type'),
'GATEWAY_INTERFACE': 'CGI/1.1',
'PATH_INFO': self.path_info,
'PATH_TRANSLATED': None, # Not supported