You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/15 17:29:40 UTC
[tomcat] branch 8.5.x updated (a6d1837 -> 10be4d1)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from a6d1837 Align master, 9.0.x and 8.5.x
new 17e063f Align master, 9.0.x and 8.5.x
new 10be4d1 Align master, 9.0.x and 8.5.x - Simplify
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/connector/Connector.java | 6 +++++-
java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++----
java/org/apache/catalina/connector/LocalStrings.properties | 3 ++-
java/org/apache/catalina/connector/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/connector/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/connector/LocalStrings_ko.properties | 2 ++
.../apache/catalina/connector/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/core/AprLifecycleListener.java | 10 +++++++---
8 files changed, 25 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align master, 9.0.x and 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 17e063f8339d492c0c0ee9bc18c27b85620fe794
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 17:00:37 2020 +0000
Align master, 9.0.x and 8.5.x
---
java/org/apache/catalina/connector/Connector.java | 6 +++++-
java/org/apache/catalina/connector/LocalStrings.properties | 3 ++-
java/org/apache/catalina/connector/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/connector/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/connector/LocalStrings_ko.properties | 2 ++
.../apache/catalina/connector/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/core/AprLifecycleListener.java | 10 +++++++---
7 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index ee4c9e3..1767199 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -978,8 +978,12 @@ public class Connector extends LifecycleMBeanBase {
setParseBodyMethods(getParseBodyMethods());
}
+ if (protocolHandler.isAprRequired() && !AprLifecycleListener.isInstanceCreated()) {
+ throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",
+ getProtocolHandlerClassName()));
+ }
if (protocolHandler.isAprRequired() && !AprLifecycleListener.isAprAvailable()) {
- throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+ throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",
getProtocolHandlerClassName()));
}
if (AprLifecycleListener.isAprAvailable() && AprLifecycleListener.getUseOpenSSL() &&
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index cdb98ed..0804159 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -28,7 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity (
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization failed
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed
-coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] requires the AprLifecycleListener which is not available
+coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] requires the APR/native library which is not available
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index d93b398..4726bac 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -28,6 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE PEUT PAS contenir
coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de protocole a échoué
coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du gestionnaire de protocole a échoué
coyoteConnector.protocolHandlerInstantiationFailed=L'instantiation du gestionnaire de protocole a échoué
+coyoteConnector.protocolHandlerNoAprLibrary=Le protocole configuré [{0}] requiert la librairie APR/native qui n''est pas disponible
+coyoteConnector.protocolHandlerNoAprListener=Le protocole configuré [{0}] requiert AprLifecycleListener qui n''est pas disponible
coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de protocole a échouée
coyoteConnector.protocolHandlerResumeFailed=Le redémarrage du gestionnaire de protocole a échoué
coyoteConnector.protocolHandlerStartFailed=Le démarrage du gestionnaire de protocole a échoué
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 5188b63..a037e3f 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -28,6 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE メソッドのリクエストは
coyoteConnector.protocolHandlerDestroyFailed=プロトコルハンドラの廃棄に失敗しました
coyoteConnector.protocolHandlerInitializationFailed=プロトコルハンドラの初期化に失敗しました
coyoteConnector.protocolHandlerInstantiationFailed=プロトコルハンドラのインスタンス化に失敗しました
+coyoteConnector.protocolHandlerNoAprLibrary=構成されたプロトコル[{0}]には使用できないAPR/nativeライブラリが必要です。
+coyoteConnector.protocolHandlerNoAprListener=構成されたプロトコル[{0}]には、使用できないAprLifecycleListenerが必要です。
coyoteConnector.protocolHandlerPauseFailed=プロトコルハンドラの一時停止に失敗しました
coyoteConnector.protocolHandlerResumeFailed=プロトコルハンドラの再開に失敗しました
coyoteConnector.protocolHandlerStartFailed=プロトコルハンドラの起動に失敗しました
diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index 3081646..cb49fb7 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -28,6 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE 메소드는 엔티티를 포함해
coyoteConnector.protocolHandlerDestroyFailed=프로토콜 핸들러 소멸 중 실패
coyoteConnector.protocolHandlerInitializationFailed=프로토콜 핸들러 초기화가 실패했습니다.
coyoteConnector.protocolHandlerInstantiationFailed=프로토콜 핸들러 인스턴스 생성에 실패했습니다.
+coyoteConnector.protocolHandlerNoAprLibrary=설정된 프로토콜 [{0}]이(가), 가용하지 않은 APR/native 라이브러리를 요구합니다.
+coyoteConnector.protocolHandlerNoAprListener=설정된 프로토콜 [{0}]이(가), 가용하지 않은 AprLifecycleListener를 요구합니다.
coyoteConnector.protocolHandlerPauseFailed=프로토콜 핸들러에 대한 일시 정지가 실패했습니다.
coyoteConnector.protocolHandlerResumeFailed=프로토콜 핸들러를 재개하지 못했습니다.
coyoteConnector.protocolHandlerStartFailed=프로토콜 핸들러 시작 실패
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index b8fb290..c7207b4 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -21,6 +21,8 @@ coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别，Connector
coyoteConnector.invalidPort=连接器不能启动，因为指定的端口 [{0}]无效
coyoteConnector.parseBodyMethodNoTrace=方法TRACE禁止包含实体（详情查看RFC 2616 章节 9.6）
coyoteConnector.protocolHandlerInstantiationFailed=协议处理程序实例化失败
+coyoteConnector.protocolHandlerNoAprLibrary=配置的协议[{0}]需要不可用的APR/本机库
+coyoteConnector.protocolHandlerNoAprListener=配置的协议[{0}]需要不可用的aprlifecycleListener
coyoteConnector.protocolHandlerPauseFailed=协议处理程序暂停失败
coyoteConnector.protocolHandlerStartFailed=协议处理器启动失败
coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index ae73bfb..0bde68c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -142,10 +142,10 @@ public class AprLifecycleListener
}
// Failure to initialize FIPS mode is fatal
if (!(null == FIPSMode || "off".equalsIgnoreCase(FIPSMode)) && !isFIPSModeActive()) {
- Error e = new Error(
- sm.getString("aprListener.initializeFIPSFailed"));
+ String errorMessage = sm.getString("aprListener.initializeFIPSFailed");
+ Error e = new Error(errorMessage);
// Log here, because thrown error might be not logged
- log.fatal(e.getMessage(), e);
+ log.fatal(errorMessage, e);
throw e;
}
}
@@ -421,4 +421,8 @@ public class AprLifecycleListener
return useOpenSSL;
}
+ public static boolean isInstanceCreated() {
+ return instanceCreated;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Align master, 9.0.x and 8.5.x - Simplify
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10be4d11bec0ed2f725b249f2c6afb89ced5d301
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 17:06:31 2020 +0000
Align master, 9.0.x and 8.5.x - Simplify
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 8ad166f..0d81f6d 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -837,13 +837,12 @@ public class CoyoteAdapter implements Adapter {
}
}
}
- res.setStatus(405);
if (header != null) {
res.addHeader("Allow", header);
}
- res.setMessage("TRACE method is not allowed");
- request.getContext().logAccess(request, response, 0, true);
- return false;
+ response.sendError(405, "TRACE method is not allowed");
+ // Safe to skip the remainder of this method.
+ return true;
}
doConnectorAuthenticationAuthorization(req, request);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org