Commit 673ad619 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent 1105edd7

modules/http/http_request.c

+7 −14
Original line number Diff line number Diff line
@@ -280,25 +280,18 @@ void ap_process_request(request_rec *r) 
     * directives in Location blocks.

     */

    access_status = ap_run_quick_handler(r);

    if (access_status == OK) {

        ap_finalize_request_protocol(r);

    }

    else if (access_status == DECLINED) {

    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;

        if (access_status == OK)

            access_status = ap_invoke_handler(r);

    }



    if (access_status == OK) {

        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