Author: markt Date: Fri Sep 2 11:41:57 2011 New Revision: 1164486 URL: http://svn.apache.org/viewvc?rev=1164486&view=rev Log: Update recommended tc-native to 1.1.22
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.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=1164486&r1=1164485&r2=1164486&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 2 11:41:57 2011 @@ -108,11 +108,6 @@ PATCHES PROPOSED TO BACKPORT: needed like in #doGetBytes(). -1: -* Update recommended version of Tomcat-Native to 1.1.22 - http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?r1=1154911&r2=1154910&pathrev=1154911 - +1: kkolinko, markt, kfujino - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 Return -1 from read operation instead of throwing an exception when encountering an EOF with the HTTP APR connector. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1164486&r1=1164485&r2=1164486&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri Sep 2 11:41:57 2011 @@ -60,7 +60,7 @@ public class AprLifecycleListener protected static final int TCN_REQUIRED_MAJOR = 1; protected static final int TCN_REQUIRED_MINOR = 1; protected static final int TCN_REQUIRED_PATCH = 17; - protected static final int TCN_RECOMMENDED_PV = 19; + protected static final int TCN_RECOMMENDED_PV = 22; // ---------------------------------------------- Properties 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=1164486&r1=1164485&r2=1164486&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 2 11:41:57 2011 @@ -91,6 +91,10 @@ (markt) </update> <update> + Update the recommended version of the native component of the APR/native + connectors to 1.1.22. (kkolinko) + </update> + <update> Update the Eclipse compiler (used for JSPs) to 3.7. (markt) </update> </changelog> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org