Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 58912 invoked from network); 6 Oct 2003 12:24:09 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Oct 2003 12:24:09 -0000 Received: (qmail 9184 invoked by uid 500); 6 Oct 2003 12:24:00 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 9150 invoked by uid 500); 6 Oct 2003 12:24:00 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 9136 invoked by uid 500); 6 Oct 2003 12:23:59 -0000 Received: (qmail 9133 invoked from network); 6 Oct 2003 12:23:59 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 Oct 2003 12:23:59 -0000 Received: (qmail 58824 invoked by uid 1135); 6 Oct 2003 12:24:01 -0000 Date: 6 Oct 2003 12:24:01 -0000 Message-ID: <20031006122401.58823.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets WebdavServlet.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N remm 2003/10/06 05:24:01 Modified: catalina/src/share/org/apache/catalina/servlets WebdavServlet.java Log: - Port patch. - Fix normalization of the destination path. Revision Changes Path 1.29 +7 -7 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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- WebdavServlet.java 1 Apr 2002 18:12:38 -0000 1.28 +++ WebdavServlet.java 6 Oct 2003 12:24:01 -0000 1.29 @@ -1509,6 +1509,9 @@ return false; } + destinationPath = + normalize(RequestUtil.URLDecode(destinationPath, "UTF8")); + int protocolIndex = destinationPath.indexOf("://"); if (protocolIndex >= 0) { // if the Destination URL contains the protocol, we can safely @@ -1557,9 +1560,6 @@ .substring(servletPath.length()); } } - - destinationPath = - RequestUtil.URLDecode(normalize(destinationPath), "UTF8"); if (debug > 0) System.out.println("Dest path :" + destinationPath); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org