This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5d0108a4831b5d2eec06f1a128874102997c8696 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Feb 8 12:50:30 2024 +0000 File name updates for Tomcat Native 2.0.7 --- BUILDING.txt | 2 +- RUNNING.txt | 4 ++-- res/install-win/tomcat.nsi | 4 ++-- webapps/docs/apr.xml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index d4e248b7b0..fc440f237b 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -374,7 +374,7 @@ By default the "test.apr.loc" property specifies the following location: output/build/bin/ If you are on Windows and want to test the OpenSSL TLS implementation you can -put the tcnative-1.dll file into ${tomcat.source}/bin/ and it will be +put the tcnative-2.dll file into ${tomcat.source}/bin/ and it will be copied into the above directory when the build runs. The unit tests include tests of the clustering functionality which require diff --git a/RUNNING.txt b/RUNNING.txt index 0adb82c6da..1e250526ff 100644 --- a/RUNNING.txt +++ b/RUNNING.txt @@ -422,8 +422,8 @@ To deactivate Apache Tomcat Native library: The binary file of Apache Tomcat Native library is usually named - - "tcnative-1.dll" on Windows - - "libtcnative-1.so" on *nix systems + - "tcnative-2.dll" on Windows + - "libtcnative-2.so" on *nix systems Apache Commons Daemon diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi index fe16505799..905472bf30 100644 --- a/res/install-win/tomcat.nsi +++ b/res/install-win/tomcat.nsi @@ -265,9 +265,9 @@ Section "Native" SecTomcatNative SetOutPath $INSTDIR\bin ${If} $Arch == "x86" - File bin\tcnative-1.dll + File bin\tcnative-2.dll ${ElseIf} $Arch == "x64" - File /oname=tcnative-1.dll bin\x64\tcnative-1.dll + File /oname=tcnative-2.dll bin\x64\tcnative-2.dll ${EndIf} ClearErrors diff --git a/webapps/docs/apr.xml b/webapps/docs/apr.xml index ba84ee87a1..1987d39078 100644 --- a/webapps/docs/apr.xml +++ b/webapps/docs/apr.xml @@ -62,11 +62,11 @@ <subsection name="Windows"> <p> - Windows binaries are provided for tcnative-1, which is a statically compiled .dll which includes + Windows binaries are provided for tcnative-2, which is a statically compiled .dll which includes OpenSSL and APR. It can be downloaded from <a href="https://tomcat.apache.org/download-native.cgi">here</a> as 32bit or AMD x86-64 binaries. In security conscious production environments, it is recommended to use separate shared dlls - for OpenSSL, APR, and libtcnative-1, and update them as needed according to security bulletins. + for OpenSSL, APR, and libtcnative-2, and update them as needed according to security bulletins. Windows OpenSSL binaries are linked from the <a href="https://www.openssl.org">Official OpenSSL website</a> (see related/binaries). </p> @@ -84,8 +84,8 @@ Requirements: </p> <ul> - <li>APR 1.2+ development headers (libapr1-dev package)</li> - <li>OpenSSL 1.0.2+ development headers (libssl-dev package)</li> + <li>APR 1.6.3+ development headers (libapr1-dev package)</li> + <li>OpenSSL 1.1.1+ development headers (libssl-dev package)</li> <li>JNI headers from Java compatible JDK 1.4+</li> <li>GNU development environment (gcc, make)</li> </ul> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org