Ticket #3655: irequestfilter_patch_3689.2.diff

trac/web/api.py

@@ -467 +467 @@
     requests, before and/or after they are processed by the main handler."""
 
     def pre_process_request(req, handler):
-        """Do any pre-processing the request might need; typically adding
-        values to req.hdf, or redirecting.
+        """Called after initial handler selection, and can be used to change
+        the selected handler or redirect request.
         
         Always returns the request handler, even if unchanged.
         """
 
+    def prepare_request(req, handler):
+        """Do any pre-processing before actual processing; typically adding
+        values to req.hdf, req.environ or similar.
+        
+        If no handler is found or the handler does not use templates,
+        req.hdf will be None.
+        
+        Always returns the request object, even if unchanged.
+        """
+
     def post_process_request(req, template, content_type):
         """Do any post-processing the request might need; typically adding
         values to req.hdf, or changing template or mime type.

trac/web/main.py

@@ -206 +206 @@
                 req.hdf = HDFWrapper(loadpaths=chrome.get_all_templates_dirs())
                 populate_hdf(req.hdf, self.env, req)
                 chrome.populate_hdf(req, chosen_handler)
+            else:
+                req.hdf = None
         except:
             req.hdf = None # revert to sending plaintext error
             if not early_error:
@@ -217 +219 @@
         # Process the request and render the template
         try:
             try:
+                for f in self.filters:
+                    req = f.prepare_request(req, chosen_handler)
+
                 resp = chosen_handler.process_request(req)
                 if resp:
                     for filter_ in reversed(self.filters):