Author: kkolinko Date: Sat Apr 27 14:36:32 2013 New Revision: 1476590 URL: http://svn.apache.org/r1476590 Log: Update the native component of the APR/native connector to 1.1.27 and make that version the recommended minimum version. Backport of r1445210 from Tomcat 7.
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default 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=1476590&r1=1476589&r2=1476590&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 14:36:32 2013 @@ -79,14 +79,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: -* Update the native component of the APR/native connector to 1.1.27 and - make that version the recommended minimum version. - http://people.apache.org/~kkolinko/patches/2013-04-27_tc6_native1127.patch - ( r1445210 in Tomcat 7) - +1: kkolinko, rjung, jfclere - -1: - - PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1476590&r1=1476589&r2=1476590&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Sat Apr 27 14:36:32 2013 @@ -117,7 +117,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar # ----- Tomcat native library ----- -tomcat-native.version=1.1.23 +tomcat-native.version=1.1.27 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version} tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz 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=1476590&r1=1476589&r2=1476590&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 Sat Apr 27 14:36:32 2013 @@ -62,7 +62,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 = 22; + protected static final int TCN_RECOMMENDED_PV = 27; // ---------------------------------------------- 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=1476590&r1=1476589&r2=1476590&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 14:36:32 2013 @@ -108,6 +108,10 @@ a chunked request body that this is communicated correctly to the client reading the request body. (markt) </fix> + <update> + Update the native component of the APR/native connector to 1.1.27 and + make that version the recommended minimum version. (kkolinko) + </update> </changelog> </subsection> <subsection name="Cluster"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org