This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new d18fc67c07 Alphabetical order
d18fc67c07 is described below

commit d18fc67c074e8d1d2072e340e8b68ad5cda61d03
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Sep 8 14:17:07 2026 +0100

    Alphabetical order
---
 java/org/apache/catalina/ha/session/LocalStrings.properties | 2 +-
 java/org/apache/tomcat/util/net/LocalStrings.properties     | 2 +-
 java/org/apache/tomcat/websocket/LocalStrings.properties    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index eb54b36ba7..d154227b0b 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -59,8 +59,8 @@ deltaManager.receiveMessage.transfercomplete=Manager [{0}] 
received from node [{
 deltaManager.receiveMessage.unloadingAfter=Manager [{0}]: unloading sessions 
complete
 deltaManager.receiveMessage.unloadingBegin=Manager [{0}]: start unloading 
sessions
 deltaManager.registerCluster=Register manager [{0}] to cluster element [{1}] 
with name [{2}]
-deltaManager.sendMessage.newSession=Manager [{0}] send new session [{1}]
 deltaManager.sendAllSessionsSize.invalid=The sendAllSessionsSize value [{0}] 
is invalid. It must be a positive integer.
+deltaManager.sendMessage.newSession=Manager [{0}] send new session [{1}]
 deltaManager.sessionReceived=Manager [{0}]; session state sent at [{1}] 
received in [{2}] ms.
 deltaManager.startClustering=Starting clustering manager at [{0}]
 deltaManager.stopped=Manager [{0}] is stopping
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties 
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 4c36ce230a..bafc304ace 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -51,8 +51,8 @@ channel.nio.ssl.wrapFail=Unable to wrap data, invalid status 
[{0}]
 
 endpoint.accept.fail=Socket accept failed
 endpoint.alpn.fail=Failed to configure endpoint for ALPN using [{0}]
-endpoint.alpn.tooLong=The negotiated protocol name [{0}] is too long (more 
than 255 bytes)
 endpoint.alpn.negotiated=Negotiated [{0}] protocol using ALPN
+endpoint.alpn.tooLong=The negotiated protocol name [{0}] is too long (more 
than 255 bytes)
 endpoint.apr.failSslContextMake=Unable to create SSLContext. Check that 
SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has 
initialised correctly and that a valid SSLProtocol has been specified
 endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the 
SSLProtocol attribute
 endpoint.debug.channelCloseFail=Failed to close channel
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 9b48860741..fa923342db 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -138,8 +138,8 @@ wsWebSocketContainer.connect.write=Writing the HTTP upgrade 
request from buffer
 wsWebSocketContainer.defaultConfiguratorFail=Failed to create the default 
configurator
 wsWebSocketContainer.failedAuthentication=Failed to handle HTTP response code 
[{0}]. [{1}] header was not accepted by server.
 wsWebSocketContainer.httpRequestFailed=The HTTP request to initiate the 
WebSocket connection to [{0}] failed
-wsWebSocketContainer.invalidExtensionsHeader=The server sent an invalid 
extension header
 wsWebSocketContainer.invalidExtensionParameters=The server responded with 
extension parameters the client is unable to support
+wsWebSocketContainer.invalidExtensionsHeader=The server sent an invalid 
extension header
 wsWebSocketContainer.invalidHeader=Unable to parse HTTP header as no colon is 
present to delimit header name and header value in [{0}]. The header has been 
skipped.
 wsWebSocketContainer.invalidStatus=The HTTP response from the server [{0}] did 
not permit the HTTP upgrade to WebSocket
 wsWebSocketContainer.invalidSubProtocol=The WebSocket server returned multiple 
values for the Sec-WebSocket-Protocol header


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to