From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 12 Oct 2015 10:56:12 +0000 (+0000)
Subject: core: we don't want to run the subrequest's handler if the
X-Git-Tag: 2.5.0-alpha~2724
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42742592f002bb6aae20120da12b4ea8186b2972;p=thirdparty%2Fapache%2Fhttpd.git

core: we don't want to run the subrequest's handler if the
quick-handler returned an error (or any final status).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1708084 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/request.c b/server/request.c
index abf084e31aa..1719597ad74 100644
--- a/server/request.c
+++ b/server/request.c
@@ -2517,7 +2517,7 @@ AP_DECLARE(int) ap_run_sub_req(request_rec *r)
     if (!(r->filename && r->finfo.filetype != APR_NOFILE)) {
         retval = ap_run_quick_handler(r, 0);
     }
-    if (retval != OK) {
+    if (retval == DECLINED) {
         retval = ap_invoke_handler(r);
         if (retval == DONE) {
             retval = OK;