Author: csutherl Date: Tue Sep 19 14:10:12 2017 New Revision: 1808881 URL: http://svn.apache.org/viewvc?rev=1808881&view=rev Log: Cherry-pick r1808880 from 8.5.x/trunk
Modified: tomcat/trunk/ (props changed) tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java tomcat/trunk/webapps/docs/changelog.xml (contents, props changed) Propchange: tomcat/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 19 14:10:12 2017 @@ -1 +1 @@ -/tomcat/tc8.5.x/trunk:1802799 +/tomcat/tc8.5.x/trunk:1802799,1808880 Modified: tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java?rev=1808881&r1=1808880&r2=1808881&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java Tue Sep 19 14:10:12 2017 @@ -49,7 +49,7 @@ public class ServerCookies { } if (cookieCount >= serverCookies.length) { - int newSize = Math.min(2*cookieCount, limit); + int newSize = limit > -1 ? Math.min(2*cookieCount, limit) : 2*cookieCount; ServerCookie scookiesTmp[] = new ServerCookie[newSize]; System.arraycopy(serverCookies, 0, scookiesTmp, 0, cookieCount); serverCookies = scookiesTmp; Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1808881&r1=1808880&r2=1808881&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 19 14:10:12 2017 @@ -74,6 +74,14 @@ </fix> </changelog> </subsection> + <subsection name="Other"> + <changelog> + <fix> + Update fix for <bug>59904</bug> so that values less than zero are accepted + instead of throwing a NegativeArraySizeException. (remm) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 9.0.0.M27 (markt)" rtext="release in progress"> <subsection name="Catalina"> Propchange: tomcat/trunk/webapps/docs/changelog.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 19 14:10:12 2017 @@ -1 +1 @@ -/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934 +/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org