tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r524730 - in /tomcat/tc6.0.x/trunk: build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java res/tomcat.nsi
Date Mon, 02 Apr 2007 06:24:36 GMT
Author: mturk
Date: Sun Apr  1 23:24:33 2007
New Revision: 524730

URL: http://svn.apache.org/viewvc?view=rev&rev=524730
Log:
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.

Modified:
    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/res/tomcat.nsi

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?view=diff&rev=524730&r1=524729&r2=524730
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sun Apr  1 23:24:33 2007
@@ -41,9 +41,9 @@
 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

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?view=diff&rev=524730&r1=524729&r2=524730
==============================================================================
--- 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 Sun Apr 
1 23:24:33 2007
@@ -59,7 +59,7 @@
     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

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?view=diff&rev=524730&r1=524729&r2=524730
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Sun Apr  1 23:24:33 2007
@@ -195,11 +195,11 @@
   ; 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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message