tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
Date Mon, 15 Mar 2004 08:25:34 GMT
mturk       2004/03/15 00:25:34

  Modified:    jk/native2/server/isapi jk_service_iis.c
  Log:
  Fix the case when the initial read brom buffer is mixed with ReadClient.
  
  Revision  Changes    Path
  1.28      +6 -3      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_service_iis.c	28 Feb 2004 08:12:43 -0000	1.27
  +++ jk_service_iis.c	15 Mar 2004 08:25:34 -0000	1.28
  @@ -173,21 +173,24 @@
                   /* if that's all what that server wants to read, return... */
                   if (toread == rdlen) {
                       env->l->jkLog(env, env->l, JK_LOG_DEBUG, 
  -                                  "jk_ws_service_t::read buffer readed %d from already
%d of total %d bytes\n",
  -                                  toread, s->content_read, lpEcb->cbAvailable); 
  
  +                                  "jk_ws_service_t::read buffer readed %d from already
%d of initial %d bytes from %d\n",
  +                                  toread, s->content_read, lpEcb->cbAvailable, lpEcb->cbTotalBytes);
   
                       return JK_OK;
                   }
                   else {
                       /* Adjust the read buffer and length */
                       rdlen -= toread;
                       buff  += toread;
  +                    env->l->jkLog(env, env->l, JK_LOG_DEBUG, 
  +                                  "jk_ws_service_t::read initial readed %d going to read
%d\n",
  +                                  toread, rdlen);    
                   }
               }
   
               /*
               * Now try to read from the client ...
               */
  -            if (lpEcb->ReadClient(lpEcb->ConnID, b, &rdlen)) {
  +            if (lpEcb->ReadClient(lpEcb->ConnID, buff, &rdlen)) {
                   *actually_read += rdlen;        
                    env->l->jkLog(env, env->l, JK_LOG_DEBUG, 
                                  "jk_ws_service_t::read ReadClient readed %d (actually %d)
bytes\n",
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message