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/native/common jk_msg_buff.c jk_registry.c jk_util.c
Date Wed, 07 Nov 2001 21:40:59 GMT
costin      01/11/07 13:40:59

  Modified:    jk/native/common jk_msg_buff.c jk_registry.c jk_util.c
  Log:
  Remove the includes, make ajp13 the new default.
  
  Revision  Changes    Path
  1.8       +1 -2      jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
  
  Index: jk_msg_buff.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_msg_buff.c	2001/10/26 14:40:19	1.7
  +++ jk_msg_buff.c	2001/11/07 21:40:59	1.8
  @@ -60,13 +60,12 @@
    * Author:      Costin <costin@costin.dnt.ro>                              *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.7 $                                           *
  + * Version:     $Revision: 1.8 $                                           *
    ***************************************************************************/
   
   #include "jk_pool.h"
   #include "jk_connect.h"
   #include "jk_util.h"
  -#include "jk_sockbuf.h"
   #include "jk_msg_buff.h"
   #include "jk_logger.h"
   
  
  
  
  1.2       +1 -6      jakarta-tomcat-connectors/jk/native/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_registry.c	2001/11/05 23:19:29	1.1
  +++ jk_registry.c	2001/11/07 21:40:59	1.2
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -84,10 +84,6 @@
    *  
    */
   
  -int JK_METHOD ajp12_worker_factory(jk_worker_t **w,
  -                                   const char *name,
  -                                   jk_logger_t *l);
  -
   int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
                                      const char *name,
                                      jk_logger_t *l);
  @@ -120,7 +116,6 @@
       printf("jk_registry_init: Assertion failed, env==NULL\n" );
       return;
     }
  -  env->registerFactory( env, "worker", "ajp12", &ajp12_worker_factory );
     env->registerFactory( env, "worker", "ajp13", &ajp13_worker_factory );
     env->registerFactory( env, "worker", "ajp14", &ajp14_worker_factory );
     env->registerFactory( env, "worker", "lb",    &lb_worker_factory );
  
  
  
  1.9       +3 -4      jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_util.c	2001/10/13 17:36:36	1.8
  +++ jk_util.c	2001/11/07 21:40:59	1.9
  @@ -59,12 +59,11 @@
    * Description: Utility functions (mainly configuration)                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.8 $                                           *
  + * Version:     $Revision: 1.9 $                                           *
    ***************************************************************************/
   
   
   #include "jk_util.h"
  -#include "jk_ajp12_worker.h"
   
   #define SYSPROPS_OF_WORKER          ("sysprops")
   #define STDERR_OF_WORKER            ("stderr")
  @@ -84,10 +83,10 @@
   #define LOAD_FACTOR_OF_WORKER       ("lbfactor")
   #define BALANCED_WORKERS            ("balanced_workers")
   #define WORKER_AJP12                ("ajp12")
  -#define DEFAULT_WORKER_TYPE         JK_AJP12_WORKER_NAME
  +#define DEFAULT_WORKER_TYPE         ("ajp13")
   #define SECRET_KEY_OF_WORKER        ("secretkey")
   
  -#define DEFAULT_WORKER              JK_AJP12_WORKER_NAME
  +#define DEFAULT_WORKER              ("ajp13")
   #define WORKER_LIST_PROPERTY_NAME   ("worker.list")
   #define DEFAULT_LB_FACTOR           (1.0)
   #define LOG_FORMAT		    ("log_format")
  
  
  

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