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/apache2 mod_jk.c
Date Tue, 04 Dec 2001 19:12:52 GMT
costin      01/12/04 11:12:52

  Modified:    jk/native2/server/apache2 mod_jk.c
  Log:
  Fixes.
  
  It now seems to work ( but keep gdb around :-).
  
  This version is using the apache logger and error.log - it'll be optional,
  but I want it tested a bit.
  
  Revision  Changes    Path
  1.4       +11 -8     jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_jk.c	2001/12/02 02:09:45	1.3
  +++ mod_jk.c	2001/12/04 19:12:52	1.4
  @@ -60,7 +60,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *                 Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.3 $                                           *
  + * Version:     $Revision: 1.4 $                                           *
    ***************************************************************************/
   
   /*
  @@ -89,7 +89,6 @@
    * Jakarta (jk_) include files
    */
   #include "jk_global.h"
  -#include "jk_util.h"
   #include "jk_map.h"
   #include "jk_pool.h"
   #include "jk_env.h"
  @@ -246,7 +245,7 @@
   
   static int JK_METHOD ws_write(jk_ws_service_t *s,
                                 const void *b,
  -                              unsigned l)
  +                              unsigned len)
   {
       jk_logger_t *l=s->workerEnv->l;
       
  @@ -257,7 +256,7 @@
               /* BUFF *bf = p->r->connection->client; */
               size_t w = (size_t)l;
               size_t r = 0;
  -            long ll=l;
  +            long ll=len;
               char *bb=(char *)b;
               
               if(!p->response_started) {
  @@ -701,9 +700,9 @@
                                   strlen(value) + strlen(oldv) + 3);
           if(tmpv) {
               char sep = '*';
  -            if(jk_is_path_poperty(name)) {
  +            if(jk_is_some_property(name, "path")) {
                   sep = PATH_SEPERATOR;
  -            } else if(jk_is_cmd_line_poperty(name)) {
  +            } else if(jk_is_some_property(name, "cmd_line")) {
                   sep = ' ';
               }
               
  @@ -1211,7 +1210,7 @@
               private_data.read_body_started = JK_FALSE;
               private_data.r = r;
               
  -            jk_init_ws_service(&s);
  +            jk_requtil_initRequest(&s);
   
               s.ws_private = &private_data;
               s.pool = &private_data.p;            
  @@ -1291,7 +1290,9 @@
           
       env=jk_env_getEnv( NULL );
   
  -    l = env->getInstance( env, "logger", "file");
  +    /*     l = env->getInstance( env, "logger", "file"); */
  +    jk_logger_apache2_factory( env, &l, "logger", "file");
  +    l->logger_private=s;
       
       env->logger=l;
       
  @@ -1483,6 +1484,8 @@
   
               r->handler=apr_pstrdup(r->pool,JK_HANDLER);
               apr_table_setn(r->notes, JK_WORKER_ID, uriEnv->worker->name);
  +            l->jkLog(l, JK_LOG_DEBUG, 
  +                       "mod_jk: map %s %s\n", r->uri, uriEnv->worker->name);
               return OK;
           }
       }
  
  
  

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