summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2001-09-20 19:54:51 +0200
committerJeff Trawick <trawick@apache.org>2001-09-20 19:54:51 +0200
commit8b31569e09496a07a0a4b8bd4b5b68a3e07a1e13 (patch)
treee0fe496f3e9990f92466815e4d0399a08be4b91d /modules
parentClean up a compile warning on AIX. (diff)
downloadapache2-8b31569e09496a07a0a4b8bd4b5b68a3e07a1e13.tar.xz
apache2-8b31569e09496a07a0a4b8bd4b5b68a3e07a1e13.zip
Currently, when the map-to-storage handler for TRACE returns DONE, the
caller -- ap_process_request_internal() -- catches that and returns OK to its caller -- ap_process_request(). But ap_process_request(), seeing OK, tries to run a handler. It needs to skip that if the request was completed in ap_process_request_internal(). Reviewed by: William A. Rowe, Jr. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91095 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/http/http_request.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 4dbbc788b2..e381da59d7 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -284,6 +284,10 @@ void ap_process_request(request_rec *r)
access_status = ap_process_request_internal(r);
if (access_status == OK)
access_status = ap_invoke_handler(r);
+ else if (access_status == DONE) {
+ /* e.g., something not in storage like TRACE */
+ access_status = OK;
+ }
}
if (access_status == OK) {