cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request SimpleMapper1.java StaticInterceptor.java

[craigmcc]

craigmcc    00/12/12 12:33:48

  Modified:    src/share/org/apache/tomcat/request Tag: tomcat_32
                        SimpleMapper1.java StaticInterceptor.java
  Log:
  Fix typos in the corrections for the security vulnerabilities for
  Tomcat 3.2.1.
  Submitted by: Arieh Markel <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.5  +2 -2      
jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java
  
  Index: SimpleMapper1.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java,v
  retrieving revision 1.15.2.4
  retrieving revision 1.15.2.5
  diff -u -r1.15.2.4 -r1.15.2.5
  --- SimpleMapper1.java        2000/12/11 17:52:30     1.15.2.4
  +++ SimpleMapper1.java        2000/12/12 20:33:44     1.15.2.5
  @@ -343,8 +343,8 @@
               requestURI.substring(contextPath.length()).toUpperCase();
           if (relativePath.equals("/META-INF") ||
               relativePath.equals("/WEB-INF") ||
  -            (relativePath.indexOf("/META-INF/") != 0) ||
  -            (relativePath.indexOf("/WEB-INF/") != 0))
  +            (relativePath.indexOf("/META-INF/") >= 0) ||
  +            (relativePath.indexOf("/WEB-INF/") >= 0))
               return 404;
   
        return OK;
  
  
  
  1.7.2.6   +2 -2      
jakarta-tomcat/src/share/org/apache/tomcat/request/StaticInterceptor.java
  
  Index: StaticInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/StaticInterceptor.java,v
  retrieving revision 1.7.2.5
  retrieving revision 1.7.2.6
  diff -u -r1.7.2.5 -r1.7.2.6
  --- StaticInterceptor.java    2000/12/11 17:52:30     1.7.2.5
  +++ StaticInterceptor.java    2000/12/12 20:33:46     1.7.2.6
  @@ -419,8 +419,8 @@
                String relPathU=relPath.toUpperCase();
                if ( relPathU.startsWith("WEB-INF") ||
                        relPathU.startsWith("META-INF") ||
  -                    (relPathU.indexOf("/WEB-INF/") != 0) ||
  -                    (relPathU.indexOf("/META-INF/") != 0) ) {
  +                    (relPathU.indexOf("/WEB-INF/") >= 0) ||
  +                    (relPathU.indexOf("/META-INF/") >= 0) ) {
                        return null;
                }
        }