tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h
Date Thu, 16 May 2002 20:58:44 GMT
costin      02/05/16 13:58:44

  Modified:    jk/native2/common jk_registry.c jk_registry.h
  Log:
  The shm object will be registered in all cases.
  
  Inside jk_shm we'll detect what we can use and disable the component
  if no shm is available.
  
  Revision  Changes    Path
  1.23      +3 -4      jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_registry.c	15 May 2002 19:45:45 -0000	1.22
  +++ jk_registry.c	16 May 2002 20:58:44 -0000	1.23
  @@ -67,7 +67,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.22 $                                           *
  + * Version:     $Revision: 1.23 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -133,10 +133,9 @@
   #ifdef HAS_APR
     env->registerFactory( env, "channel.apr",
                           jk2_channel_apr_socket_factory );
  -#if APR_HAS_SHARED_MEMORY
  -  env->registerFactory( env, "shm", jk2_shm_factory );
  -#endif
   #endif
  +
  +  env->registerFactory( env, "shm", jk2_shm_factory );
     env->registerFactory( env, "channel.socket", jk2_channel_socket_factory );
   
     
  
  
  
  1.14      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
  
  Index: jk_registry.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_registry.h	9 May 2002 00:05:14 -0000	1.13
  +++ jk_registry.h	16 May 2002 20:58:44 -0000	1.14
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.13 $                                           *
  + * Version:     $Revision: 1.14 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -133,12 +133,12 @@
   int JK_METHOD jk2_channel_apr_socket_factory(jk_env_t *env, jk_pool_t *pool,
                                                jk_bean_t *result,
                                                const char *type, const char *name);
  +#endif
   
   int JK_METHOD jk2_shm_factory(jk_env_t *env, jk_pool_t *pool,
                                 jk_bean_t *result,
                                 const char *type, const char *name);
   
  -#endif
   
   int JK_METHOD jk2_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
                                         jk_bean_t *result,
  
  
  

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