You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sh...@locus.apache.org on 2000/05/19 09:04:00 UTC

cvs commit: jakarta-tomcat/src/native/jk jk_worker.c

shachor     00/05/19 00:03:59

  Modified:    src/native/jk jk_worker.c
  Log:
  Adding support for ajp13, a bi-directional & faster communication
  protocol that reuse socket connections.
  
  This also support multi-thread programs.
  
  Work is not done yet. The protocol does not pass POSTed data yet
  
  Revision  Changes    Path
  1.4       +7 -4      jakarta-tomcat/src/native/jk/jk_worker.c
  
  Index: jk_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/jk/jk_worker.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_worker.c	2000/05/18 19:20:57	1.3
  +++ jk_worker.c	2000/05/19 07:03:58	1.4
  @@ -56,10 +56,11 @@
   /***************************************************************************
    * Description: Workers controller                                         *
    * Author:      Gal Shachor <sh...@il.ibm.com>                           *
  - * Version:     $Revision: 1.3 $                                               *
  + * Version:     $Revision: 1.4 $                                           *
    ***************************************************************************/
   
   #include "jk_ajp12_worker.h"
  +#include "jk_ajp13_worker.h"
   /* #include "jk_ajp23_worker.h" */
   #include "jk_jni_worker.h"
   #include "jk_lb_worker.h"
  @@ -76,6 +77,7 @@
   
   static worker_factory_record_t worker_factories[] = {
       { JK_AJP12_WORKER_NAME, ajp12_worker_factory},
  +    { JK_AJP13_WORKER_NAME, ajp13_worker_factory},
   /*     { JK_AJP23_WORKER_NAME, ajp23_worker_factory}, */
       { JK_JNI_WORKER_NAME, jni_worker_factory},
       { JK_LB_WORKER_NAME, lb_worker_factory},
  @@ -182,14 +184,15 @@
               jk_log(l, JK_LOG_ERROR, "wc_create_worker validate failed for %s\n", 
                      name); 
               return JK_FALSE;
  -	}
  -	if(!w->init(w, init_data, l)) {
  +        }
  +    
  +        if(!w->init(w, init_data, l)) {
               w->destroy(&w, l);
               jk_log(l, JK_LOG_ERROR, "wc_create_worker init failed for %s\n", 
                      name); 
               return JK_FALSE;
           }
  -    
  +
           *rc = w;
           jk_log(l, JK_LOG_DEBUG, "wc_create_worker, done\n"); 
           return JK_TRUE;