Author: kkolinko
Date: Fri Jan 6 16:09:08 2012
New Revision: 1228244
URL: http://svn.apache.org/viewvc?rev=1228244&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52293
Correctly handle antiResourceLocking=true when unpackWARs=false
Correctly handle multi-level contexts when antiResourceLocking=true
Patch by Justin Miller
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1228244&r1=1228243&r2=1228244&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 6 16:09:08 2012
@@ -80,19 +80,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko,funkman
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52293
- Correctly handle antiResourceLocking=true when unpackWARs=false
- Correctly handle multi-level contexts when antiResourceLocking=true
- Patch by Justin Miller
- kkolinko: Corrected patch in diff -u format:
- https://issues.apache.org/bugzilla/attachment.cgi?id=28097&action=diff
- (Original patch:
https://issues.apache.org/bugzilla/attachment.cgi?id=28038&action=diff )
- +1: markt, kkolinko, rjung
- -1:
- rjung: It seems the change to line 976 is only an unwanted whitespace
addition.
- kkolinko: Yes, that is only change on that line in OP's patch (id=28038) and
it is unwanted.
- My version of the patch (id=28097) does not change that line.
-
* Backport SetCharacterEncodingFilter
1) patch
http://people.apache.org/~kkolinko/patches/2011-12-22_tc6_SetCharacterEncodingFilter.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1228244&r1=1228243&r2=1228244&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Fri Jan 6 16:09:08 2012
@@ -964,14 +964,14 @@ public class ContextConfig
docBase = "ROOT";
} else {
if (path.startsWith("/")) {
- docBase = path.substring(1);
+ docBase = path.substring(1).replace('/','#');
} else {
- docBase = path;
+ docBase = path.replace('/','#');
}
}
File file = null;
- if (docBase.toLowerCase().endsWith(".war")) {
+ if (originalDocBase.toLowerCase().endsWith(".war")) {
file = new File(System.getProperty("java.io.tmpdir"),
deploymentCount++ + "-" + docBase + ".war");
} else {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1228244&r1=1228243&r2=1228244&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 6 16:09:08 2012
@@ -69,6 +69,13 @@
existing host via JMX. (kkolinko)
</fix>
<fix>
+ <bug>52293</bug>: Correctly handle the case when
+ <code>antiResourceLocking</code> is enabled at the Context level when
+ <code>unpackWARs</code> is disabled at the Host level. Correctly
+ handle multi-level contexts when <code>antiResourceLocking</code>
+ is enabled. Patch by Justin Miller. (kkolinko)
+ </fix>
+ <fix>
Do not throw IllegalArgumentException from parseParameters() call
when chunked POST request is too large, but treat it like an IO error.
The <code>FailedRequestFilter</code> filter can be used to detect this
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
