Fixed #1376 -- Undid [2358], which broke flatpages. Thanks, Tom Tobin

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2364 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 8 insertions, 4 deletions

diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index e903509075..23f04ecd9d 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -86,10 +86,6 @@ class BaseHandler:
             if response is None:
                 raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name)
 
-            # Apply response middleware
-            for middleware_method in self._response_middleware:
-                response = middleware_method(request, response)
-
             return response
         except exceptions.Http404, e:
             if DEBUG:
diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py
index aed8e140ba..eec35ff072 100644
--- a/django/core/handlers/modpython.py
+++ b/django/core/handlers/modpython.py
@@ -144,6 +144,10 @@ class ModPythonHandler(BaseHandler):
         finally:
             db.db.close()
 
+        # Apply response middleware
+        for middleware_method in self._response_middleware:
+            response = middleware_method(request, response)
+
         # Convert our custom HttpResponse object back into the mod_python req.
         populate_apache_request(response, req)
         return 0 # mod_python.apache.OK
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 8cbb122b5d..23204e63a6 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -160,6 +160,10 @@ class WSGIHandler(BaseHandler):
         finally:
             db.db.close()
 
+        # Apply response middleware
+        for middleware_method in self._response_middleware:
+            response = middleware_method(request, response)
+
         try:
             status_text = STATUS_CODE_TEXT[response.status_code]
         except KeyError: