httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.c mod_proxy.h proxy_http.c
Date Fri, 28 Sep 2001 10:23:33 GMT
minfrin     01/09/28 03:23:33

  Modified:    modules/proxy mod_proxy.c mod_proxy.h proxy_http.c
  Log:
  Some style cleanups related to the ProxyErrorOverride function.
  
  Revision  Changes    Path
  1.58      +4 -4      httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_proxy.c	2001/09/27 16:44:43	1.57
  +++ mod_proxy.c	2001/09/28 10:23:32	1.58
  @@ -482,7 +482,7 @@
       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 @@
       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 @@
        "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}
   };
  
  
  
  1.62      +1 -1      httpd-2.0/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_proxy.h	2001/09/20 05:34:50	1.61
  +++ mod_proxy.h	2001/09/28 10:23:32	1.62
  @@ -185,7 +185,7 @@
        * 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;
   
  
  
  
  1.99      +2 -2      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- proxy_http.c	2001/09/27 04:01:10	1.98
  +++ proxy_http.c	2001/09/28 10:23:32	1.99
  @@ -828,7 +828,7 @@
                * 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 @@
           }
       }
   
  -    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;
  
  
  

Mime
View raw message