This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 41413d3295 Export and re-import strings. No change to values. Just
re-ordering.
41413d3295 is described below
commit 41413d3295919d4b31535d83a4394e042e2241de
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Apr 3 09:06:36 2023 +0100
Export and re-import strings. No change to values. Just re-ordering.
---
java/jakarta/servlet/jsp/LocalStrings.properties | 2 +-
java/org/apache/catalina/connector/LocalStrings.properties | 2 +-
java/org/apache/catalina/core/LocalStrings.properties | 2 +-
java/org/apache/catalina/security/LocalStrings.properties | 4 ++--
java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/jakarta/servlet/jsp/LocalStrings.properties
b/java/jakarta/servlet/jsp/LocalStrings.properties
index 2b34d2c499..081f2fab14 100644
--- a/java/jakarta/servlet/jsp/LocalStrings.properties
+++ b/java/jakarta/servlet/jsp/LocalStrings.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-el.unknown.identifier=Unknown identifier
\ No newline at end of file
+el.unknown.identifier=Unknown identifier
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index 7d81708f8e..b278705d74 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -38,10 +38,10 @@ coyoteConnector.protocolHandlerResumeFailed=Protocol
handler resume failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
coyoteConnector.protocolHandlerStopFailed=Protocol handler stop failed
+coyoteInputStream.blockingOnly=This method may not be called when the input
stream is in non-blocking mode (i.e. after a ReadListener has been configured)
coyoteInputStream.nbNotready=In non-blocking mode you may not read from the
ServletInputStream until the previous read has completed and isReady() returns
true
coyoteInputStream.null=The input buffer object has been recycled and is no
longer associated with this facade
-coyoteInputStream.blockingOnly=This method may not be called when the input
stream is in non-blocking mode (i.e. after a ReadListener has been configured)
coyoteOutputStream.nbNotready=In non-blocking mode you may not write to the
ServletOutputStream until the previous write has completed and isReady()
returns true
coyoteOutputStream.null=The output buffer object has been recycled and is no
longer associated with this facade
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 7988653de3..13cf4491ec 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -68,13 +68,13 @@
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to
SessionCookieConfig for context [{1}] as the context has been initialised
+aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
aprListener.aprInit=The Apache Tomcat Native library which allows using
OpenSSL was not found on the java.library.path: [{0}]
aprListener.aprInitDebug=The Apache Tomcat Native library could not be found
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
aprListener.aprInitError=The Apache Tomcat Native library failed to load. The
error reported was [{0}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index f685b9a2ed..a058198cfb 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-listener.notServer=This listener must only be nested within Server elements,
but is in [{0}].
-
SecurityListener.checkUmaskFail=Start attempted with umask setting of [{0}].
Running Tomcat without a umask at least as restrictive as [{1}] has been
blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener
(usually configured in CATALINA_BASE/conf/server.xml)
SecurityListener.checkUmaskNone=No umask setting was found in system property
[{0}]. However, it appears Tomcat is running on a platform that supports umask.
The system property is typically set in CATALINA_HOME/bin/catalina.sh. The
Lifecycle listener org.apache.catalina.security.SecurityListener (usually
configured in CATALINA_BASE/conf/server.xml) expects a umask at least as
restrictive as [{1}]
SecurityListener.checkUmaskParseFail=Failed to parse value [{0}] as a valid
umask.
SecurityListener.checkUmaskSkip=Unable to determine umask. It appears Tomcat
is running on Windows so skip the umask check.
SecurityListener.checkUserWarning=Start attempted while running as user [{0}].
Running Tomcat as this user has been blocked by the Lifecycle listener
org.apache.catalina.security.SecurityListener (usually configured in
CATALINA_BASE/conf/server.xml)
+
+listener.notServer=This listener must only be nested within Server elements,
but is in [{0}].
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 6d6c5a33b5..5872e2c313 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -128,6 +128,7 @@ streamStateMachine.invalidFrame=Connection [{0}], Stream
[{1}], State [{2}], Fra
upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}]
bytes
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes
unallocated - trying to allocate to children
upgradeHandler.connectionError=Connection error
+upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities
may not be enabled after being disabled in the initial connection settings
frame (see RFC 9218)
upgradeHandler.fallToDebug=\n\
\ Note: further occurrences of HTTP/2 stream errors will be logged at DEBUG
level.
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
@@ -145,7 +146,6 @@ upgradeHandler.pruneStart=Connection [{0}] Starting pruning
of old streams. Limi
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
-upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities
may not be enabled after being disabled in the initial connection settings
frame (see RFC 9218)
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection
reservation [{2}], Stream reservation [{3}] prior to sendfile write
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
