billbarker    02/02/21 22:12:14

  Modified:    src/facade22/org/apache/tomcat/facade
                        HttpServletResponseFacade.java
  Log:
  Avoid double-encoding of URLS.
  
  Fix for bug #6629.
  Based on Subimission of: Tilo Christ [EMAIL PROTECTED]
  Reported by: Tilo Christ [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.27      +7 -3      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
  
  Index: HttpServletResponseFacade.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- HttpServletResponseFacade.java    18 Feb 2002 03:43:38 -0000      1.26
  +++ HttpServletResponseFacade.java    22 Feb 2002 06:12:14 -0000      1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
 1.26 2002/02/18 03:43:38 billbarker Exp $
  - * $Revision: 1.26 $
  - * $Date: 2002/02/18 03:43:38 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
 1.27 2002/02/22 06:12:14 billbarker Exp $
  + * $Revision: 1.27 $
  + * $Date: 2002/02/22 06:12:14 $
    *
    * ====================================================================
    *
  @@ -383,6 +383,10 @@
            String file = url.getFile();
            if ((file == null) || !file.startsWith(contextPath))
                return (false);
  +         // XXX endsWith() ? However, that confilicts with
  +         // the ;charset= attribute.
  +         if(file.indexOf(";jsessionid=" + session.getId()) >= 0)
  +             return (false); // Already encoded
        }
   
        // This URL belongs to our web application, so it is encodeable
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to