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/native2/server/apache2 mod_jk2.c
Date Sat, 26 Oct 2002 14:47:33 GMT
mturk       2002/10/26 07:47:33

  Modified:    jk/native2/server/apache2 mod_jk2.c
  Log:
  Some cleanup of the previous patch, skipping some debug code.
  
  Revision  Changes    Path
  1.56      +2 -19     jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_jk2.c	26 Oct 2002 12:38:45 -0000	1.55
  +++ mod_jk2.c	26 Oct 2002 14:47:33 -0000	1.56
  @@ -404,9 +404,6 @@
   static char * jk2_init(jk_env_t *env, apr_pool_t *pconf,
                          jk_workerEnv_t *workerEnv, server_rec *s )
   {
  -    /* Ugly hack to get the childId - the index used in the scoreboard,
  -       which we'll use in the jk scoreboard
  -    */
   
       workerEnv->init(env, workerEnv );
       workerEnv->server_name   = (char *)ap_get_server_version();
  @@ -458,7 +455,6 @@
                              server_rec *s)
   {
       apr_pool_t *gPool=NULL;
  -    void *data=NULL;
       int rc;
       jk_env_t *env;
       
  @@ -474,11 +470,6 @@
   
       env->setAprPool(env, gPool);
   
  -    if (!ap_exists_scoreboard_image()) {
  -        env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  -            "jk2_postconfig() No scoreboard image %d\n", getpid());
  -    }
  -
       if( rc == JK_OK && gPool != NULL ) {
           /* This is the first step */
           env->l->jkLog(env, env->l, JK_LOG_INFO,
  @@ -490,16 +481,8 @@
           
       env->l->jkLog(env, env->l, JK_LOG_INFO,
                     "mod_jk.post_config() second invocation\n" ); 
  -
  -
       workerEnv->parentInit( env, workerEnv);
   
  -
  -/*     if(!workerEnv->was_initialized) { */
  -/*         workerEnv->was_initialized = JK_OK;         */
  -        
  -/*         jk2_init( env, pconf, workerEnv, s ); */
  -/*     } */
       return OK;
   }
   
  @@ -565,7 +548,7 @@
           ++ap_scoreboard_image->parent[workerEnv->childId].generation;
       }
   
  -    if(!workerEnv->was_initialized && !workerEnv->childGeneration) {
  +    if(!workerEnv->was_initialized) {
           workerEnv->was_initialized = JK_TRUE;        
           
           jk2_init( env, pconf, workerEnv, s );
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message