You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@locus.apache.org on 2000/09/23 21:18:01 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets WebdavServlet.java
remm 00/09/23 12:18:01
Modified: catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
Log:
- <href> element was incorrectly generated (extra '/' characters
were appended)
Revision Changes Path
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebdavServlet.java 2000/08/11 23:39:52 1.1
+++ WebdavServlet.java 2000/09/23 19:18:00 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v 1.1 2000/08/11 23:39:52 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:39:52 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v 1.2 2000/09/23 19:18:00 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/23 19:18:00 $
*
* ====================================================================
*
@@ -120,7 +120,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2000/08/11 23:39:52 $
+ * @version $Revision: 1.2 $ $Date: 2000/09/23 19:18:00 $
*/
public class WebdavServlet
@@ -1695,7 +1695,7 @@
String absoluteUri = req.getRequestURI();
String relativePath = getRelativePath(req);
String toAppend = path.substring(relativePath.length());
- if (!toAppend.startsWith("/"))
+ if ((!toAppend.startsWith("/")) && (!absoluteUri.endsWith("/")))
toAppend = "/" + toAppend;
generatedXML.writeText(absoluteUri + toAppend);