You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/12/14 04:30:24 UTC
cvs commit: httpd-2.0/server config.c request.c
wrowe 01/12/13 19:30:24
Modified: server config.c request.c
Log:
Move the insert_filter hook from the prepare request phase to the
invoke handler phase, since it can't fail, and contributes nothing
to the request 'character', but everything to it's invocation.
Revision Changes Path
1.141 +10 -0 httpd-2.0/server/config.c
Index: config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/config.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- config.c 2001/12/11 19:36:05 1.140
+++ config.c 2001/12/14 03:30:23 1.141
@@ -333,6 +333,16 @@
char hbuf[MAX_STRING_LEN];
const char *old_handler = r->handler;
+ /*
+ * The new insert_filter stage makes the most sense here. We only use
+ * it when we are going to run the request, so we must insert filters
+ * if any are available. Since the goal of this phase is to allow all
+ * modules to insert a filter if they want to, this filter returns
+ * void. I just can't see any way that this filter can reasonably
+ * fail, either your modules inserts something or it doesn't. rbb
+ */
+ ap_run_insert_filter(r);
+
if (!r->handler) {
handler = r->content_type ? r->content_type : ap_default_type(r);
if ((p=ap_strchr_c(handler, ';')) != NULL) {
1.86 +0 -9 httpd-2.0/server/request.c
Index: request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/request.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- request.c 2001/12/13 02:26:18 1.85
+++ request.c 2001/12/14 03:30:23 1.86
@@ -269,15 +269,6 @@
return access_status;
}
- /* The new insert_filter stage makes sense here IMHO. We are sure that
- * we are going to run the request now, so we may as well insert filters
- * if any are available. Since the goal of this phase is to allow all
- * modules to insert a filter if they want to, this filter returns
- * void. I just can't see any way that this filter can reasonably
- * fail, either your modules inserts something or it doesn't. rbb
- */
- ap_run_insert_filter(r);
-
return OK;
}