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/jk/native/common jk_util.c
Date Mon, 13 Dec 2004 07:51:28 GMT
mturk       2004/12/12 23:51:28

  Modified:    jk/native/common jk_util.c
  Log:
  Rename balanced_workers directive to balance_workers keeping old
  one for backward compatibility.
  Norm says that this makes more sense from English grammar point of view.
  
  Revision  Changes    Path
  1.49      +11 -1     jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- jk_util.c	12 Dec 2004 15:35:50 -0000	1.48
  +++ jk_util.c	13 Dec 2004 07:51:28 -0000	1.49
  @@ -55,7 +55,9 @@
   #define SOCKET_KEEPALIVE_OF_WORKER  ("socket_keepalive")
   #define RECYCLE_TIMEOUT_OF_WORKER   ("recycle_timeout")
   #define LOAD_FACTOR_OF_WORKER       ("lbfactor")
  +/* deprecated directive. Use balance_workers instead */
   #define BALANCED_WORKERS            ("balanced_workers")
  +#define BALANCE_WORKERS             ("balance_workers")
   #define STICKY_SESSION              ("sticky_session")
   #define LOCAL_WORKER_ONLY_FLAG      ("local_worker_only")
   #define LOCAL_WORKER_FLAG           ("local_worker")
  @@ -679,6 +681,14 @@
       if (m && list && num_of_wokers && lb_wname) {
           char **ar = NULL;
   
  +        sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname,
  +                BALANCE_WORKERS);
  +        ar = jk_map_get_string_list(m, buf, num_of_wokers, NULL);
  +        if (ar) {
  +            *list = ar;
  +            return JK_TRUE;
  +        }
  +        /* Try old balanced_workers directive */
           sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname,
                   BALANCED_WORKERS);
           ar = jk_map_get_string_list(m, buf, num_of_wokers, NULL);
  
  
  

---------------------------------------------------------------------
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