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 6eb411c784a0c8a3df0323c34570ee40908d68c5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 13 11:05:07 2024 +0000
Fix order/grouping. No functional change.
---
java/org/apache/catalina/authenticator/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization
header sent by the clien
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied
ticket
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of
HTTP/2.
sslAuthenticatorValve.noCertificates=No certificates are included with this
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
+errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}]
due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.message=Message
errorReportValve.noDescription=No description available
errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
base64.inputTooLarge=Input array too large, the output array would be bigger
[{0}] than the specified maximum size of [{1}]
base64.lineSeparator=Line separator must not contain base64 characters [{0}]
base64.nullEncodeParameter=Cannot encode integer with null parameter
-
base64.outOfMemory=Unable to allocate array size [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
