This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 192f0d889f Remove the reporting of the unused APR feature flags.
192f0d889f is described below
commit 192f0d889f4e57f811e1aa1306d9eb28f7d7d5b2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 31 19:27:48 2022 +0100
Remove the reporting of the unused APR feature flags.
---
java/org/apache/catalina/core/AprLifecycleListener.java | 8 --------
java/org/apache/catalina/core/LocalStrings.properties | 1 -
java/org/apache/catalina/core/LocalStrings_es.properties | 1 -
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 -
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/core/LocalStrings_ko.properties | 1 -
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 -
webapps/docs/changelog.xml | 3 +++
8 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 865131136f..839343b7bc 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -249,14 +249,6 @@ public class AprLifecycleListener implements
LifecycleListener {
Library.versionString(),
Library.aprVersionString()));
- // Log APR flags
- initInfoLogMessages.add(sm.getString("aprListener.flags",
- Boolean.valueOf(Library.APR_HAVE_IPV6),
- Boolean.valueOf(Library.APR_HAS_SENDFILE),
- Boolean.valueOf(Library.APR_HAS_SO_ACCEPTFILTER),
- Boolean.valueOf(Library.APR_HAS_RANDOM),
- Boolean.valueOf(Library.APR_HAVE_UNIX)));
-
AprStatus.setAprAvailable(true);
}
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 0fd769eaef..e0ae670445 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -74,7 +74,6 @@ aprListener.aprInitDebug=The Apache Tomcat Native library
could not be found usi
aprListener.aprInitError=The Apache Tomcat Native library failed to load. The
error reported was [{0}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}], UDS [{4}].
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties
b/java/org/apache/catalina/core/LocalStrings_es.properties
index a49be00548..7e8748f1b7 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -57,7 +57,6 @@ applicationServletRegistration.setServletSecurity.ise=No se
pueden añadir restr
aprListener.aprDestroy=No pude apagar la biblioteca nativa de Apache Tomcat
aprListener.aprInit=La biblioteca nativa de Apache Tomcat basada en ARP que
permite un rendimiento óptimo en entornos de desarrollo no ha sido hallada en
java.library.path: [{0}]
-aprListener.flags=Capacidades APR: IPv6 [{0}], enviar fichero [{1}], aceptar
filtros [{2}], aleatorio [{3}], UDS [{4}].
aprListener.initializedOpenSSL=OpenSSL inicializado correctamente [{0}]
aprListener.initializingFIPS=Inicializando modo FIPS...
aprListener.sslInit=No pude inicializar el SSLEngine (Motor SSL)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index a61c810c98..25ccf04b36 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -74,7 +74,6 @@ aprListener.aprInitDebug=La librairie Apache Tomcat Native
basée sur APR n''a p
aprListener.aprInitError=La librairie Apache Tomcat Native basée sur APR n''a
pas pu être chargée, l''erreur retournée est [{0}]
aprListener.currentFIPSMode=Mode FIPS actuel : [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener est configuré pour
forcer le mode FIPS mais la librairie est déjà en mode FIPS [{0}]
-aprListener.flags=Fonctionnalités d''APR : IPv6 [{0}], sendfile [{1}], accept
filters [{2}], random [{3}], UDS [{4}]
aprListener.initializeFIPSFailed=Echec d'entrée en mode FIPS
aprListener.initializeFIPSSuccess=Entrée avec succès en mode FIPS
aprListener.initializedOpenSSL=OpenSSL a été initialisé avec succès [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index e3d80ad13f..cd0e5a330e 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -74,7 +74,6 @@ aprListener.aprInitDebug=APRベースのApache Tomcatネイティブライブラ
aprListener.aprInitError=APRベースのApache Tomcatネイティブライブラリをロードできませんでした。 報告されたエラーは
[{0}] でした
aprListener.currentFIPSMode=現在のFIPSモード：[{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListenerは強制的にFIPSモードに入るように設定されていますが、ライブラリはすでにFIPSモードになっています
[{0}]
-aprListener.flags=APR機能: IPv6 [{0}]、sendfile [{1}]、受け入れフィルタ [{2}]、ランダム
[{3}]、UDS [{4}]
aprListener.initializeFIPSFailed=FIPS モードに変更できません。
aprListener.initializeFIPSSuccess=FIPS モードに入りました。
aprListener.initializedOpenSSL=OpenSSLは [{0}] を正常に初期化しました
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 4bdb9cec1a..aee66ed4fb 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -74,7 +74,6 @@ aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.librar
aprListener.aprInitError=APR 기반 Apache Tomcat Native 라이브러리를 로드하지 못했습니다. 보고된
오류는 [{0}]입니다.
aprListener.currentFIPSMode=현재의 FIPS 모드: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener가 강제로 FIPS 모드로 들어가도록
설정되었으나, 라이브러리가 이미 FIPS 모드 [{0}]에 있습니다.
-aprListener.flags=APR 용량정보들: IPv6 [{0}], sendfile [{1}], accept filters [{2}],
random [{3}], UDS [{4}].
aprListener.initializeFIPSFailed=FIPS 모드로 진입하지 못했습니다.
aprListener.initializeFIPSSuccess=FIPS 모드로 성공적으로 진입했습니다.
aprListener.initializedOpenSSL=OpenSSL이 성공적으로 초기화되었습니다: [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 8545cd5b28..e1bc10e3b1 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -75,7 +75,6 @@ aprListener.aprInitDebug=在java.library.path[{1}]上使用名称[{0}]找不到
aprListener.aprInitError=基于APR的本地库加载失败.错误报告为[{0}]
aprListener.currentFIPSMode=当前FIPS模式：[{0}]。
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener
配置为强制进入FIPS模式，但库已处于FIPS模式[{0}]
-aprListener.flags=APR功能：IPv6[{0}]、sendfile[{1}]、accept
filters[{2}]、random[{3}]、UDS [{4}]。
aprListener.initializeFIPSFailed=进入FIPS模式失败
aprListener.initializeFIPSSuccess=成功的进入FIPS 模式
aprListener.initializedOpenSSL=OpenSSL成功初始化 [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ca415aa134..0cc4a826ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,9 @@
Include the major version in the recommended version used for Tomcat
Native with the <code>AprLifecycleListener</code>. (markt)
</add>
+ <scode>
+ Remove the reporting of the unused APR feature flags. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
