From 17a6b9f9c46127c6bfa4d9d6758eca282cb45b03 Mon Sep 17 00:00:00 2001 From: mturk Date: Mon, 2 Apr 2007 06:24:33 +0000 Subject: [PATCH] Use the tomcat-native-1.1.10 as recommended version. Note: 1.1.9 was broken for OpenSSL builds on some platforms. 1.1.8 will continue to work, although on some platforms there can be JVM crash if IPV6 is enabled and platform doesn't support IPV4 addresses on IPV6 sockets. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@524730 13f79535-47bb-0310-9956-ffa450edef68 --- build.properties.default | 4 ++-- java/org/apache/catalina/core/AprLifecycleListener.java | 2 +- res/tomcat.nsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.properties.default b/build.properties.default index fd868d5a3..b95a9f981 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.9 +tomcat-native.home=${base.path}/tomcat-native-1.1.10 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz -tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.9-src.tar.gz +tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.10-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 a95a8b638..a567fbb37 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 = 9; + protected static final int TCN_RECOMMENDED_PV = 10; // ---------------------------------------------- Properties diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 25c1e8a19..27522aabd 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -195,11 +195,11 @@ Section "Native" SecTomcatNative ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted ; 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.9/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll + NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.10/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.9/binaries/win32/tcnative-1.dll: $0" + DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll: $0" success: ClearErrors -- 2.11.0