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_balancer.c
Date Tue, 24 Aug 2004 13:50:43 GMT
mturk       2004/08/24 06:50:43

  Modified:    modules/proxy proxy_balancer.c
  Log:
  Remove uneeded access_status variable.
  
  Revision  Changes    Path
  1.12      +15 -20    httpd-2.0/modules/proxy/proxy_balancer.c
  
  Index: proxy_balancer.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_balancer.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- proxy_balancer.c	24 Aug 2004 13:48:13 -0000	1.11
  +++ proxy_balancer.c	24 Aug 2004 13:50:43 -0000	1.12
  @@ -351,30 +351,25 @@
                                          request_rec *r,
                                          proxy_server_conf *conf)
   {
  -    int access_status;
  -    if (!balancer)
  -        access_status = DECLINED;
  -    else { 
  -        apr_status_t rv;
  -        if ((rv = PROXY_BALANCER_LOCK(balancer)) != APR_SUCCESS) {
  -            ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
  -                         "proxy: BALANCER: lock");
  -            return HTTP_INTERNAL_SERVER_ERROR;
  -        }
  -        /* increase the free channels number */
  -        if (worker->cp->nfree)
  -            worker->cp->nfree++;
  -        /* TODO: calculate the bytes transfered */
  +    apr_status_t rv;
   
  -        /* TODO: update the scoreboard status */
  +    if ((rv = PROXY_BALANCER_LOCK(balancer)) != APR_SUCCESS) {
  +        ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
  +            "proxy: BALANCER: lock");
  +        return HTTP_INTERNAL_SERVER_ERROR;
  +    }
  +    /* increase the free channels number */
  +    if (worker->cp->nfree)
  +        worker->cp->nfree++;
  +    /* TODO: calculate the bytes transfered */
  +
  +    /* TODO: update the scoreboard status */
   
  -        PROXY_BALANCER_UNLOCK(balancer);        
  -        access_status = OK;
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
  +    PROXY_BALANCER_UNLOCK(balancer);        
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                    "proxy_balancer_post_request for (%s)", balancer->name);
  -    }
   
  -    return access_status;
  +    return OK;
   } 
   
   static void ap_proxy_balancer_register_hook(apr_pool_t *p)
  
  
  

Mime
View raw message