Ticket #5157: apache_redirect.diff

http/__init__.py

@@ -16 +16 @@
 class Http404(Exception):
     pass
 
+class HttpInternalRedirect(Exception):
+        "Redirect Apache to handle static file"
+    def __init__(self, path):
+        self.path = path
+
 class HttpRequest(object):
     "A basic HTTP request"
 

core/handlers/base.py

@@ -105 +105 @@
             return http.HttpResponseForbidden('<h1>Permission denied</h1>')
         except SystemExit:
             pass # See http://code.djangoproject.com/ticket/1023
+        except http.HttpInternalRedirect, e:
+            raise e # re-raise exception to avoid default exception handler
         except: # Handle everything else, including SuspiciousOperation, etc.
             if settings.DEBUG:
                 from django.views import debug

core/handlers/modpython.py

@@ +1 @@
+from django.core.exceptions import *
 from django.core.handlers.base import BaseHandler
 from django.core import signals
 from django.dispatch import dispatcher
@@ -148 +149 @@
         dispatcher.send(signal=signals.request_started)
         try:
             request = ModPythonRequest(req)
-            response = self.get_response(request)
 
+            # check for a redirect to allow Apache to efficiently handle static files
+            try:
+                response = self.get_response(request)
+            except http.HttpInternalRedirect, e:
+                req.internal_redirect(e.path)
+                return mod_python.apache.DECLINED
+
             # Apply response middleware
             for middleware_method in self._response_middleware:
                 response = middleware_method(request, response)