tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.c
Date Tue, 03 Aug 2004 16:03:03 GMT
mturk       2004/08/03 09:03:03

  Modified:    ajp/proxy mod_proxy.c
  Log:
  Add workers and balancers to create and merge config.
  
  Revision  Changes    Path
  1.6       +4 -0      jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_proxy.c	3 Aug 2004 15:02:21 -0000	1.5
  +++ mod_proxy.c	3 Aug 2004 16:03:03 -0000	1.6
  @@ -535,6 +535,8 @@
       ps->noproxies = apr_array_make(p, 10, sizeof(struct noproxy_entry));
       ps->dirconn = apr_array_make(p, 10, sizeof(struct dirconn_entry));
       ps->allowed_connect_ports = apr_array_make(p, 10, sizeof(int));
  +    ps->workers = apr_array_make(p, 10, sizeof(proxy_worker));
  +    ps->balancers = apr_array_make(p, 10, sizeof(struct proxy_balancer));
       ps->domain = NULL;
       ps->viaopt = via_off; /* initially backward compatible with 1.3.1 */
       ps->viaopt_set = 0; /* 0 means default */
  @@ -576,6 +578,8 @@
       ps->noproxies = apr_array_append(p, base->noproxies, overrides->noproxies);
       ps->dirconn = apr_array_append(p, base->dirconn, overrides->dirconn);
       ps->allowed_connect_ports = apr_array_append(p, base->allowed_connect_ports,
overrides->allowed_connect_ports);
  +    ps->workers = apr_array_append(p, base->workers, overrides->workers);
  +    ps->balancers = apr_array_append(p, base->balancers, overrides->balancers);
   
       ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
       ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message