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/server/isapi jk_isapi_plugin.c
Date Fri, 31 May 2002 22:51:29 GMT
costin      2002/05/31 15:51:29

  Modified:    jk/native2/common jk_mutex_thread.c jk_worker_ajp13.c
               jk/native2/include jk_config.h
               jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Fix the windows build for isapi ( nacho: I moved jk_map_read to jk_config_file_read,
  and I'll try to get a jk_config_registry to work ).
  
  Fixed the default lb_factor ( 1 instead of 0, 0 means local )
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
  
  Index: jk_mutex_thread.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_mutex_thread.c	31 May 2002 17:52:05 -0000	1.1
  +++ jk_mutex_thread.c	31 May 2002 22:51:28 -0000	1.2
  @@ -130,7 +130,7 @@
   {
       jk_mutex_t *jkMutex=mutexB->object;
   
  -    if( jkMutex==NULL || jkMutex->threadMutex==NULL ) return JK_ERR;
  +    if( jkMutex==NULL ) return JK_ERR;
       DeleteCriticalSection( & jkMutex->threadMutex );
       return JK_OK;
   }
  
  
  
  1.28      +2 -1      jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_worker_ajp13.c	31 May 2002 18:21:00 -0000	1.27
  +++ jk_worker_ajp13.c	31 May 2002 22:51:28 -0000	1.28
  @@ -810,7 +810,8 @@
   
       w->channel= NULL;
       w->secret= NULL;
  -   
  +
  +    w->lb_factor=1;
       w->service = jk2_worker_ajp13_service;
   
       result->setAttribute= jk2_worker_ajp13_setAttribute;
  
  
  
  1.9       +2 -0      jakarta-tomcat-connectors/jk/native2/include/jk_config.h
  
  Index: jk_config.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_config.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_config.h	31 May 2002 17:49:07 -0000	1.8
  +++ jk_config.h	31 May 2002 22:51:28 -0000	1.9
  @@ -143,6 +143,8 @@
                                      struct jk_pool *resultPool, 
                                      char *value);
   
  +int jk2_config_file_read(struct jk_env *env, struct jk_map *m,const char *file);
  +
   int jk2_config_processNode(struct jk_env *env, struct jk_config *cfg,
                              char *name, int firstTime );
   
  
  
  
  1.24      +3 -3      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_isapi_plugin.c	29 May 2002 01:16:40 -0000	1.23
  +++ jk_isapi_plugin.c	31 May 2002 22:51:28 -0000	1.24
  @@ -60,7 +60,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Larry Isaacs <larryi@apache.org>                           *
    * Author:      Ignacio J. Ortega <nacho@apache.org>                       *
  - * Version:     $Revision: 1.23 $                                           *
  + * Version:     $Revision: 1.24 $                                           *
    ***************************************************************************/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -611,7 +611,7 @@
       jk_map_t *map;
      
       if (JK_OK==jk2_map_default_create(env, &map, workerEnv->pool )) {
  -        if (JK_OK==jk2_map_read(env,map, ini_file_name)) {
  +        if (JK_OK==jk2_config_file_read(env,map, ini_file_name)) {
               tmp = map->get(env,map,EXTENSION_URI_TAG);
               if (tmp) {
                   strcpy(extension_uri, tmp);
  @@ -772,4 +772,4 @@
       
      
       return env;
  -}
  \ No newline at end of file
  +}
  
  
  

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