Author: kkolinko
Date: Sat May 10 12:51:43 2014
New Revision: 1593695
URL: http://svn.apache.org/r1593695
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56363
Update version of Tomcat Native library included with Tomcat to 1.1.30
and make it the recommended version.
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=1593695&r1=1593694&r2=1593695&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 10 12:51:43 2014
@@ -52,14 +52,6 @@ PATCHES PROPOSED TO BACKPORT:
http://wiki.openssl.org/index.php/FIPS_mode%28%29
Alternative patch is proposed below.
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56363
- Update version of Tomcat Native library included with Tomcat to 1.1.30
- and make it the recommended version.
-
https://people.apache.org/~kkolinko/patches/2014-04-27_tc6_native_1_1_30.patch
- +1: kkolinko, markt, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027
Add more options for managing FIPS mode in the AprLifecycleListener.
Update to version 1.1.30 of Tomcat Native library.
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1593695&r1=1593694&r2=1593695&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sat May 10 12:51:43 2014
@@ -116,7 +116,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.29
+tomcat-native.version=1.1.30
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=1593695&r1=1593694&r2=1593695&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 May 10 12:51:43 2014
@@ -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 = 27;
+ protected static final int TCN_RECOMMENDED_PV = 30;
// ---------------------------------------------- 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=1593695&r1=1593694&r2=1593695&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat May 10 12:51:43 2014
@@ -202,6 +202,10 @@
options with the <code>exe</code> installer. Make command names
case-insensitive. Update documentation. (kkolinko)
</update>
+ <update>
+ <bug>56363</bug>: Update to version 1.1.30 of Tomcat Native library.
+ (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
