From e0df7f80612253c209a5e6cf0be58d2016c8370b Mon Sep 17 00:00:00 2001 From: mturk Date: Sun, 1 Apr 2007 19:37:58 +0000 Subject: [PATCH] Use the tomcat-native-1.1.9 as recommended version. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@524660 13f79535-47bb-0310-9956-ffa450edef68 --- build.properties.default | 4 ++-- java/org/apache/catalina/core/AprLifecycleListener.java | 2 +- res/tomcat.nsi | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.properties.default b/build.properties.default index e1177a0f0..fd868d5a3 100644 --- a/build.properties.default +++ b/build.properties.default @@ -41,9 +41,9 @@ jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.1.v_677_R32x.jar jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-JDT-3.2.1.zip # ----- Tomcat native library ----- -tomcat-native.home=${base.path}/tomcat-native-1.1.8 +tomcat-native.home=${base.path}/tomcat-native-1.1.9 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz -tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.8-src.tar.gz +tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.9-src.tar.gz # ----- Commons DBCP, version 1.1 or later ----- commons-dbcp.version=1.2.1 diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index d93d8569c..a95a8b638 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -59,7 +59,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 = 8; - protected static final int TCN_RECOMMENDED_PV = 8; + protected static final int TCN_RECOMMENDED_PV = 9; // ---------------------------------------------- Properties diff --git a/res/tomcat.nsi b/res/tomcat.nsi index a6f994ad6..25c1e8a19 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -193,13 +193,13 @@ Section "Native" SecTomcatNative ; tcnative-1.dll is a symlink to the tcnative-1-ipv4.dll ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted - ; The tcnative-1.dll from heanet.ie comes with OpenSSL 0.9.8d compiled in. + ; The tcnative-1.dll from heanet.ie comes with APR 1.2.8 and OpenSSL 0.9.8e compiled in. ; TODO: Depending on the JVM download the 32 or 64 bit version. - NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.8/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll + NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.9/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll Pop $0 StrCmp $0 success success SetDetailsView show - DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.8/binaries/win32/tcnative-1.dll: $0" + DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.9/binaries/win32/tcnative-1.dll: $0" success: ClearErrors -- 2.11.0