httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 mod_proxy.c proxy_http.c
Date Wed, 26 Sep 2001 19:58:10 GMT
ianh        01/09/26 12:58:10

  Modified:    module-2.0 mod_proxy.c proxy_http.c
  Log:
  change command name so that it starts with 'Proxy'
  fix the command so that it returns 'OK' instead of 'HTTP_OK'
  
  Revision  Changes    Path
  1.56      +1 -1      httpd-proxy/module-2.0/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/mod_proxy.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_proxy.c	2001/09/20 05:34:50	1.55
  +++ mod_proxy.c	2001/09/26 19:58:10	1.56
  @@ -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("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}
   };
  
  
  
  1.97      +7 -3      httpd-proxy/module-2.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_http.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- proxy_http.c	2001/09/20 14:23:06	1.96
  +++ proxy_http.c	2001/09/26 19:58:10	1.97
  @@ -860,9 +860,13 @@
           }
       }
   
  -    if ( conf->HTTPOverrideErrors )
  -        return r->status;
  -    else 
  +    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;
   }
   
  
  
  

Mime
View raw message