Changeset 4097

Timestamp:

11/24/06 12:16:36 (2 years ago)

Author:

ubernostrum

Message:

0.91-bugfixes: Move request middleware into the handler's try/catch block so we can deal with exceptions it throws

Files:

• django/branches/0.91-bugfixes/django/core/handlers/base.py (modified) (1 diff)

django/branches/0.91-bugfixes/django/core/handlers/base.py

@@ -56 +56 @@
-        db.db.queries = []
-
-        # Apply request middleware
-        for middleware_method in self._request_middleware:
-            response = middleware_method(request)
-            if response:
-                return response
-
-        resolver = urlresolvers.RegexURLResolver(r'^/', ROOT_URLCONF)
-        try:
+            # Apply request middleware
+            for middleware_method in self._request_middleware:
+                response = middleware_method(request)
+                if response:
+                    return response
+            
-            callback, callback_args, callback_kwargs = resolver.resolve(path)
-