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

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 83d3ddabf2087a341258be0e91210f21f816a6d5..24ebe052314bda15878f5c379654ee81897ae5ff 100644 (file)
--- 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