remm        01/01/08 12:57:28

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        WebdavServlet.java
  Log:
  - Fix a bug I discovered two days ago : When a PROPFIND is done on a collection
    which has an encoded uri (using %xx style coding). The hrefs elements
    returned in the PROPFIND response were incorrect (they used the number
    of characters in the uri before normalization).
  
  Revision  Changes    Path
  1.7       +5 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebdavServlet.java        2000/11/14 02:05:20     1.6
  +++ WebdavServlet.java        2001/01/08 20:57:11     1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
 1.6 2000/11/14 02:05:20 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/11/14 02:05:20 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
 1.7 2001/01/08 20:57:11 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/01/08 20:57:11 $
    *
    * ====================================================================
    *
  @@ -121,7 +121,7 @@
    * are handled by the DefaultServlet.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.6 $ $Date: 2000/11/14 02:05:20 $
  + * @version $Revision: 1.7 $ $Date: 2001/01/08 20:57:11 $
    */
   
   public class WebdavServlet
  @@ -1728,7 +1728,7 @@
           generatedXML.writeElement(null, "href", XMLWriter.OPENING);
           
           String absoluteUri = req.getRequestURI();
  -        String relativePath = getRelativePath(req);
  +        String relativePath = normalize(getRelativePath(req));
           String toAppend = path.substring(relativePath.length());
           if ((!toAppend.startsWith("/")) && (!absoluteUri.endsWith("/")))
               toAppend = "/" + toAppend;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to