summaryrefslogtreecommitdiff
path: root/server/config.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2001-12-14 03:30:23 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2001-12-14 03:30:23 +0000
commitcf5e40267412519baaa6b951b807221d699d9291 (patch)
tree2458f26e88b1620dea6c7546b92e51acde32fb16 /server/config.c
parent33eaba0f1ea834f8ee34cabeedf53a17a6c86225 (diff)
downloadhttpd-cf5e40267412519baaa6b951b807221d699d9291.tar.gz
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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
-rw-r--r--server/config.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/server/config.c b/server/config.c
index 785d9dae8b..c032d9b416 100644
--- a/server/config.c
+++ b/server/config.c
@@ -333,6 +333,16 @@ AP_CORE_DECLARE(int) ap_invoke_handler(request_rec *r)
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) {