This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4d56e6ad44d096b0e82a1df59c9653bde8e71b88
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 6 15:16:05 2024 +0000
Fix order
---
java/org/apache/catalina/filters/LocalStrings.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/http/LocalStrings.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 6a4f97cd5a..73ce1c15d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -37,10 +37,10 @@ csrfPrevention.unsupportedPattern=Unsupported pattern [{0}]
expiresFilter.cacheControlNoStore=Request [{0}] with response status [{1}]
content-type [{2}], Cache-Control: no-store header already defined
expiresFilter.exceptionProcessingParameter=Exception processing configuration
parameter [{0}]:[{1}]
expiresFilter.expirationHeaderAlreadyDefined=Request [{0}] with response
status [{1}] content-type [{2}], Expires header already defined
-expiresFilter.invalidMethod=Request [{0}] with request method [{1}],
non-cacheable method
expiresFilter.filterInitialized=Filter initialized with configuration [{0}]
expiresFilter.invalidDurationNumber=Invalid duration (number) [{0}] in
directive [{1}]
expiresFilter.invalidDurationUnit=Invalid duration unit
(years|months|weeks|days|hours|minutes|seconds) [{0}] in directive [{1}]
+expiresFilter.invalidMethod=Request [{0}] with request method [{1}],
non-cacheable method
expiresFilter.noDurationFound=Duration not found in directive [{0}]
expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount
[{0}] in directive [{1}]
expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}]
content-type [{2}], no expiration configured
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index ae3d0f047b..fecf44bbcb 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -59,6 +59,6 @@ webdavservlet.externalEntityIgnored=The request included a
reference to an exter
webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
webdavservlet.jaxpfailed=JAXP initialization failed
webdavservlet.memorystore=Non persistent memory storage will be used for dead
properties; the 'propertyStore' init parameter of the Servlet may be used to
configure a custom store implementing the 'WebdavServlet.PropertyStore'
interface
-webdavservlet.nonWildcardMapping=The mapping [{0}] is not a wildcard mapping
and should not be used for the WebDAV Servlet
webdavservlet.noStoreParameter=Init parameter [{0}] with value [{1}] was not
found on the configured store
+webdavservlet.nonWildcardMapping=The mapping [{0}] is not a wildcard mapping
and should not be used for the WebDAV Servlet
webdavservlet.storeError=Error creating store of class [{0}], the default
memory store will be used instead
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index 19471ba42a..bb6d3afa6c 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -47,5 +47,5 @@ rfc6265CookieProcessor.invalidCharInValue=An invalid
character [{0}] was present
rfc6265CookieProcessor.invalidDomain=An invalid domain [{0}] was specified for
this cookie
rfc6265CookieProcessor.invalidPath=An invalid path [{0}] was specified for
this cookie
-webdavifheader.unexpectedCharacter=Unexpected character [{0}] in state [{1}],
expected any of [{2}]
webdavifheader.ioError=IO Problem catching up to any of [{0}]
+webdavifheader.unexpectedCharacter=Unexpected character [{0}] in state [{1}],
expected any of [{2}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
