Ticket #16674: wsgi-expose-exc-info.patch

django/core/handlers/wsgi.py

@@ -1 +1 @@
 import sys
-from threading import Lock
+from threading import Lock, local
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -194 +194 @@
     initLock = Lock()
     request_class = WSGIRequest
 
+    def __init__(self):
+        super(WSGIHandler, self).__init__()
+        self._tls = local()
+
     def __call__(self, environ, start_response):
         from django.conf import settings
 
@@ -215 +219 @@
 
         set_script_prefix(base.get_script_name(environ))
         signals.request_started.send(sender=self.__class__)
+        self._tls.exc_info = None
         try:
             try:
                 request = self.request_class(environ)
             except UnicodeDecodeError:
+                self._tls.exc_info = sys.exc_info()
                 logger.warning('Bad Request (UnicodeDecodeError)',
-                    exc_info=sys.exc_info(),
+                    exc_info=self._tls.exc_info,
                     extra={
                         'status_code': 400,
                     }
@@ -239 +245 @@
         response_headers = [(str(k), str(v)) for k, v in response.items()]
         for c in response.cookies.values():
             response_headers.append(('Set-Cookie', str(c.output(header=''))))
-        start_response(status, response_headers)
+        try:
+            start_response(status, response_headers, self._tls.exc_info)
+        finally:
+            self._tls.exc_info = None
         return response
 
+    def handle_uncaught_exception(self, request, resolver, exc_info):
+        # Capture the exception context so we can pass it back to
+        # __call__()
+        self._tls.exc_info = exc_info
+        try:
+            return super(WSGIHandler, self).handle_uncaught_exception(
+                request, resolver, exc_info)
+        finally:
+            exc_info = None