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

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.91-bugfixes@4097 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 6 deletions

diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index fd3a3ccae1..9a4bb826a4 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -55,14 +55,14 @@ class BaseHandler:
         # Reset query list per request.
         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)
 
             # Apply view middleware