(tomcat) branch 9.0.x updated: Fix string

[remm]

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

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 9696112d25 Fix string
9696112d25 is described below

commit 9696112d25b8a1fa78022931cf915910dbe7c3ca
Author: remm 
AuthorDate: Thu Feb 8 10:59:03 2024 +0100

Fix string
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 1 +
 java/org/apache/tomcat/websocket/Util.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 47af443304..6113667aae 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -55,6 +55,7 @@ transformerFactory.unsupportedExtension=The extension [{0}] 
is not supported
 
 util.invalidMessageHandler=The message handler provided does not have an 
onMessage(Object) method
 util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is not 
supported.
+util.invalidValue=Value [{0}] contains delimiters
 util.notToken=An illegal extension parameter was specified with name [{0}] and 
value [{1}]
 util.unknownDecoderType=The Decoder type [{0}] is not recognized
 
diff --git a/java/org/apache/tomcat/websocket/Util.java 
b/java/org/apache/tomcat/websocket/Util.java
index 34d3ea815e..be26a1dc4a 100644
--- a/java/org/apache/tomcat/websocket/Util.java
+++ b/java/org/apache/tomcat/websocket/Util.java
@@ -523,7 +523,7 @@ public class Util {
 }
 if (value != null && (value.indexOf(',') > -1 || 
value.indexOf(';') > -1 || value.indexOf('\"') > -1 ||
 value.indexOf('=') > -1)) {
-throw new IllegalArgumentException(sm.getString("", 
value));
+throw new 
IllegalArgumentException(sm.getString("util.invalidValue", value));
 }
 extension.addParameter(new WsExtensionParameter(name, value));
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Fix string ms -> s

[remm]

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

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e24cf384f3 Fix string ms -> s
e24cf384f3 is described below

commit e24cf384f3af0669db8023a446fd4f8779aa4d57
Author: remm 
AuthorDate: Fri Jul 7 19:46:30 2023 +0200

Fix string ms -> s
---
 java/org/apache/catalina/filters/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties 
b/java/org/apache/catalina/filters/LocalStrings.properties
index 7b7346663c..a0f5bf0f04 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -52,7 +52,7 @@ http.403=Access to the specified resource [{0}] has been 
forbidden.
 httpHeaderSecurityFilter.clickjack.invalid=An invalid value [{0}] was 
specified for the anti click-jacking header
 httpHeaderSecurityFilter.committed=Unable to add HTTP headers since response 
is already committed on entry to the HTTP header security Filter
 
-rateLimitFilter.initialized=RateLimitFilter [{0}] initialized with [{1}] 
requests per [{2}] seconds. Actual is [{3}] per [{4}] milliseconds. [{5}].
+rateLimitFilter.initialized=RateLimitFilter [{0}] initialized with [{1}] 
requests per [{2}] seconds. Actual is [{3}] per [{4}] seconds. [{5}].
 rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] Requests from [{2}] have 
exceeded the maximum allowed of [{3}] in a [{4}] second window.
 
 remoteCidrFilter.invalid=Invalid configuration provided for [{0}]. See 
previous messages for details.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org