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_serialize_ajp.c jk_handler_discovery.c
Date Thu, 28 Feb 2002 23:29:13 GMT
costin      02/02/28 15:29:13

  Modified:    jk/native2/common jk_serialize_ajp.c jk_handler_discovery.c
  Log:
  Updates and more debugging for the headers.
  
  Revision  Changes    Path
  1.7       +7 -0      jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c
  
  Index: jk_serialize_ajp.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_serialize_ajp.c	21 Feb 2002 11:13:23 -0000	1.6
  +++ jk_serialize_ajp.c	28 Feb 2002 23:29:13 -0000	1.7
  @@ -208,12 +208,16 @@
           char *name=s->headers_in->nameAt(env, s->headers_in, i);
   
           if (jk2_requtil_getHeaderId(env, name, &sc)) {
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
  +                          "handle.request() Add headerId %s %d\n", name, sc);
               if (msg->appendInt(env, msg, sc)) {
                   env->l->jkLog(env, env->l, JK_LOG_ERROR,
                                 "handle.request() Error serializing header id\n");
                   return JK_FALSE;
               }
           } else {
  +            env->l->jkLog(env, env->l, JK_LOG_DEBUG,
  +                          "handle.request() Add headerName %s\n", name);
               if (msg->appendString(env, msg, name)) {
                   env->l->jkLog(env, env->l, JK_LOG_ERROR,
                                 "handle.request() Error serializing header name\n");
  @@ -221,6 +225,9 @@
               }
           }
           
  +        env->l->jkLog(env, env->l, JK_LOG_DEBUG,
  +                      "handle.request() Add headerValue %s\n",
  +                      s->headers_in->valueAt( env, s->headers_in, i));
           if (msg->appendString(env, msg,
                                 s->headers_in->valueAt( env, s->headers_in, i)))
{
               env->l->jkLog(env, env->l, JK_LOG_ERROR,
  
  
  
  1.12      +6 -6      jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c
  
  Index: jk_handler_discovery.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_handler_discovery.c	21 Feb 2002 11:10:12 -0000	1.11
  +++ jk_handler_discovery.c	28 Feb 2002 23:29:13 -0000	1.12
  @@ -58,7 +58,7 @@
   /**
    * Description: AJP14 Discovery handler
    * Author:      Henri Gomez <hgomez@slib.fr>
  - * Version:     $Revision: 1.11 $                                          
  + * Version:     $Revision: 1.12 $                                          
    */
   
   #include "jk_global.h"
  @@ -68,7 +68,7 @@
   #include "jk_logger.h"
   #include "jk_service.h"
   #include "jk_handler.h"
  -#include "jk_webapp.h"
  +#include "jk_uriEnv.h"
   #include "jk_workerEnv.h"
   #include "jk_registry.h"
   
  @@ -128,8 +128,8 @@
       char *uri;
       int                 cmd;
       int                 i,j;
  -    jk_webapp_t         *ci;
  -    jk_webapp_t         *webapp;  
  +    jk_uriEnv_t         *ci;
  +    jk_uriEnv_t         *webapp;  
       char                *buf;
       jk_workerEnv_t *we=ae->worker->workerEnv;
       
  @@ -158,7 +158,7 @@
                         "contextList - Context: %s:%s \n",
                         vname, cname);
   
  -        webapp = we->createWebapp( env, we, vname, cname, NULL );
  +        webapp = we->uriMap->createUriEnv( env, we->uriMap, vname, cname );
           if( webapp==NULL ) {
               env->l->jkLog(env, env->l, JK_LOG_ERROR,
                        "discoveryHandler: can't create webapp\n");
  @@ -208,7 +208,7 @@
   {
       char                *vname;
       char                *cname;
  -    jk_webapp_t   *ci = NULL;
  +    jk_uriEnv_t   *ci = NULL;
   
       /* get virtual name */
       vname  = (char *)msg->getString(env, msg);
  
  
  

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