cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpProcessor.java HttpRequestImpl.java

[remm]

remm        00/12/02 16:47:49

  Modified:    catalina/src/share/org/apache/catalina/connector/http
                        HttpProcessor.java HttpRequestImpl.java
  Log:
  - Fix for a harmless bug : an extra blank header was added to the header list
    for each request.
  
  Revision  Changes    Path
  1.15      +8 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
  
  Index: HttpProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HttpProcessor.java        2000/11/30 18:36:16     1.14
  +++ HttpProcessor.java        2000/12/03 00:47:49     1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.14 2000/11/30 18:36:16 remm Exp $
  - * $Revision: 1.14 $
  - * $Date: 2000/11/30 18:36:16 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.15 2000/12/03 00:47:49 remm Exp $
  + * $Revision: 1.15 $
  + * $Date: 2000/12/03 00:47:49 $
    *
    * ====================================================================
    *
  @@ -106,7 +106,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.14 $ $Date: 2000/11/30 18:36:16 $
  + * @version $Revision: 1.15 $ $Date: 2000/12/03 00:47:49 $
    */
   
   final class HttpProcessor
  @@ -610,7 +610,10 @@
            } else if (header.equals(DefaultHeaders.TRANSFER_ENCODING_NAME)) {
                   //request.setTransferEncoding(header);
            }
  -     }
  +            
  +            request.nextHeader();
  +            
  +        }
   
       }
   
  
  
  
  1.5       +13 -5     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java
  
  Index: HttpRequestImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HttpRequestImpl.java      2000/12/02 03:52:56     1.4
  +++ HttpRequestImpl.java      2000/12/03 00:47:49     1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java,v
 1.4 2000/12/02 03:52:56 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/12/02 03:52:56 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java,v
 1.5 2000/12/03 00:47:49 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/12/03 00:47:49 $
    *
    * ====================================================================
    *
  @@ -79,7 +79,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.4 $ $Date: 2000/12/02 03:52:56 $
  + * @version $Revision: 1.5 $ $Date: 2000/12/03 00:47:49 $
    */
   
   final class HttpRequestImpl
  @@ -229,7 +229,15 @@
           }
           if (headerPool[nextHeader] == null)
               headerPool[nextHeader] = new HttpHeader();
  -        return headerPool[nextHeader++];
  +        return headerPool[nextHeader];
  +    }
  +
  +
  +    /**
  +     * Go to the next header.
  +     */
  +    void nextHeader() {
  +        nextHeader++;
       }