ap_run_sub_req does not return apr_status, so we shouldn't be checking

APR_STATUS_IS_EPIPE(). Also, remove the code that assumed the sub_req_lookup_uri
actually served up the content in the quick handler. We now call the quick_handler
in ap_run_sub_req()

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 389af99ebb27dce466d0760f80c8d800d978f452..2e90e18ade05dc4355e388e8fef1498664a5f94e 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1194,7 +1194,6 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb,
     apr_bucket  *tmp_buck;
     char *parsed_string;
     int loglevel = APLOG_ERR;
-    int quick_handler = 0;
 
     *inserted_head = NULL;
     if (ctx->flags & FLAG_PRINTING) {
@@ -1235,10 +1234,6 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb,
                 else {
                     rr = ap_sub_req_lookup_uri(parsed_string, r, f->next);
                 }
-                if (rr && rr->status == DONE) {
-                    rr->status = HTTP_OK;
-                    quick_handler = 1;
-                }
 
                 if (!error_fmt && rr->status != HTTP_OK) {
                     error_fmt = "unable to include \"%s\" in parsed file %s";
@@ -1302,17 +1297,8 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb,
                     ap_set_module_config(rr->request_config, 
                                          &include_module, r);
 
-                if (!error_fmt) {
-                    int rv;
-                   
-                    if ((quick_handler==0)&&(rv = ap_run_sub_req(rr))) {
-                        if (APR_STATUS_IS_EPIPE(rv)) {
-                            /* let's not clutter the log on a busy server */
-                            loglevel = APLOG_INFO; 
-                        }
-                        error_fmt = 
-                                  "unable to include \"%s\" in parsed file %s"; 
-                    }
+                if (!error_fmt && ap_run_sub_req(rr)) {
+                    error_fmt = "unable to include \"%s\" in parsed file %s";
                 }
                 if (error_fmt) {
                     ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|loglevel,