Author: kkolinko Date: Fri Jan 6 13:46:46 2012 New Revision: 1228179 URL: http://svn.apache.org/viewvc?rev=1228179&view=rev Log: Rainer is correct. That line is OP's patch shall be ignored. Swap proposed patches to make it more clear.
Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1228179&r1=1228178&r2=1228179&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 6 13:46:46 2012 @@ -91,11 +91,14 @@ PATCHES PROPOSED TO BACKPORT: Correctly handle antiResourceLocking=true when unpackWARs=false Correctly handle multi-level contexts when antiResourceLocking=true Patch by Justin Miller - https://issues.apache.org/bugzilla/attachment.cgi?id=28038&action=diff - (https://issues.apache.org/bugzilla/attachment.cgi?id=28097&action=diff) + 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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org