Commit 4f0903e5 authored by Ian Holsman's avatar Ian Holsman
Browse files

change command name so that it starts with 'Proxy' 

fix the command so that it returns 'OK' instead of 'HTTP_OK'

PR:
Obtained from:
Submitted by:
Reviewed by:


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

modules/proxy/mod_proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static const command_rec proxy_cmds[] = 
     "A list of ports which CONNECT may connect to"),

    AP_INIT_TAKE1("ProxyVia", set_via_opt, NULL, RSRC_CONF,

     "Configure Via: proxy header header to one of: on | off | block | full"),

    AP_INIT_FLAG("HTTPProxyOverrideReturnedErrors", set_http_proxy_override_error, NULL, RSRC_CONF,

    AP_INIT_FLAG("ProxyHTTPOverrideReturnedErrors", set_http_proxy_override_error, NULL, RSRC_CONF,

     "use our error handling pages instead of the servers we are proxying"),

    {NULL}

};

modules/proxy/proxy_http.c

+7 −3
Original line number Diff line number Diff line
@@ -860,9 +860,13 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 
        }

    }



    if ( conf->HTTPOverrideErrors )

        return r->status;

    if ( conf->HTTPOverrideErrors ) {

        /* the code above this checks for 'OK' which is what the hook expects */

        if ( r->status == HTTP_OK )

            return OK;

        else 

            return r->status;

    } else 

        return OK;

}