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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 498961c3c07f8eddbe1acd337f3823074ad248a9..6f177fe3d0304bd3097fb940816f96a462455681 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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}
 };

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 8eff71d743b90c4bf9b20c7414e25e5d8c1666eb..55c98c85e3752023e74ca720988f3dc9ffb76d4a 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -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;
 

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 4ebff5be95f8d8d382d3db64017194dba577a110..3fbc8a5003b26ce60f13cf703ec6a654c7986995 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -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;