Ticket #16367: response_middleware_exception_fix.diff

django/core/handlers/base.py

@@ -177 +177 @@
             for middleware_method in self._response_middleware:
                 response = middleware_method(request, response)
             response = self.apply_response_fixes(request, response)
-        except: # Any exception should be gathered and handled
+        except Exception, e:
+            # If a response middleware raised an exception, run it through
+            # exception middleware, and if the exception middleware returns a
+            # response, use that. Otherwise, reraise the exception.
+            for middleware_method in self._exception_middleware:
+                response = middleware_method(request, e)
+                if response:
+                    break
             receivers = signals.got_request_exception.send(sender=self.__class__, request=request)
-            response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
+            if not response:
+                response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
+          
 
         return response