Commit c0d87108 authored by Graham Leggett's avatar Graham Leggett
Browse files

Some style cleanups related to the ProxyErrorOverride function. 

PR:
Obtained from:
Submitted by:
Reviewed by:


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

modules/proxy/mod_proxy.c

+4 −4
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s) 
    ps->recv_buffer_size_set = 0;

    ps->maxfwd = DEFAULT_MAX_FORWARDS;

    ps->maxfwd_set = 0;

    ps->HTTPOverrideErrors=0; 

    ps->error_override = 0; 

    return ps;

}
@@ -761,12 +761,12 @@ static const char * 
    return NULL;

}

static const char *

    set_http_proxy_override_error(cmd_parms *parms, void *dummy, int flag)

    set_proxy_error_override(cmd_parms *parms, void *dummy, int flag)

{

    proxy_server_conf *psf =

    ap_get_module_config(parms->server->module_config, &proxy_module);



    psf->HTTPOverrideErrors  = flag;

    psf->error_override = flag;

    return NULL;

}
@@ -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("ProxyErrorOverride", set_http_proxy_override_error, NULL, RSRC_CONF,

    AP_INIT_FLAG("ProxyErrorOverride", set_proxy_error_override, NULL, RSRC_CONF,

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

    {NULL}

};

modules/proxy/mod_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ typedef struct { 
     * the error page, (so it will look like a error

     * returned from the rest of the system 

     */

    int HTTPOverrideErrors;

    int error_override;



} proxy_server_conf;

modules/proxy/proxy_http.c

+2 −2
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 
             * if we are overriding the errors, we cant put the content of the

             * page into the brigade

             */

            if ( (conf->HTTPOverrideErrors ==0) || r->status < 400 ) {

            if ( (conf->error_override ==0) || r->status < 400 ) {

            /* read the body, pass it to the output filters */

                while (ap_get_brigade(rp->input_filters, 

                                       bb,
@@ -860,7 +860,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 
        }

    }



    if ( conf->HTTPOverrideErrors ) {

    if ( conf->error_override ) {

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

        if ( r->status == HTTP_OK )

            return OK;