cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c

[mturk]

mturk       2005/05/05 05:48:35

  Modified:    jk/native/common jk_lb_worker.c
  Log:
  Allow setting 'secret' inside load balancer worker that will
  set the secret for all its members if the membes have no specified
  secret property.
  
  Revision  Changes    Path
  1.80      +11 -1     jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
  
  Index: jk_lb_worker.c
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- jk_lb_worker.c    26 Apr 2005 15:28:18 -0000      1.79
  +++ jk_lb_worker.c    5 May 2005 12:48:35 -0000       1.80
  @@ -29,6 +29,8 @@
   #include "jk_worker.h"
   #include "jk_lb_worker.h"
   #include "jk_ajp13.h"
  +#include "jk_ajp13_worker.h"
  +#include "jk_ajp14_worker.h"
   #include "jk_mt.h"
   #include "jk_shm.h"
   
  @@ -732,9 +734,11 @@
           lb_worker_t *p = pThis->worker_private;
           char **worker_names;
           unsigned int num_of_workers;
  +        const char *secret;
   
           p->s->sticky_session = jk_get_is_sticky_session(props, p->s->name);
           p->s->sticky_session_force = jk_get_is_sticky_session_force(props, 
p->s->name);
  +        secret = jk_get_worker_secret(props, p->s->name);
   
           if (jk_get_lb_worker_list(props,
                                     p->s->name,
  @@ -788,6 +792,12 @@
                                         we, l) || !p->lb_workers[i].w) {
                       break;
                   }
  +                if (secret && (p->lb_workers[i].w->type == 
JK_AJP13_WORKER_TYPE ||
  +                    p->lb_workers[i].w->type == JK_AJP14_WORKER_TYPE)) {
  +                    ajp_worker_t *aw = (ajp_worker_t 
*)p->lb_workers[i].w->worker_private; 
  +                    if (!aw->secret)
  +                        aw->secret = secret;
  +                }
               }
   
               if (i != num_of_workers) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]