httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_util.c
Date Thu, 09 Sep 2004 13:51:09 GMT
mturk       2004/09/09 06:51:08

  Modified:    modules/proxy proxy_util.c
  Log:
  First try the reverse proxies. If there is no worker defined for
  requested uri use the forward worker, but only for PROXYREQ_PROXY
  requests.
  
  Revision  Changes    Path
  1.140     +7 -12     httpd-2.0/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- proxy_util.c	9 Sep 2004 13:15:40 -0000	1.139
  +++ proxy_util.c	9 Sep 2004 13:51:08 -0000	1.140
  @@ -1237,16 +1237,6 @@
   {
       int access_status;
       
  -    if (r->proxyreq == PROXYREQ_PROXY) {
  -        if (conf->forward) {
  -            *balancer = NULL;
  -            *worker = conf->forward;
  -            access_status = OK;
  -        }
  -        else
  -            access_status = DECLINED;
  -        return access_status;
  -    }
       access_status = proxy_run_pre_request(worker, balancer, r, conf, url);
       if (access_status == DECLINED && *balancer == NULL) {
           *worker = ap_proxy_get_worker(r->pool, conf, *url);
  @@ -1254,8 +1244,13 @@
               *balancer = NULL;
               access_status = OK;
           }
  -        else
  -            access_status = DECLINED;
  +        else if (r->proxyreq == PROXYREQ_PROXY) {
  +            if (conf->forward) {
  +                *balancer = NULL;
  +                *worker = conf->forward;
  +                access_status = OK;
  +            }
  +        }
       }
       else if (access_status == DECLINED && balancer != NULL) {
           /* All the workers are busy */
  
  
  

Mime
View raw message