Author: markt Date: Fri Mar 6 13:56:37 2009 New Revision: 750899 URL: http://svn.apache.org/viewvc?rev=750899&view=rev Log: Backport jfclere's NCDFE fix from trunk
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 6 13:56:37 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,747834,748344 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,747834,748344 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=750899&r1=750898&r2=750899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 6 13:56:37 2009 @@ -61,14 +61,6 @@ So to make this bug actually worth while fixing, and not impact performance, then it should only do this check on files that are relevant to the reload of an application, in other words a watched resource -* Backport NCDFE fix from trunk (TCK failures without it) - http://svn.apache.org/viewvc?rev=640888&view=rev - +1: markt - +1: fhanik, jim - trivial change - 0: remm (no clue how it can cause a NCDF, and the TCK actually works for me; besides that code is - really old to me, so where would this come from ?) - -1: - * Changes required to run with a security manager http://svn.apache.org/viewvc?rev=721286&view=rev (original) http://svn.apache.org/viewvc?rev=721704&view=rev (original) Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java?rev=750899&r1=750898&r2=750899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java Fri Mar 6 13:56:37 2009 @@ -364,7 +364,7 @@ String next; MimeHeaders headers; - NamesEnumerator(MimeHeaders headers) { + public NamesEnumerator(MimeHeaders headers) { this.headers=headers; pos=0; size = headers.size(); 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=750899&r1=750898&r2=750899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 6 13:56:37 2009 @@ -276,6 +276,9 @@ <bug>44382</bug>: Add support for using httpOnly for session cookies. This is disabled by default. (markt) </add> + <fix> + Fix possible NCDFE when using FORM authentication. (jfclere) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org