Ticket #12909: 12909.diff

django/core/handlers/wsgi.py

@@ -11 +11 @@
 from django.core.urlresolvers import set_script_prefix
 from django.utils import datastructures
 from django.utils.encoding import force_unicode, iri_to_uri
+import sys
 
 # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 STATUS_CODE_TEXT = {
@@ -220 +221 @@
 
     def __call__(self, environ, start_response):
         from django.conf import settings
+        from django.core import urlresolvers
 
         # Set up middleware if needed. We couldn't do this earlier, because
         # settings weren't available.
@@ -241 +243 @@
                 response = self.get_response(request)
 
                 # Apply response middleware
-                for middleware_method in self._response_middleware:
-                    response = middleware_method(request, response)
+                try:
+                    for middleware_method in self._response_middleware:
+                        response = middleware_method(request, response)
+                except Exception,e:
+                    if hasattr(request, "urlconf"):
+                        urlconf = request.urlconf
+                    else:
+                        urlconf = settings.ROOT_URLCONF
+                    urlresolvers.set_urlconf(urlconf)
+                    resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+                    response = self.handle_uncaught_exception(request, resolver , sys.exc_info())
                 response = self.apply_response_fixes(request, response)
         finally:
             signals.request_finished.send(sender=self.__class__)