Author: jim Date: Fri Sep 16 17:21:25 2011 New Revision: 1171683 URL: http://svn.apache.org/viewvc?rev=1171683&view=rev Log: * Update recommended version of Tomcat-Native to 1.1.22 +1: kkolinko, markt, jim -1:
Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1171683&r1=1171682&r2=1171683&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 16 17:21:25 2011 @@ -24,11 +24,6 @@ $Id$ PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER: [ start all new proposals below, under PATCHES PROPOSED. ] -* 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, jim - -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/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?rev=1171683&r1=1171682&r2=1171683&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java Fri Sep 16 17:21:25 2011 @@ -60,7 +60,7 @@ public class AprLifecycleListener protected static final int REQUIRED_MAJOR = 1; protected static final int REQUIRED_MINOR = 1; protected static final int REQUIRED_PATCH = 17; - protected static final int RECOMMENDED_PV = 19; + protected static final int RECOMMENDED_PV = 22; // ---------------------------------------------- Properties --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org