Commit 7053454b authored by Garrett Rooney's avatar Garrett Rooney
Browse files

Make some error checking more clear by using the defined constants instead 

of literal values.

Patch by: Dan Rall <dlr apache.org>

* server/request.c
  (ap_process_request_internal): Check the return value of hook functions
   against the constant OK instead of the magic number 0 to improve clarity.


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

server/request.c

+5 −5
Changes for server/request.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -183,15 +183,15 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) 
        r->ap_auth_type = r->prev->ap_auth_type;

    }

    else {

        if ((access_status = ap_run_access_checker(r)) != 0) {

        if ((access_status = ap_run_access_checker(r)) != OK) {

            return decl_die(access_status, "check access", r);

        }



        if ((access_status = ap_run_check_user_id(r)) != 0) {

        if ((access_status = ap_run_check_user_id(r)) != OK) {

            return decl_die(access_status, "check user", r);

        }



        if ((access_status = ap_run_auth_checker(r)) != 0) {

        if ((access_status = ap_run_auth_checker(r)) != OK) {

            return decl_die(access_status, "check authorization", r);

        }
@@ -200,11 +200,11 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) 
     * in mod-proxy for r->proxyreq && r->parsed_uri.scheme

     *                              && !strcmp(r->parsed_uri.scheme, "http")

     */

    if ((access_status = ap_run_type_checker(r)) != 0) {

    if ((access_status = ap_run_type_checker(r)) != OK) {

        return decl_die(access_status, "find types", r);

    }



    if ((access_status = ap_run_fixups(r)) != 0) {

    if ((access_status = ap_run_fixups(r)) != OK) {

        return access_status;

    }