diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 389af99ebb..2e90e18ade 100644 --- 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,