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

[remm]

remm        01/07/16 21:14:26

  Modified:    catalina/src/share/org/apache/catalina/connector/http
                        HttpProcessor.java
  Log:
  - Handle lowercase / uppercase, etc, etc. Patch by Craig + Marc (who should
    have committed that themselves, I have terrible problems with my connection in the
    evening).
  
  Revision  Changes    Path
  1.31      +11 -7     
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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- HttpProcessor.java        2001/07/17 01:04:29     1.30
  +++ HttpProcessor.java        2001/07/17 04:14:25     1.31
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.30 2001/07/17 01:04:29 remm Exp $
  - * $Revision: 1.30 $
  - * $Date: 2001/07/17 01:04:29 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
 1.31 2001/07/17 04:14:25 remm Exp $
  + * $Revision: 1.31 $
  + * $Date: 2001/07/17 04:14:25 $
    *
    * ====================================================================
    *
  @@ -106,7 +106,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.30 $ $Date: 2001/07/17 01:04:29 $
  + * @version $Revision: 1.31 $ $Date: 2001/07/17 04:14:25 $
    */
   
   final class HttpProcessor
  @@ -820,9 +820,13 @@
   
           // Prevent encoding '%', '/', '.' and '\', which are special reserved
           // characters
  -        if ((normalized.indexOf("%25") > 0) || (normalized.indexOf("%2F") > 0)
  -            || (normalized.indexOf("%2E") > 0) 
  -            || (normalized.indexOf("%5C") > 0)) {
  +        if ((normalized.indexOf("%25") >= 0) 
  +         || (normalized.indexOf("%2F") >= 0)
  +            || (normalized.indexOf("%2E") >= 0) 
  +            || (normalized.indexOf("%5C") >= 0)
  +         || (normalized.indexOf("%2f") >= 0)
  +            || (normalized.indexOf("%2e") >= 0) 
  +            || (normalized.indexOf("%5c") >= 0)) {
               return null;
           }