httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.c mod_proxy.h
Date Wed, 11 Aug 2004 22:16:27 GMT
wrowe       2004/08/11 15:16:27

  Modified:    modules/proxy mod_proxy.c mod_proxy.h
  Log:
  Add worker timeout inherited from ProxyTimeout.
  
  Submitted by: mturk
  
  Revision  Changes    Path
  1.116     +4 -0      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.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- mod_proxy.c	11 Aug 2004 22:10:23 -0000	1.115
  +++ mod_proxy.c	11 Aug 2004 22:16:27 -0000	1.116
  @@ -876,6 +876,8 @@
               if (err)
                   return apr_pstrcat(cmd->temp_pool, "ProxyPass: ", err, NULL);
           }
  +        if (conf->timeout_set)
  +            worker->timeout = conf->timeout;
           for (i = 0; i < arr->nelts; i++) {
               const char *err = set_worker_param(worker, elts[i].key, elts[i].val);
               if (err)
  @@ -1246,6 +1248,8 @@
           if ((err = ap_proxy_add_worker(&worker, cmd->pool, conf, name)) != NULL)
               return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL); 
       }
  +    if (conf->timeout_set)
  +        worker->timeout = conf->timeout;
   
       arr = apr_table_elts(params);
       elts = (const apr_table_entry_t *)arr->elts;
  
  
  
  1.103     +2 -0      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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- mod_proxy.h	11 Aug 2004 22:13:50 -0000	1.102
  +++ mod_proxy.h	11 Aug 2004 22:16:27 -0000	1.103
  @@ -225,6 +225,8 @@
       int             hmax;       /* Hard maximum on the total number of connections */
       apr_interval_time_t ttl;    /* maximum amount of time in seconds a connection
                                    * may be available while exceeding the soft limit */
  +    apr_interval_time_t timeout; /* connection timeout */
  +
       proxy_conn_pool *cp;        /* Connection pool to use */
       void            *opaque;    /* per scheme worker data */
   } proxy_worker;
  
  
  

Mime
View raw message