From d78dd20618c965b5aea261bf3c84bb159fd9b7cf Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Fri, 31 Aug 2001 02:46:29 +0000 Subject: [PATCH] Much better - sorry - I missed one case of forcing pipeline flush when the handler returned a non-OK result. ergo, 304's weren't sent. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90837 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_request.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 83d3ddabf2..24ebe05231 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -280,26 +280,19 @@ void ap_process_request(request_rec *r) * directives in Location blocks. */ access_status = ap_run_quick_handler(r); + if (access_status == DECLINED) { + access_status = ap_process_request_internal(r); + if (access_status == OK) + access_status = ap_invoke_handler(r); + } + if (access_status == OK) { ap_finalize_request_protocol(r); } - else if (access_status == DECLINED) { - access_status = ap_process_request_internal(r); - if (access_status == OK) { - if ((access_status = ap_invoke_handler(r)) != 0) { - ap_die(access_status, r); - return; - } - ap_finalize_request_protocol(r); - } - else { - ap_die(access_status, r); - } - } else { ap_die(access_status, r); } - + /* * We want to flush the last packet if this isn't a pipelining connection * *before* we start into logging. Suppose that the logging causes a DNS -- 2.40.0