You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by se...@apache.org on 2002/01/19 04:23:17 UTC

cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/ajp Ajp13.java

seguin      02/01/18 19:23:17

  Modified:    jk/java/org/apache/ajp Ajp13.java
  Log:
  reverting to previous logic -
  when doing Ajp13.receive(), it's ok for a packet to have 0 length and
  thus total_read=0 -- this means the end of the stream when the web
  server has been reached.
  
  Revision  Changes    Path
  1.22      +4 -2      jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java
  
  Index: Ajp13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Ajp13.java	19 Dec 2001 19:27:42 -0000	1.21
  +++ Ajp13.java	19 Jan 2002 03:23:17 -0000	1.22
  @@ -476,8 +476,10 @@
    	int total_read = 0;
           
           total_read = readN(in, b, H_SIZE, len);
  -        
  -        if (total_read <= 0) {
  +
  +        // it's ok to have read 0 bytes when len=0 -- this means
  +        // the end of the stream has been reached.
  +        if (total_read < 0) {
               logger.log("can't read body, waited #" + len);
               return JK_AJP13_BAD_BODY;
           }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>