cvs commit: jakarta-tomcat-connectors/jk/src/native/apache-1.3 list.mk mod_jk.c

[hgomez]

hgomez      01/06/08 07:34:07

  Modified:    jk/src/native/apache-1.3 list.mk mod_jk.c
  Log:
  Updated list.mk (miss jk_context in list)
  mod_jk will pass information add wc_open (worker init)
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-tomcat-connectors/jk/src/native/apache-1.3/list.mk
  
  Index: list.mk
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/list.mk,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- list.mk   2001/06/07 13:48:44     1.2
  +++ list.mk   2001/06/08 14:34:04     1.3
  @@ -7,4 +7,4 @@
                   ${JK}/jk_map${OEXT} ${JK}/jk_uri_worker_map${OEXT} \
                   ${JK}/jk_ajp14${OEXT} ${JK}/jk_ajp14_worker${OEXT} \
                   ${JK}/jk_md5${OEXT} ${JK}/jk_jni_worker${OEXT} \
  -                ${JK}/jk_ajp_common${OEXT}
  +                ${JK}/jk_ajp_common${OEXT} ${JK}/jk_context${OEXT}
  
  
  
  1.7       +5 -2      jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_jk.c  2001/06/07 13:49:46     1.6
  +++ mod_jk.c  2001/06/08 14:34:05     1.7
  @@ -173,7 +173,8 @@
   };
   typedef struct apache_private_data apache_private_data_t;
   
  -static jk_logger_t *main_log = NULL;
  +static jk_logger_t           *main_log = NULL;
  +static jk_worker_env_t        worker_env;
   
   static int JK_METHOD ws_start_response(jk_ws_service_t *s,
                                          int status,
  @@ -1145,7 +1146,9 @@
   #endif
               
                        /* we add the URI->WORKER MAP since workers using AJP14 will 
feed it */
  -            if(wc_open(init_map, conf->uw_map, conf->log)) {
  +                     worker_env.uri_to_worker = conf->uw_map;
  +                     worker_env.server_name   = (char *)ap_get_server_version();
  +            if(wc_open(init_map, &worker_env, conf->log)) {
                   /* we don't need this any more so free it */
                   map_free(&init_map);
                   return;