cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java

[remm]

remm        01/04/05 11:47:52

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        DefaultServlet.java
  Log:
  - Path /. wasn't normalized properly (but /./ was). It's treated as a special case.
  
  Revision  Changes    Path
  1.34      +7 -4      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- DefaultServlet.java       2001/04/02 21:14:19     1.33
  +++ DefaultServlet.java       2001/04/05 18:47:50     1.34
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.33 2001/04/02 21:14:19 craigmcc Exp $
  - * $Revision: 1.33 $
  - * $Date: 2001/04/02 21:14:19 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.34 2001/04/05 18:47:50 remm Exp $
  + * $Revision: 1.34 $
  + * $Date: 2001/04/05 18:47:50 $
    *
    * ====================================================================
    *
  @@ -122,7 +122,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.33 $ $Date: 2001/04/02 21:14:19 $
  + * @version $Revision: 1.34 $ $Date: 2001/04/05 18:47:50 $
    */
   
   public class DefaultServlet
  @@ -877,6 +877,9 @@
   
           if (normalized == null)
               return (null);
  +
  +        if (normalized.equals("/."))
  +            return "/";
   
        // Normalize the slashes and add leading slash if necessary
        if (normalized.indexOf('\\') >= 0)