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 Fri, 19 Nov 2004 15:58:52 GMT
mturk       2004/11/19 07:58:52

  Modified:    jk/native/common jk_util.c
  Log:
  Use boolen values for boolean kind of properties.
  Also set default worker type to ajp13, cause ajp12 is deprecated.
  
  Revision  Changes    Path
  1.40      +10 -8     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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- jk_util.c	19 Nov 2004 13:00:43 -0000	1.39
  +++ jk_util.c	19 Nov 2004 15:58:51 -0000	1.40
  @@ -24,6 +24,8 @@
   
   #include "jk_util.h"
   #include "jk_ajp12_worker.h"
  +#include "jk_ajp13_worker.h"
  +#include "jk_ajp14_worker.h"
   #include "jk_mt.h"
   
   #define SYSPROPS_OF_WORKER          ("sysprops")
  @@ -57,12 +59,12 @@
   #define STICKY_SESSION              ("sticky_session")
   #define LOCAL_WORKER_ONLY_FLAG      ("local_worker_only")
   #define LOCAL_WORKER_FLAG           ("local_worker")
  -#define WORKER_AJP12                ("ajp12")
  -#define DEFAULT_WORKER_TYPE         JK_AJP12_WORKER_NAME
  +
  +#define DEFAULT_WORKER_TYPE         JK_AJP13_WORKER_NAME
   #define SECRET_KEY_OF_WORKER        ("secretkey")
   #define RETRIES_OF_WORKER           ("retries")
   
  -#define DEFAULT_WORKER              JK_AJP12_WORKER_NAME
  +#define DEFAULT_WORKER              JK_AJP13_WORKER_NAME
   #define WORKER_LIST_PROPERTY_NAME   ("worker.list")
   #define DEFAULT_LB_FACTOR           (1)
   #define LOG_FORMAT                  ("log_format")
  @@ -450,7 +452,7 @@
       sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
               SOCKET_KEEPALIVE_OF_WORKER);
   
  -    return jk_map_get_int(m, buf, def);
  +    return jk_map_get_bool(m, buf, def);
   }
   
   int jk_get_worker_cache_timeout(jk_map_t *m, const char *wname, int def)
  @@ -610,7 +612,7 @@
       if (m && wname) {
           int value;
           sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, STICKY_SESSION);
  -        value = jk_map_get_int(m, buf, 1);
  +        value = jk_map_get_bool(m, buf, 1);
           if (!value)
               rc = JK_FALSE;
       }
  @@ -624,7 +626,7 @@
       if (m && wname) {
           int value;
           sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, LOCAL_WORKER_FLAG);
  -        value = jk_map_get_int(m, buf, 0);
  +        value = jk_map_get_bool(m, buf, 0);
           if (value)
               rc = JK_TRUE;
       }
  @@ -639,7 +641,7 @@
           int value;
           sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname,
                   LOCAL_WORKER_ONLY_FLAG);
  -        value = jk_map_get_int(m, buf, 0);
  +        value = jk_map_get_bool(m, buf, 0);
           if (value)
               rc = JK_TRUE;
       }
  
  
  

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