Ticket #13090: 13090.diff

django/core/handlers/base.py

@@ -70 +70 @@
 
         try:
             try:
-                # Reset the urlconf for this thread.
-                urlresolvers.set_urlconf(None)
-                # Obtain a default resolver. It's needed early for handling 404's.
-                resolver = urlresolvers.RegexURLResolver(r'^/', None)
+                # Setup default url resolver for this thread.
+                urlconf = settings.ROOT_URLCONF
+                urlresolvers.set_urlconf(urlconf)
+                resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
 
                 # Apply request middleware
                 for middleware_method in self._request_middleware:
@@ -81 +81 @@
                     if response:
                         return response
 
-                # Get urlconf from request object, if available.  Otherwise use default.
-                urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
-                # Set the urlconf for this thread to the one specified above.
-                urlresolvers.set_urlconf(urlconf)
-                # Reset the resolver with a possibly new urlconf
-                resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+                if hasattr(request, "urlconf"):
+                    # Reset url resolver with a custom urlconf.
+                    urlconf = request.urlconf
+                    urlresolvers.set_urlconf(urlconf)
+                    resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
 
                 callback, callback_args, callback_kwargs = resolver.resolve(
                         request.path_info)