cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.c

[hgomez]

hgomez      01/07/02 14:14:25

  Modified:    jk/native/common jk_ajp14.c
  Log:
  updated ajp14 protocol handling in context info
  
  Revision  Changes    Path
  1.12      +7 -3      jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
  
  Index: jk_ajp14.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_ajp14.c        2001/07/02 12:34:26     1.11
  +++ jk_ajp14.c        2001/07/02 21:14:22     1.12
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Next generation bi-directional protocol handler.           *
    * Author:      Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.11 $                                           *
  + * Version:     $Revision: 1.12 $                                           *
    ***************************************************************************/
   
   
  @@ -415,6 +415,8 @@
   
       vname  = (char *)jk_b_get_string(msg);
   
  +    jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_info - get virtual %s for 
virtual %s\n", vname, c->virtual);
  +
       if (! vname) {
           jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get 
virtual hostname\n");
           return JK_FALSE;
  @@ -439,6 +441,8 @@
               return JK_FALSE;
           }   
   
  +        jk_log(l, JK_LOG_DEBUG, "ajp14_unmarshal_context_info - get context %s for 
virtual %s\n", cname, vname);
  +
           /* grab all contexts up to empty one which indicate end of contexts */
           if (! strlen(cname)) 
               break;
  @@ -460,11 +464,11 @@
                    }
   
                    if (! strlen(uri)) {
  -                         jk_log(l, JK_LOG_DEBUG, "No more URI/URL for context %s", 
cname);
  +                         jk_log(l, JK_LOG_DEBUG, "No more URI for context %s", 
cname);
                            break;
                    }
   
  -                 jk_log(l, JK_LOG_INFO, "Got URL/URI (%s) for virtualhost %s and 
context %s", uri, vname, cname);
  +                 jk_log(l, JK_LOG_INFO, "Got URI (%s) for virtualhost %s and 
context %s\n", uri, vname, cname);
   
                    if (context_add_uri(c, cname, uri) == JK_FALSE) {
                   jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't 
add/set uri (%s) for context %s\n", uri, cname);