Author: violetagg
Date: Fri Oct 24 13:13:21 2014
New Revision: 1634049
URL: http://svn.apache.org/r1634049
Log:
Merged revisions 1633824, 1633825 from tomcat/trunk:
- Update to Tomcat Native 1.1.32
- Require Tomcat Native 1.1.32
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1633824-1633825
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1634049&r1=1634048&r2=1634049&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Fri Oct 24 13:13:21 2014
@@ -138,11 +138,9 @@ 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.31
+tomcat-native.version=1.1.32
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-# Required due to packaging error in 1.1.31 - remove once fixed
-tomcat-native.win.path=tomcat-native-${tomcat-native.version}-win32-bin
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1634049&r1=1634048&r2=1634049&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Oct 24 13:13:21 2014
@@ -1807,7 +1807,7 @@
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
<copy todir="${tomcat.dist}/bin">
- <fileset dir="${tomcat-native.home}/${tomcat-native.win.path}/bin">
+ <fileset dir="${tomcat-native.home}/bin">
<include name="*.dll"/>
<include name="**/*.dll"/>
</fileset>
@@ -2753,7 +2753,7 @@ Apache Tomcat ${version} native binaries
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
<param name="sourcefile.2" value="${tomcat-native.win.2}"/>
- <param name="destfile"
value="${tomcat-native.home}/${tomcat-native.win.path}/LICENSE"/>
+ <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1634049&r1=1634048&r2=1634049&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Fri Oct 24 13:13:21 2014
@@ -67,7 +67,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 = 30;
+ protected static final int TCN_REQUIRED_PATCH = 32;
protected static final int TCN_RECOMMENDED_MINOR = 1;
protected static final int TCN_RECOMMENDED_PV = 32;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1634049&r1=1634048&r2=1634049&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 24 13:13:21 2014
@@ -93,6 +93,10 @@
of the jsp-property-group element to integer values as the allowed
values are <code><number>kb</code> or <code>none</code>. (markt)
</fix>
+ <update>
+ Update the minimum required version of the Tomcat Native library (if
+ used) to 1.1.32. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -203,6 +207,11 @@
is present in Tomcat <code>lib</code> directory when Eclipse JDT
Compiler is updated to a new version. (kkolinko)
</update>
+ <update>
+ <bug>56596</bug>: Update to Tomcat Native Library version 1.1.32 to
+ pick up the Windows binaries that are based on OpenSSL 1.0.1j and APR
+ 1.5.1. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
