From f86004a4d3f642463a6faac72a72b61e975d9f29 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 20 Feb 2006 04:36:17 +0000
Subject: [PATCH] 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
---
 django/core/handlers/base.py      | 4 ----
 django/core/handlers/modpython.py | 4 ++++
 django/core/handlers/wsgi.py      | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index e9035090753..23f04ecd9d4 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 aed8e140ba3..eec35ff0721 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 8cbb122b5d8..23204e63a63 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: