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/apache-2.0 mod_jk.c
Date Sun, 13 Feb 2005 12:24:18 GMT
mturk       2005/02/13 04:24:18

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Implement new API calls for shm and set vhost uriworker_map
  
  Revision  Changes    Path
  1.124     +13 -12    jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- mod_jk.c	12 Feb 2005 11:55:33 -0000	1.123
  +++ mod_jk.c	13 Feb 2005 12:24:18 -0000	1.124
  @@ -670,7 +670,7 @@
               s->num_headers++;
           }
       }
  -
  +    s->uw_map = conf->uw_map;
       return JK_TRUE;
   }
   
  @@ -1731,21 +1731,22 @@
                 ( lb is a bit special, it should count as a single worker but
                 I'm not sure how ). We also have a manual config directive that
                 explicitely give control to us. */
  -            worker_name = worker_env.first_worker;
  +            worker_name = worker_env.worker_list[0];
               if (JK_IS_DEBUG_LEVEL(xconf->log))
                   jk_log(xconf->log, JK_LOG_DEBUG,
                          "Manual configuration for %s %s %d",
  -                       r->uri, worker_env.first_worker,
  +                       r->uri, worker_env.worker_list[0],
                          worker_env.num_of_workers);
           }
           else {
               worker_name = map_uri_to_worker(xconf->uw_map, r->uri, xconf->log);
  -            if (worker_name == NULL)
  -                worker_name = worker_env.first_worker;
  -            if (JK_IS_DEBUG_LEVEL(xconf->log))
  -                jk_log(xconf->log, JK_LOG_DEBUG,
  -                       "Manual configuration for %s %d",
  -                       r->uri, worker_env.first_worker);
  +            if (worker_name == NULL && worker_env.num_of_workers) {
  +                worker_name = worker_env.worker_list[0];
  +                if (JK_IS_DEBUG_LEVEL(xconf->log))
  +                    jk_log(xconf->log, JK_LOG_DEBUG,
  +                           "Manual configuration for %s %d",
  +                           r->uri, worker_env.worker_list[0]);
  +            }
           }
       }
   
  @@ -2238,7 +2239,7 @@
   
       JK_TRACE_ENTER(conf->log);
   
  -    if ((rc = jk_shm_attach(jk_shm_file)) == 0) {
  +    if ((rc = jk_shm_attach(jk_shm_file, conf->log)) == 0) {
           if (JK_IS_DEBUG_LEVEL(conf->log))
               jk_log(conf->log, JK_LOG_DEBUG, "Attached shm:%s",
                      jk_shm_name());
  @@ -2272,7 +2273,7 @@
       /*     jk_map_t *init_map = NULL; */
       jk_map_t *init_map = conf->worker_properties;
   
  -    if ((rc = jk_shm_open(jk_shm_file)) == 0) {
  +    if ((rc = jk_shm_open(jk_shm_file, conf->log)) == 0) {
           if (JK_IS_DEBUG_LEVEL(conf->log))
               jk_log(conf->log, JK_LOG_DEBUG, "Initialized shm:%s",
                      jk_shm_name(), rc);
  
  
  

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