Author: markt
Date: Thu Jan 20 17:16:52 2011
New Revision: 1061401
URL: http://svn.apache.org/viewvc?rev=1061401&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061401&r1=1061400&r2=1061401&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 17:16:52 2011
@@ -85,14 +85,7 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
- Requests for a newly created directory using MKCOL should not result in a 404
- http://svn.apache.org/viewvc?rev=1055975&view=rev
- +1: markt
- +1: kkolinko: Filip's question was answered and I agree with the answer.
- -1:
- rjung: +1 once Filip's question in the TC 6 STATUS file is cleared.
-
+* https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Additional patch (not important):
http://svn.apache.org/viewvc?rev=1056828&view=rev
+1: kkolinko, markt
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java?rev=1061401&r1=1061400&r2=1061401&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Thu Jan 20 17:16:52 2011
@@ -1612,10 +1612,16 @@ public class ProxyDirContext implements
if (cache == null)
return false;
synchronized (cache) {
- return cache.unload(name);
+ boolean result = cache.unload(name);
+ // To ensure correct operation, particularly of WebDAV, unload
+ // the resource with and without a trailing /
+ if (name.endsWith("/")) {
+ cache.unload(name.substring(0, name.length() -1));
+ } else {
+ cache.unload(name + "/");
+ }
+ return result;
}
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
