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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 05a5ed4 Correct order
05a5ed4 is described below
commit 05a5ed47cac860ca9cff258b9a98be3dc1f108ef
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 27 12:50:45 2020 +0000
Correct order
---
java/javax/servlet/LocalStrings.properties | 3 +++
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
6 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/javax/servlet/LocalStrings.properties
b/java/javax/servlet/LocalStrings.properties
index b57cb4c..cad5eb7 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -21,3 +21,6 @@ httpMethodConstraintElement.invalidMethod=Invalid HTTP method
value.false=false
value.true=true
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 641ec18..1bc9816 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -271,7 +271,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
if (getSecretRequired()) {
String secret = getSecret();
if (secret == null || secret.length() == 0) {
- throw new
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
+ throw new
IllegalArgumentException(sm.getString("ajpprotocol.noSecret"));
}
}
super.start();
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties
b/java/org/apache/coyote/ajp/LocalStrings.properties
index 3dc52d9..38067ca 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -32,6 +32,6 @@ ajpprocessor.request.process=Error processing request
ajpprotocol.noBio=The AJP BIO connector has been removed in Tomcat 8.5.x
onwards. The AJP BIO connector configuration has been automatically switched to
use the AJP NIO connector instead.
ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration
for [{0}] was ignored
+ajpprotocol.noSecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol
configuration for [{0}] was ignored
ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The
HttpUpgradeHandler [{0}] can not be processed
-ajpprotocol.nosecret=The AJP Connector is configured with
secretRequired="true" but the secret attribute is either null or "". This
combination is not valid.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 48633ec..5acecf3 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=Erreur de traitement de la
requête
ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte
SSL pour [{0}] a été ignorée
ajpprotocol.noUpgrade=L''upgrade n''est pas supporté par AJP. La
configuration UpgradeProtocol pour [{0}] a été ignorée
ajpprotocol.noUpgradeHandler=AJP ne supporte pas la mise à niveau (upgrade) de
HTTP/1.1, le HttpUpgradeHandler [{0}] ne peut pas être utilisé
-ajpprotocol.nosecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec
secretRequired="true" mais l'attribut secret est soit null soit "", cette
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index 4fa663c..b896c47 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=요청 처리 중 오류 발생
ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한
UpgradeProtocol 설정은 무시됩니다.
ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.nosecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다.
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index 534b430..c3a827a 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -20,4 +20,5 @@ ajpprocessor.certs.fail=):证书转换失败
ajpprocessor.header.error=头部信息解析失败
ajpprocessor.readtimeout=从Socket读取数据超时
+ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串，这样的组合是无效的。
ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
