Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14523 -- Modified response handling so that exceptions raised …

…by process_response() in a middleware are caught and handled like any other exception. Thanks to Ivan Sagalaev for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
commit 3086b55b0e96b82a7f5f7a5c488f97ff5ed76420 1 parent c38a174
@freakboy3742 freakboy3742 authored
View
5 django/core/handlers/base.py
@@ -120,6 +120,11 @@ def get_response(self, request):
view_name = callback.__class__.__name__ + '.__call__' # If it's a class
raise ValueError("The view %s.%s didn't return an HttpResponse object." % (callback.__module__, view_name))
+ # Apply response middleware
+ for middleware_method in self._response_middleware:
+ response = middleware_method(request, response)
+ response = self.apply_response_fixes(request, response)
+
return response
except http.Http404, e:
logger.warning('Not Found: %s' % request.path,
View
5 django/core/handlers/modpython.py
@@ -215,11 +215,6 @@ def __call__(self, req):
response = http.HttpResponseBadRequest()
else:
response = self.get_response(request)
-
- # Apply response middleware
- for middleware_method in self._response_middleware:
- response = middleware_method(request, response)
- response = self.apply_response_fixes(request, response)
finally:
signals.request_finished.send(sender=self.__class__)
View
5 django/core/handlers/wsgi.py
@@ -251,11 +251,6 @@ def __call__(self, environ, start_response):
response = http.HttpResponseBadRequest()
else:
response = self.get_response(request)
-
- # Apply response middleware
- for middleware_method in self._response_middleware:
- response = middleware_method(request, response)
- response = self.apply_response_fixes(request, response)
finally:
signals.request_finished.send(sender=self.__class__)
View
21 tests/regressiontests/middleware_exceptions/tests.py
@@ -6,10 +6,14 @@
class TestException(Exception):
pass
-class TestMiddleware(object):
+class TestRequestMiddleware(object):
def process_request(self, request):
raise TestException('Test Exception')
+class TestResponseMiddleware(object):
+ def process_response(self, request, response):
+ raise TestException('Test Exception')
+
class MiddlewareExceptionTest(TestCase):
def setUp(self):
self.exceptions = []
@@ -23,12 +27,11 @@ def tearDown(self):
def _on_request_exception(self, sender, request, **kwargs):
self.exceptions.append(sys.exc_info())
- def test_process_request(self):
- self.client.handler._request_middleware.insert(0, TestMiddleware().process_request)
+ def _assert_exception_handled(self):
try:
- response = self.client.get('/')
+ response = self.client.get('/middleware_exceptions/')
except TestException, e:
- # Test client indefinitely re-raises any exceptions being raised
+ # Test client intentionally re-raises any exceptions being raised
# during request handling. Hence actual testing that exception was
# properly handled is done by relying on got_request_exception
# signal being sent.
@@ -38,3 +41,11 @@ def test_process_request(self):
self.assertEquals(len(self.exceptions), 1)
exception, value, tb = self.exceptions[0]
self.assertEquals(value.args, ('Test Exception', ))
+
+ def test_process_request(self):
+ self.client.handler._request_middleware.insert(0, TestRequestMiddleware().process_request)
+ self._assert_exception_handled()
+
+ def test_process_response(self):
+ self.client.handler._response_middleware.insert(0, TestResponseMiddleware().process_response)
+ self._assert_exception_handled()
Please sign in to comment.
Something went wrong with that request. Please try again.