Ticket #3328: 3328.patch

trac/web/main.py

@@ -170 +170 @@
 
         for filter_ in self.filters:
             chosen_handler = filter_.pre_process_request(req, chosen_handler)
-
+        
+        req_handler = chosen_handler
         if not chosen_handler:
-            raise HTTPNotFound('No handler matched request to %s',
-                               req.path_info)
+            chosen_handler = RequestDispatcher.default_handler
 
         # Attach user information to the request
         anonymous_request = getattr(chosen_handler, 'anonymous_request', False)
@@ -193 +193 @@
             populate_hdf(req.hdf, self.env, req)
             chrome.populate_hdf(req, chosen_handler)
 
+        # No handler matched request
+        if not req_handler:
+            raise HTTPNotFound('No handler matched request to %s',
+                               req.path_info)
+            
         # Process the request and render the template
         try:
             try: