[tomcat] branch main updated: Update future code
This is an automated email from the ASF dual-hosted git repository.
remm 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 73d5bfa8bf Update future code
73d5bfa8bf is described below
commit 73d5bfa8bf7217fdba76c2798bd3143d6518c263
Author: remm
AuthorDate: Fri Oct 6 10:14:45 2023 +0200
Update future code
The idea is to resolve profiles when Java 22 is available.
---
java/org/apache/tomcat/util/net/SSLUtilBase.java | 6 +++---
.../ciphers/OpenSSLCipherConfigurationParser.java | 22 --
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index fb8c5558e1..91c2929baa 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -121,9 +121,9 @@ public abstract class SSLUtilBase implements SSLUtil {
sslHostConfig.setTls13RenegotiationAvailable(isTls13RenegAuthAvailable());
// Calculate the enabled ciphers
-if (sslHostConfig.getCiphers().startsWith("PROFILE=")) {
-// OpenSSL profiles
-// TODO: sslHostConfig can query that with Panama, but skip for now
+if (/*!JreCompat.isJre22Available() &&
*/sslHostConfig.getCiphers().startsWith("PROFILE=")) {
+// OpenSSL profiles cannot be resolved without Java 22
+// TODO: sslHostConfig should query that with Panama if possible
this.enabledCiphers = new String[0];
} else {
boolean warnOnSkip =
!sslHostConfig.getCiphers().equals(SSLHostConfig.DEFAULT_TLS_CIPHERS);
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
index 90d0eaca7e..2599bf24c2 100644
---
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -715,12 +715,22 @@ public class OpenSSLCipherConfigurationParser {
// Handle PROFILE= using OpenSSL (if present, otherwise warn), then
replace elements with that
if (elements.length == 1 && elements[0].startsWith("PROFILE=")) {
// Only use with Panama and if OpenSSL has been successfully
loaded before
-/* FIXME: Merge OpenSSL code first
-if (JreCompat.isJre22Available() &&
OpenSSLStatus.isLibraryInitialized()) {
-List cipherList =
OpenSSLLibrary.findCiphers(elements[0]);
-// Replace the original list with the profile contents
-elements = cipherList.toArray(new String[0]);
-}*/
+/* FIXME: Merge OpenSSL Panama code
+if (JreCompat.isJre22Available()) {
+if (OpenSSLStatus.isLibraryInitialized()) {
+List cipherList =
OpenSSLLibrary.findCiphers(elements[0]);
+// Replace the original list with the profile contents
+elements = cipherList.toArray(new String[0]);
+} else {
+// OpenSSL is not available
+
log.error(sm.getString("opensslCipherConfigurationParser.unknownProfile",
elements[0]));
+}
+} else {
+// No way to resolve using OpenSSL, log an info about this
+// but it might still work if using tomcat-native
+
log.info(sm.getString("opensslCipherConfigurationParser.unknownProfile",
elements[0]));
+}
+*/
}
LinkedHashSet ciphers = new LinkedHashSet<>();
Set removedCiphers = new HashSet<>();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Update future code
Please let's not use the term Panama anymore, it is like with Jigsaw. They were
working titles, official name is Java FFM API. Even JEP 442 does not mention
this term anymore.
On 2023/10/06 08:15:09 r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> remm 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 73d5bfa8bf Update future code
> 73d5bfa8bf is described below
>
> commit 73d5bfa8bf7217fdba76c2798bd3143d6518c263
> Author: remm
> AuthorDate: Fri Oct 6 10:14:45 2023 +0200
>
> Update future code
>
> The idea is to resolve profiles when Java 22 is available.
> ---
> java/org/apache/tomcat/util/net/SSLUtilBase.java | 6 +++---
> .../ciphers/OpenSSLCipherConfigurationParser.java | 22
> --
> 2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> index fb8c5558e1..91c2929baa 100644
> --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> @@ -121,9 +121,9 @@ public abstract class SSLUtilBase implements SSLUtil {
>
> sslHostConfig.setTls13RenegotiationAvailable(isTls13RenegAuthAvailable());
>
> // Calculate the enabled ciphers
> -if (sslHostConfig.getCiphers().startsWith("PROFILE=")) {
> -// OpenSSL profiles
> -// TODO: sslHostConfig can query that with Panama, but skip for
> now
> +if (/*!JreCompat.isJre22Available() &&
> */sslHostConfig.getCiphers().startsWith("PROFILE=")) {
> +// OpenSSL profiles cannot be resolved without Java 22
> +// TODO: sslHostConfig should query that with Panama if possible
> this.enabledCiphers = new String[0];
> } else {
> boolean warnOnSkip =
> !sslHostConfig.getCiphers().equals(SSLHostConfig.DEFAULT_TLS_CIPHERS);
> diff --git
> a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
>
> b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> index 90d0eaca7e..2599bf24c2 100644
> ---
> a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> +++
> b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> @@ -715,12 +715,22 @@ public class OpenSSLCipherConfigurationParser {
> // Handle PROFILE= using OpenSSL (if present, otherwise warn), then
> replace elements with that
> if (elements.length == 1 && elements[0].startsWith("PROFILE=")) {
> // Only use with Panama and if OpenSSL has been successfully
> loaded before
> -/* FIXME: Merge OpenSSL code first
> -if (JreCompat.isJre22Available() &&
> OpenSSLStatus.isLibraryInitialized()) {
> -List cipherList =
> OpenSSLLibrary.findCiphers(elements[0]);
> -// Replace the original list with the profile contents
> -elements = cipherList.toArray(new String[0]);
> -}*/
> +/* FIXME: Merge OpenSSL Panama code
> +if (JreCompat.isJre22Available()) {
> +if (OpenSSLStatus.isLibraryInitialized()) {
> +List cipherList =
> OpenSSLLibrary.findCiphers(elements[0]);
> +// Replace the original list with the profile contents
> +elements = cipherList.toArray(new String[0]);
> +} else {
> +// OpenSSL is not available
> +
> log.error(sm.getString("opensslCipherConfigurationParser.unknownProfile",
> elements[0]));
> +}
> +} else {
> +// No way to resolve using OpenSSL, log an info about this
> +// but it might still work if using tomcat-native
> +
> log.info(sm.getString("opensslCipherConfigurationParser.unknownProfile",
> elements[0]));
> +}
> +*/
> }
> LinkedHashSet ciphers = new LinkedHashSet<>();
> Set removedCiphers = new HashSet<>();
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Update future code
On Fri, Oct 6, 2023 at 10:42 AM Michael Osipov wrote:
>
> Please let's not use the term Panama anymore, it is like with Jigsaw. They
> were working titles, official name is Java FFM API. Even JEP 442 does not
> mention this term anymore.
Will do. But these are FIXME comments so will be removed as soon as possible.
Rémy
> On 2023/10/06 08:15:09 r...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > remm 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 73d5bfa8bf Update future code
> > 73d5bfa8bf is described below
> >
> > commit 73d5bfa8bf7217fdba76c2798bd3143d6518c263
> > Author: remm
> > AuthorDate: Fri Oct 6 10:14:45 2023 +0200
> >
> > Update future code
> >
> > The idea is to resolve profiles when Java 22 is available.
> > ---
> > java/org/apache/tomcat/util/net/SSLUtilBase.java | 6 +++---
> > .../ciphers/OpenSSLCipherConfigurationParser.java | 22
> > --
> > 2 files changed, 19 insertions(+), 9 deletions(-)
> >
> > diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> > b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> > index fb8c5558e1..91c2929baa 100644
> > --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> > +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> > @@ -121,9 +121,9 @@ public abstract class SSLUtilBase implements SSLUtil {
> >
> > sslHostConfig.setTls13RenegotiationAvailable(isTls13RenegAuthAvailable());
> >
> > // Calculate the enabled ciphers
> > -if (sslHostConfig.getCiphers().startsWith("PROFILE=")) {
> > -// OpenSSL profiles
> > -// TODO: sslHostConfig can query that with Panama, but skip
> > for now
> > +if (/*!JreCompat.isJre22Available() &&
> > */sslHostConfig.getCiphers().startsWith("PROFILE=")) {
> > +// OpenSSL profiles cannot be resolved without Java 22
> > +// TODO: sslHostConfig should query that with Panama if
> > possible
> > this.enabledCiphers = new String[0];
> > } else {
> > boolean warnOnSkip =
> > !sslHostConfig.getCiphers().equals(SSLHostConfig.DEFAULT_TLS_CIPHERS);
> > diff --git
> > a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> >
> > b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> > index 90d0eaca7e..2599bf24c2 100644
> > ---
> > a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> > +++
> > b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
> > @@ -715,12 +715,22 @@ public class OpenSSLCipherConfigurationParser {
> > // Handle PROFILE= using OpenSSL (if present, otherwise warn),
> > then replace elements with that
> > if (elements.length == 1 && elements[0].startsWith("PROFILE=")) {
> > // Only use with Panama and if OpenSSL has been successfully
> > loaded before
> > -/* FIXME: Merge OpenSSL code first
> > -if (JreCompat.isJre22Available() &&
> > OpenSSLStatus.isLibraryInitialized()) {
> > -List cipherList =
> > OpenSSLLibrary.findCiphers(elements[0]);
> > -// Replace the original list with the profile contents
> > -elements = cipherList.toArray(new String[0]);
> > -}*/
> > +/* FIXME: Merge OpenSSL Panama code
> > +if (JreCompat.isJre22Available()) {
> > +if (OpenSSLStatus.isLibraryInitialized()) {
> > +List cipherList =
> > OpenSSLLibrary.findCiphers(elements[0]);
> > +// Replace the original list with the profile contents
> > +elements = cipherList.toArray(new String[0]);
> > +} else {
> > +// OpenSSL is not available
> > +
> > log.error(sm.getString("opensslCipherConfigurationParser.unknownProfile",
> > elements[0]));
> > +}
> > +} else {
> > +// No way to resolve using OpenSSL, log an info about this
> > +// but it might still work if using tomcat-native
> > +
> > log.info(sm.getString("opensslCipherConfigurationParser.unknownProfile",
> > elements[0]));
> > +}
> > +*/
> > }
> > LinkedHashSet ciphers = new LinkedHashSet<>();
> > Set removedCiphers = new HashSet<>();
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional c
[tomcat] branch main updated: Deprecated classes were removed
This is an automated email from the ASF dual-hosted git repository.
remm 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 4bcfdfcef2 Deprecated classes were removed
4bcfdfcef2 is described below
commit 4bcfdfcef2d36e411a8b9d8b902ce5c76063deb6
Author: remm
AuthorDate: Fri Oct 6 11:22:34 2023 +0200
Deprecated classes were removed
---
java/org/apache/catalina/mbeans/MBeanUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java
b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 8914cb0b06..ed7bd471bc 100644
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -57,8 +57,7 @@ public class MBeanUtils {
* The set of exceptions to the normal rules used by
createManagedBean(). The first element of each
* pair is a class name, and the second element is the managed bean name.
*/
-private static final String exceptions[][] = { {
"org.apache.catalina.users.MemoryGroup", "Group" },
-{ "org.apache.catalina.users.MemoryRole", "Role" }, {
"org.apache.catalina.users.MemoryUser", "User" },
+private static final String exceptions[][] = {
{ "org.apache.catalina.users.GenericGroup", "Group" }, {
"org.apache.catalina.users.GenericRole", "Role" },
{ "org.apache.catalina.users.GenericUser", "User" } };
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (4bcfdfcef2 -> 4c4dac3ee5)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 4bcfdfcef2 Deprecated classes were removed
new eee195fd92 Improvements to French translations
new 23ac9e55a1 Improvements to Japanese translations by tak7iji
new 4c4dac3ee5 Improvements to Russian translations by usmazat
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/session/LocalStrings_ru.properties| 2 ++
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../{ha/tcp => users}/LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../tcp => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties| 25 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../tomcat/util/compat}/LocalStrings_fr.properties | 3 ++-
.../tomcat/util/compat}/LocalStrings_ja.properties | 3 ++-
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 9 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
43 files changed, 223 insertions(+), 20 deletions(-)
copy java/{org/apache/coyote/http11/upgrade =>
jakarta/servlet}/LocalStrings_ru.properties (91%)
copy java/org/apache/catalina/{ha/tcp =>
authenticator}/LocalStrings_ru.properties (86%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/ha/session}/LocalStrings_ru.properties (90%)
copy java/org/apache/catalina/{connector =>
tribes/group}/LocalStrings_ru.properties (75%)
copy java/org/apache/catalina/{util =>
tribes/transport/nio}/LocalStrings_ru.properties (89%)
copy java/org/apache/catalina/{ha/tcp => users}/LocalStrings_ru.properties
(83%)
copy java/org/apache/catalina/{connector =>
webresources}/LocalStrings_ru.properties (75%)
copy java/org/apache/{catalina/ha/tcp =>
coyote/ajp}/LocalStrings_ru.properties (83%)
copy java/{jakarta/servlet/jsp =>
org/apache/tomcat/util/compat}/LocalStrings_fr.properties (76%)
copy java/{jakarta/servlet/jsp =>
org/apache/tomcat/util/compat}/LocalStrings_ja.properties (75%)
copy java/org/apache/{catalina/ha/tcp =>
tomcat/util/scan}/LocalStrings_ru.properties (85%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Improvements to Japanese translations by tak7iji
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
commit 23ac9e55a171efbbae22f84d1e91e122ee4fb705
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:42:56 2023 +0100
Improvements to Japanese translations by tak7iji
---
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
.../tomcat/util/compat/LocalStrings_ja.properties | 17 +
webapps/docs/changelog.xml | 3 +++
3 files changed, 22 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index 0babfe65d5..201730f490 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -50,6 +50,8 @@ abstractProtocolHandler.setAttribute=属性[{0}]に値[{1}]を設定する
abstractProtocolHandler.start=プロトコルハンドラー [{0}] を開始しました。
abstractProtocolHandler.stop=ProtocolHandler [{0}]の停止中
+asyncStateMachine.asyncError.skip=asyncError() は非同期処理の開始後にすでに呼び出されているため無視します
+asyncStateMachine.asyncError.start=asyncError() の処理を開始します
asyncStateMachine.invalidAsyncState=非同期状態 [{1}] のリクエストに対して [{0}] を呼び出すことはできません
asyncStateMachine.stateChange=非同期状態を[{0}]から[{1}]に変更します
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
new file mode 100644
index 00..f41e12253d
--- /dev/null
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+jre22Compat.javaPre22=クラスが見つからないため、コードが Java 22 以前の JVM で実行されていると仮定します
+jre22Compat.unexpected=Java 22のクラストメソッドへの参照を作成するのに失敗しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5ce427867d..aeeba4e684 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -214,6 +214,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Improvements to French translations
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
commit eee195fd927eb7e25565fbbc1b9e1ba7a62de103
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:41:39 2023 +0100
Improvements to French translations
---
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
.../tomcat/util/compat/LocalStrings_fr.properties | 17 +
webapps/docs/changelog.xml | 3 +++
3 files changed, 22 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index f036c73130..50147a6d8c 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -50,6 +50,8 @@ abstractProtocolHandler.setAttribute=Fixe l''attribut [{0}]
avec la valeur [{1}]
abstractProtocolHandler.start=Démarrage du gestionnaire de protocole [{0}]
abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
+asyncStateMachine.asyncError.skip=L'appel à asyncError() est ignoré car il a
déjà été appelé depuis que le traitement asynchrone a commencé
+asyncStateMachine.asyncError.start=Début du traitement de l'appel à
asyncError()
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
new file mode 100644
index 00..65a01ec941
--- /dev/null
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+jre22Compat.javaPre22=Le code est considéré être exécuté sur une JVM
antérieure à Java 22 car la classe n'a pas été trouvée
+jre22Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 22
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a8fd38b2b..5ce427867d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,9 @@
67611: Correct the download link in BUILDING.txt. (lihan)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Improvements to Russian translations by usmazat
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
commit 4c4dac3ee551c73afd173f50d3c8653cd2a496f9
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:44:52 2023 +0100
Improvements to Russian translations by usmazat
---
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/session/LocalStrings_ru.properties| 2 ++
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../ajp}/LocalStrings_ru.properties| 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties| 25 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 3 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
39 files changed, 209 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
b/java/jakarta/servlet/LocalStrings_ru.properties
similarity index 91%
copy from java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
copy to java/jakarta/servlet/LocalStrings_ru.properties
index 788e9288cc..8caf5986f3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
+++ b/java/jakarta/servlet/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cookie.valueNotPresent=отсутствует
+httpMethodConstraintElement.invalidMethod=Ошибочный HTTP метод
diff --git
a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
copy to java/org/apache/catalina/authenticator/LocalStrings_ru.properties
index fdc842fd98..40eec8d7d9 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-staticMembershipProvider.leftOver.ignored=Сообщение[{0}] проигнорированно.
+authenticator.noAuthHeader=Заголовок авторизации не был отправлен клиентом
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 7aacaec1f3..dfe4389831 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -17,3 +17,10 @@ coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
coyoteConnector.invalidEncoding=\n\
Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
+coyoteConnector.invalidPort=Коннектор не может быть запущен так как указанное
значение порта [{0}] не корректно
+coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН включать в себя
сущность
[tomcat] branch 10.1.x updated (de99971200 -> e027a7c37d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from de99971200 Fix BZ 67611 - Correct the download link in BUILDING.txt
new e9140d900c Align with 11.0.x
new 5b3c92e081 Improvements to French translations. (remm)
new a459ed2562 Improvements to Japanese translations by tak7iji. (markt)
new e027a7c37d Improvements to Russian translations by usmazat. (markt)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/security/LocalStrings.properties | 2 +-
.../catalina/session/LocalStrings_ru.properties| 2 ++
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../{ha/tcp => users}/LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../tcp => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings.properties | 2 +-
.../jasper/resources/LocalStrings_ru.properties| 25 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../tomcat/util/compat/LocalStrings_fr.properties | 3 +++
.../tomcat/util/compat/LocalStrings_ja.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 9 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
45 files changed, 227 insertions(+), 20 deletions(-)
copy java/{org/apache/coyote/http11/upgrade =>
jakarta/servlet}/LocalStrings_ru.properties (91%)
copy java/org/apache/catalina/{ha/tcp =>
authenticator}/LocalStrings_ru.properties (86%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/ha/session}/LocalStrings_ru.properties (90%)
copy java/org/apache/catalina/{connector =>
tribes/group}/LocalStrings_ru.properties (75%)
copy java/org/apache/catalina/{util =>
tribes/transport/nio}/LocalStrings_ru.properties (89%)
copy java/org/apache/catalina/{ha/tcp => users}/LocalStrings_ru.properties
(83%)
copy java/org/apache/catalina/{connector =>
webresources}/LocalStrings_ru.properties (75%)
copy java/org/apache/{catalina/ha/tcp =>
coyote/ajp}/LocalStrings_ru.properties (83%)
copy java/org/apache/{catalina/ha/tcp =>
tomcat/util/scan}/LocalStrings_ru.properties (85%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Align with 11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e9140d900ced23cded8fc0fd59346ea8a8514197
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:48:42 2023 +0100
Align with 11.0.x
---
java/org/apache/catalina/security/LocalStrings.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index b2f6cdf023..2af8b37d12 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -25,4 +25,4 @@ listener.notServer=This listener must only be nested within
Server elements, but
tlsCertRenewalListener.notRenewed=[{0}], TLS virtual host [{1}] with name
[{2}] that expires on [{3}] is overdue for renewal
tlsCertRenewalListener.reloadFailed=[{0}], TLS virtual host [{1}] reload of
TLS configuration failed
-tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
\ No newline at end of file
+tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index ac48c70f74..fd3c0e8837 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -216,6 +216,7 @@ jsp.error.tag.invalid.iselignored=Tag directive: invalid
value for isELIgnored
jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value
for trimDirectiveWhitespaces
jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
jsp.error.tag.multi.pageencoding=Tag directive must not have multiple
occurrences of pageencoding
+jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag
directive
jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with
"/WEB-INF/tags" or "/META-INF/tags"
@@ -223,7 +224,6 @@ jsp.error.tagfile.missingPath=Path not specified to tag file
jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at
line [{1}] with name [{0}] that matches the name-from-attribute value of this
variable directive must be of type java.lang.String, must be "required" and
must not be a "rtexprvalue".
jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with
a name [{0}] that matches the name-from-attribute value of this variable
directive
jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in
line [{2}] are the same.
-jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}]
cannot be resolved in either web.xml or the jar files deployed with this
application
jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir'
attributes specified
jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir'
attribute specified
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Improvements to Japanese translations by tak7iji. (markt)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a459ed2562ff44579258b1282d7b91b80c1665d5
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:51:10 2023 +0100
Improvements to Japanese translations by tak7iji. (markt)
---
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 3 +++
webapps/docs/changelog.xml| 3 +++
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index e61737ac73..f7cdd8ea6c 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -51,6 +51,8 @@ abstractProtocolHandler.setAttribute=属性[{0}]に値[{1}]を設定する
abstractProtocolHandler.start=プロトコルハンドラー [{0}] を開始しました。
abstractProtocolHandler.stop=ProtocolHandler [{0}]の停止中
+asyncStateMachine.asyncError.skip=asyncError() は非同期処理の開始後にすでに呼び出されているため無視します
+asyncStateMachine.asyncError.start=asyncError() の処理を開始します
asyncStateMachine.invalidAsyncState=非同期状態 [{1}] のリクエストに対して [{0}] を呼び出すことはできません
asyncStateMachine.stateChange=非同期状態を[{0}]から[{1}]に変更します
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 77b94c3136..9f09063823 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -18,4 +18,7 @@ jre16Compat.unexpected=Java 16クラスおよびメソッドへの参照の作
jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+jre22Compat.javaPre22=クラスが見つからないため、コードが Java 22 以前の JVM で実行されていると仮定します
+jre22Compat.unexpected=Java 22のクラストメソッドへの参照を作成するのに失敗しました
+
jreCompat.noUnixDomainSocket=Java実行環境はUnixドメインソケットに対応していません。 この機能を使用するには、Java
16を使用する必要があります。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dbd06fefc3..740db8f9cb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5b3c92e0810ecc107341f4247f25164008b65844
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:49:25 2023 +0100
Improvements to French translations. (remm)
---
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 3 +++
webapps/docs/changelog.xml| 3 +++
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index b40dadda84..40c20c32ac 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -51,6 +51,8 @@ abstractProtocolHandler.setAttribute=Fixe l''attribut [{0}]
avec la valeur [{1}]
abstractProtocolHandler.start=Démarrage du gestionnaire de protocole [{0}]
abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
+asyncStateMachine.asyncError.skip=L'appel à asyncError() est ignoré car il a
déjà été appelé depuis que le traitement asynchrone a commencé
+asyncStateMachine.asyncError.start=Début du traitement de l'appel à
asyncError()
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index e623c0f7a0..447a3cd9fd 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -18,4 +18,7 @@ jre16Compat.unexpected=Impossible de créer les références
vers les classes et
jre19Compat.javaPre19=Classe non trouvée donc le code est exécutée sur une JVM
antérieure à Java 19
+jre22Compat.javaPre22=Le code est considéré être exécuté sur une JVM
antérieure à Java 22 car la classe n'a pas été trouvée
+jre22Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 22
+
jreCompat.noUnixDomainSocket=L'environnement Java ne supporte pas les sockets
de domaine de Unix, cette fonctionnalité demande Java 16
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4042c974bf..dbd06fefc3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -198,6 +198,9 @@
67611: Correct the download link in BUILDING.txt. (lihan)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Improvements to Russian translations by usmazat. (markt)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e027a7c37d889a6ff16214d749036e6a5301e917
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:51:34 2023 +0100
Improvements to Russian translations by usmazat. (markt)
---
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/session/LocalStrings_ru.properties| 2 ++
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../ajp}/LocalStrings_ru.properties| 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties| 25 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 3 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
39 files changed, 209 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
b/java/jakarta/servlet/LocalStrings_ru.properties
similarity index 91%
copy from java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
copy to java/jakarta/servlet/LocalStrings_ru.properties
index 788e9288cc..8caf5986f3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
+++ b/java/jakarta/servlet/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cookie.valueNotPresent=отсутствует
+httpMethodConstraintElement.invalidMethod=Ошибочный HTTP метод
diff --git
a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
copy to java/org/apache/catalina/authenticator/LocalStrings_ru.properties
index fdc842fd98..40eec8d7d9 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-staticMembershipProvider.leftOver.ignored=Сообщение[{0}] проигнорированно.
+authenticator.noAuthHeader=Заголовок авторизации не был отправлен клиентом
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 7aacaec1f3..dfe4389831 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -17,3 +17,10 @@ coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
coyoteConnector.invalidEncoding=\n\
Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
+coyoteConnector.invalidPort=Коннектор не может быть запущен так как указанное
значение порта [{0}] не корректно
+coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН включать в себ
[tomcat] branch 9.0.x updated (c0c30f9e0c -> 10e2cc688b)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from c0c30f9e0c Handling has changed from NPE to ISE
new 20ddf3e9a7 Align with 10.1.x onwards
new ad5e38a3dd Improvements to French translations. (remm)
new ffe935c9b0 Improvements to Japanese translations by tak7iji. (markt)
new 10e2cc688b Improvements to Russian translations by usmazat. (markt)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/security/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../{ha/tcp => users}/LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../tcp => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings.properties | 2 +-
.../jasper/resources/LocalStrings_ru.properties| 13 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../tomcat/util/compat/LocalStrings_fr.properties | 3 +++
.../tomcat/util/compat/LocalStrings_ja.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 9 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
44 files changed, 213 insertions(+), 20 deletions(-)
copy java/{org/apache/coyote/http11/upgrade =>
javax/servlet}/LocalStrings_ru.properties (91%)
copy java/org/apache/catalina/{ha/tcp =>
authenticator}/LocalStrings_ru.properties (86%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/ha/session}/LocalStrings_ru.properties (90%)
copy java/org/apache/catalina/{connector =>
tribes/group}/LocalStrings_ru.properties (75%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/tribes/transport/nio}/LocalStrings_ru.properties (89%)
copy java/org/apache/catalina/{ha/tcp => users}/LocalStrings_ru.properties
(83%)
copy java/org/apache/catalina/{connector =>
webresources}/LocalStrings_ru.properties (75%)
copy java/org/apache/{catalina/ha/tcp =>
coyote/ajp}/LocalStrings_ru.properties (83%)
copy java/org/apache/{catalina/ha/tcp =>
tomcat/util/scan}/LocalStrings_ru.properties (85%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Improvements to French translations. (remm)
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 ad5e38a3ddd204dfe5330a6613db3825b6be1049
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:58:03 2023 +0100
Improvements to French translations. (remm)
---
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 3 +++
webapps/docs/changelog.xml| 3 +++
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index b40dadda84..40c20c32ac 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -51,6 +51,8 @@ abstractProtocolHandler.setAttribute=Fixe l''attribut [{0}]
avec la valeur [{1}]
abstractProtocolHandler.start=Démarrage du gestionnaire de protocole [{0}]
abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
+asyncStateMachine.asyncError.skip=L'appel à asyncError() est ignoré car il a
déjà été appelé depuis que le traitement asynchrone a commencé
+asyncStateMachine.asyncError.start=Début du traitement de l'appel à
asyncError()
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 5a621ff532..9d37ebac99 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -18,6 +18,9 @@ jre16Compat.unexpected=Impossible de créer les références
vers les classes et
jre19Compat.javaPre19=Classe non trouvée donc le code est exécutée sur une JVM
antérieure à Java 19
+jre22Compat.javaPre22=Le code est considéré être exécuté sur une JVM
antérieure à Java 22 car la classe n'a pas été trouvée
+jre22Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 22
+
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f773a54c3b..95dab6acc2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -196,6 +196,9 @@
Update Commons Pool to 2.12.0. (markt)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Improvements to Russian translations by usmazat. (markt)
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 10e2cc688b22a91f8eec56838f67b8095a8b6708
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:59:11 2023 +0100
Improvements to Russian translations by usmazat. (markt)
---
.../javax/servlet}/LocalStrings_ru.properties | 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/startup/LocalStrings_ru.properties| 9 +++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership/LocalStrings_ru.properties | 2 ++
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../io => users}/LocalStrings_ru.properties| 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../io => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties| 13 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 3 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
38 files changed, 195 insertions(+), 18 deletions(-)
diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
b/java/javax/servlet/LocalStrings_ru.properties
similarity index 91%
copy from webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
copy to java/javax/servlet/LocalStrings_ru.properties
index 7dba9f429f..8caf5986f3 100644
--- a/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
+++ b/java/javax/servlet/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-requestparams.title=Пример параметров запроса
+httpMethodConstraintElement.invalidMethod=Ошибочный HTTP метод
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
copy to java/org/apache/catalina/authenticator/LocalStrings_ru.properties
index d254998b27..40eec8d7d9 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-replicationStream.conflict=конфликтующие не-публичные загрузчики классов
+authenticator.noAuthHeader=Заголовок авторизации не был отправлен клиентом
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 7aacaec1f3..dfe4389831 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -17,3 +17,10 @@ coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
coyoteConnector.invalidEncoding=\n\
Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
+coyoteConnector.invalidPort=Коннектор не может быть запущен так как указанное
значение порта [{0}] не корректно
+coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН включать в себя
сущность (смотри RFC 2616 Cекция 9.6)
+
+coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читат
[tomcat] 03/04: Improvements to Japanese translations by tak7iji. (markt)
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 ffe935c9b0c2fb93883b42ccf9de2b7b5d32aa3c
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:58:45 2023 +0100
Improvements to Japanese translations by tak7iji. (markt)
---
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 3 +++
webapps/docs/changelog.xml| 3 +++
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index e61737ac73..f7cdd8ea6c 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -51,6 +51,8 @@ abstractProtocolHandler.setAttribute=属性[{0}]に値[{1}]を設定する
abstractProtocolHandler.start=プロトコルハンドラー [{0}] を開始しました。
abstractProtocolHandler.stop=ProtocolHandler [{0}]の停止中
+asyncStateMachine.asyncError.skip=asyncError() は非同期処理の開始後にすでに呼び出されているため無視します
+asyncStateMachine.asyncError.start=asyncError() の処理を開始します
asyncStateMachine.invalidAsyncState=非同期状態 [{1}] のリクエストに対して [{0}] を呼び出すことはできません
asyncStateMachine.stateChange=非同期状態を[{0}]から[{1}]に変更します
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 321daf4657..eb5795eec0 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -18,6 +18,9 @@ jre16Compat.unexpected=Java 16クラスおよびメソッドへの参照の作
jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+jre22Compat.javaPre22=クラスが見つからないため、コードが Java 22 以前の JVM で実行されていると仮定します
+jre22Compat.unexpected=Java 22のクラストメソッドへの参照を作成するのに失敗しました
+
jre9Compat.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
jre9Compat.javaPre9=クラスが見つからないため Java 9 以前の JVM 上でコードが実行されていると仮定します
jre9Compat.unexpected=Java9 クラスやメソッドへの参照の生成に失敗しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 95dab6acc2..6af7546aba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -199,6 +199,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Align with 10.1.x onwards
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 20ddf3e9a79583246f266bf696b3fb4230f8eb63
Author: Mark Thomas
AuthorDate: Fri Oct 6 10:56:26 2023 +0100
Align with 10.1.x onwards
---
java/org/apache/catalina/security/LocalStrings.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index b2f6cdf023..2af8b37d12 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -25,4 +25,4 @@ listener.notServer=This listener must only be nested within
Server elements, but
tlsCertRenewalListener.notRenewed=[{0}], TLS virtual host [{1}] with name
[{2}] that expires on [{3}] is overdue for renewal
tlsCertRenewalListener.reloadFailed=[{0}], TLS virtual host [{1}] reload of
TLS configuration failed
-tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
\ No newline at end of file
+tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index fd5a8e020d..e48ea1ab64 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,6 +212,7 @@ jsp.error.tag.invalid.iselignored=Tag directive: invalid
value for isELIgnored
jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value
for trimDirectiveWhitespaces
jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
jsp.error.tag.multi.pageencoding=Tag directive must not have multiple
occurrences of pageencoding
+jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag
directive
jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with
"/WEB-INF/tags" or "/META-INF/tags"
@@ -219,7 +220,6 @@ jsp.error.tagfile.missingPath=Path not specified to tag file
jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at
line [{1}] with name [{0}] that matches the name-from-attribute value of this
variable directive must be of type java.lang.String, must be "required" and
must not be a "rtexprvalue".
jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with
a name [{0}] that matches the name-from-attribute value of this variable
directive
jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in
line [{2}] are the same.
-jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}]
cannot be resolved in either web.xml or the jar files deployed with this
application
jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir'
attributes specified
jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir'
attribute specified
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Sync with 9.0.x onwards
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 39a5fda98e4774b9f47bf73b03b147242eb76865
Author: Mark Thomas
AuthorDate: Fri Oct 6 11:06:11 2023 +0100
Sync with 9.0.x onwards
---
java/org/apache/catalina/security/LocalStrings.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index b2f6cdf023..2af8b37d12 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -25,4 +25,4 @@ listener.notServer=This listener must only be nested within
Server elements, but
tlsCertRenewalListener.notRenewed=[{0}], TLS virtual host [{1}] with name
[{2}] that expires on [{3}] is overdue for renewal
tlsCertRenewalListener.reloadFailed=[{0}], TLS virtual host [{1}] reload of
TLS configuration failed
-tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
\ No newline at end of file
+tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded
TLS configuration
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index bb30a20614..d3d3a1ac77 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -202,6 +202,7 @@ jsp.error.tag.invalid.iselignored=Tag directive: invalid
value for isELIgnored
jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value
for trimDirectiveWhitespaces
jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
jsp.error.tag.multi.pageencoding=Tag directive must not have multiple
occurrences of pageencoding
+jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag
directive
jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with
"/WEB-INF/tags" or "/META-INF/tags"
@@ -209,7 +210,6 @@ jsp.error.tagfile.missingPath=Path not specified to tag file
jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at
line [{1}] with name [{0}] that matches the name-from-attribute value of this
variable directive must be of type java.lang.String, must be "required" and
must not be a "rtexprvalue".
jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with
a name [{0}] that matches the name-from-attribute value of this variable
directive
jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in
line [{2}] are the same.
-jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}]
cannot be resolved in either web.xml or the jar files deployed with this
application
jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir'
attributes specified
jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir'
attribute specified
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Improvements to Japanese translations by tak7iji. (markt)
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 3aa880a0040c4debbf52eec4235f94fe6542333d
Author: Mark Thomas
AuthorDate: Fri Oct 6 11:07:22 2023 +0100
Improvements to Japanese translations by tak7iji. (markt)
---
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index d30de950e9..2e63e0620d 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -49,6 +49,8 @@ abstractProtocolHandler.setAttribute=属性[{0}]に値[{1}]を設定する
abstractProtocolHandler.start=プロトコルハンドラー [{0}] を開始しました。
abstractProtocolHandler.stop=ProtocolHandler [{0}]の停止中
+asyncStateMachine.asyncError.skip=asyncError() は非同期処理の開始後にすでに呼び出されているため無視します
+asyncStateMachine.asyncError.start=asyncError() の処理を開始します
asyncStateMachine.invalidAsyncState=非同期状態 [{1}] のリクエストに対して [{0}] を呼び出すことはできません
asyncStateMachine.stateChange=非同期状態を[{0}]から[{1}]に変更します
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7ab06f1849..043906691b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (46698a3abb -> c49fe51f96)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 46698a3abb Handling has changed from NPE to ISE
new 39a5fda98e Sync with 9.0.x onwards
new d81fd7954e Improvements to French translations. (remm)
new 3aa880a004 Improvements to Japanese translations by tak7iji. (markt)
new c49fe51f96 Improvements to Russian translations by usmazat. (markt)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/security/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings_ru.properties| 8 ++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership}/LocalStrings_ru.properties | 2 +-
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../{ha/tcp => users}/LocalStrings_ru.properties | 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../tcp => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings.properties | 2 +-
.../jasper/resources/LocalStrings_ru.properties| 13 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 9 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
42 files changed, 205 insertions(+), 21 deletions(-)
copy java/{org/apache/coyote/http11/upgrade =>
javax/servlet}/LocalStrings_ru.properties (91%)
copy java/org/apache/catalina/{ha/tcp =>
authenticator}/LocalStrings_ru.properties (86%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/ha/session}/LocalStrings_ru.properties (90%)
copy java/org/apache/catalina/{connector =>
tribes/group}/LocalStrings_ru.properties (75%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/tribes/membership}/LocalStrings_ru.properties (91%)
copy java/org/apache/{coyote/http11/upgrade =>
catalina/tribes/transport/nio}/LocalStrings_ru.properties (89%)
copy java/org/apache/catalina/{ha/tcp => users}/LocalStrings_ru.properties
(83%)
copy java/org/apache/catalina/{connector =>
webresources}/LocalStrings_ru.properties (75%)
copy java/org/apache/{catalina/ha/tcp =>
coyote/ajp}/LocalStrings_ru.properties (83%)
copy java/org/apache/{catalina/ha/tcp =>
tomcat/util/scan}/LocalStrings_ru.properties (85%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Improvements to Russian translations by usmazat. (markt)
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 c49fe51f96fe3ec3e5fcf6780e61ec2a92143a9e
Author: Mark Thomas
AuthorDate: Fri Oct 6 11:07:41 2023 +0100
Improvements to Russian translations by usmazat. (markt)
---
.../servlet}/LocalStrings_ru.properties| 2 +-
.../LocalStrings_ru.properties | 2 +-
.../catalina/connector/LocalStrings_ru.properties | 7 +
.../catalina/core/LocalStrings_ru.properties | 10 +++
.../catalina/filters/LocalStrings_ru.properties| 2 ++
.../catalina/ha/deploy/LocalStrings_ru.properties | 4 +++
.../ha/session}/LocalStrings_ru.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_ru.properties | 3 +++
.../catalina/loader/LocalStrings_ru.properties | 2 ++
.../catalina/manager/LocalStrings_ru.properties| 8 +++---
.../catalina/realm/LocalStrings_ru.properties | 2 ++
.../catalina/startup/LocalStrings_ru.properties| 8 ++
.../group}/LocalStrings_ru.properties | 5 ++--
.../catalina/tribes/io/LocalStrings_ru.properties | 2 +-
.../tribes/membership}/LocalStrings_ru.properties | 2 +-
.../transport/nio}/LocalStrings_ru.properties | 2 +-
.../io => users}/LocalStrings_ru.properties| 2 +-
.../catalina/util/LocalStrings_ru.properties | 4 +++
.../catalina/valves/LocalStrings_ru.properties | 31 ++
.../LocalStrings_ru.properties | 5 ++--
java/org/apache/coyote/LocalStrings_ru.properties | 2 ++
.../io => coyote/ajp}/LocalStrings_ru.properties | 2 +-
.../coyote/http11/LocalStrings_ru.properties | 4 +++
.../http11/filters/LocalStrings_ru.properties | 1 +
.../http11/upgrade/LocalStrings_ru.properties | 2 ++
.../apache/coyote/http2/LocalStrings_ru.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties| 13 +
java/org/apache/naming/LocalStrings_ru.properties | 3 +++
.../util/descriptor/web/LocalStrings_ru.properties | 3 +++
.../tomcat/util/http/LocalStrings_ru.properties| 2 ++
.../util/http/parser/LocalStrings_ru.properties| 4 +++
.../tomcat/util/net/LocalStrings_ru.properties | 8 ++
.../util/net/jsse/LocalStrings_ru.properties | 2 ++
.../util/net/openssl/LocalStrings_ru.properties| 2 ++
.../util/scan}/LocalStrings_ru.properties | 2 +-
.../tomcat/websocket/LocalStrings_ru.properties| 20 ++
webapps/docs/changelog.xml | 3 +++
.../WEB-INF/classes/LocalStrings_ru.properties | 31 ++
38 files changed, 193 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
b/java/javax/servlet/LocalStrings_ru.properties
similarity index 91%
copy from java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
copy to java/javax/servlet/LocalStrings_ru.properties
index 788e9288cc..8caf5986f3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
+++ b/java/javax/servlet/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cookie.valueNotPresent=отсутствует
+httpMethodConstraintElement.invalidMethod=Ошибочный HTTP метод
diff --git a/java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
copy to java/org/apache/catalina/authenticator/LocalStrings_ru.properties
index d254998b27..40eec8d7d9 100644
--- a/java/org/apache/catalina/tribes/io/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-replicationStream.conflict=конфликтующие не-публичные загрузчики классов
+authenticator.noAuthHeader=Заголовок авторизации не был отправлен клиентом
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 7aacaec1f3..dfe4389831 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -17,3 +17,10 @@ coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
coyoteConnector.invalidEncoding=\n\
Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
+coyoteConnector.invalidPort=Коннектор не может быть запущен так как указанное
значение порта [{0}] не корректно
+coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН включать в себя
сущность (смотри RFC 2616 Cекция 9.6)
+
+coyoteInputStream.nbNotready=В неблокирующем режиме невозмо
[tomcat] 02/04: Improvements to French translations. (remm)
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 d81fd7954e358d0c76df6c5fab36ef4afba2daba
Author: Mark Thomas
AuthorDate: Fri Oct 6 11:06:58 2023 +0100
Improvements to French translations. (remm)
---
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index fca89d33c7..4e3c7b0179 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -49,6 +49,8 @@ abstractProtocolHandler.setAttribute=Fixe l''attribut [{0}]
avec la valeur [{1}]
abstractProtocolHandler.start=Démarrage du gestionnaire de protocole [{0}]
abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
+asyncStateMachine.asyncError.skip=L'appel à asyncError() est ignoré car il a
déjà été appelé depuis que le traitement asynchrone a commencé
+asyncStateMachine.asyncError.start=Début du traitement de l'appel à
asyncError()
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af2ebdaead..7ab06f1849 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,9 @@
Update Tomcat Native to 1.2.39 to pick up Windows binaries built with
OpenSSL 3.0.11. (markt)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67626] New: multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used
https://bz.apache.org/bugzilla/show_bug.cgi?id=67626 Bug ID: 67626 Summary: multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used Product: Tomcat 10 Version: 10.1.12 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: hans.ris...@data-experts.de Target Milestone: -- ## Context I am using Tomcat 10.1.12 through Spring-Boot 3.1.3 and have implemented an endpoint for a multipart/mixed upload with one file part and 3 related parts that contain json-based metadata accompanying the file. ## Problem When trying to test this endpoint, I have run into problems with common HTTP-tools, using both Postman and cURL to try to get Tomcat to accept the input. In both cases, Spring raises an exception as the request-parsing identifies NO parts in the multipart request. ## Suspected Bug To me, the culprit appears to be the parsing of request-part names in `org.apache.tomcat.util.http.fileupload.FileUploadBase#getFieldName`, which requires each request parts Content-Disposition to start with "form-data" and `org.apache.tomcat.util.http.fileupload.impl.FileItemIteratorImpl`, which discards any parts it cannot get a name for. ## Expected Behaviour My understanding from these specs - https://www.w3.org/Protocols/rfc1341/7_2_Multipart.html - https://www.ietf.org/rfc/rfc1867.txt is, that this requirement on the Content-Disposition needs only be the case for requests with Content-Type: multipart/form-data. Therefore, I believe multipart-requests should also be accpeted with Content-Type: multipart/mixed and arbitrary Content-Disposition. Please confirm whether you agree, I'm not at all deeply versed in HTTP. ## Workaround When generating requests in both Postman and cURL (with the --form parameter for each part, e.g. --form partname= This class handles multiple files per single HTML widget, sent using > multipart/mixed encoding type, as specified by RFC 1867. > Use parseRequest(RequestContext) to acquire a list of > org.apache.tomcat.util.http.fileupload.FileItem s associated with a given HTML > widget. The usage in Spring obviously does not concern HTML widgets only, as this code path seems to be used for any multipart-request. The focus on HTML widgets would, to me, explain only the form-data spec is followed. However, the comment also mentions the multipart/mixed type. Is this mention only in reference to using multiple files in the same request-part by designating a single part as multipart/mixed as per the spec? == Ideally, I would prefer this to be resolved by more leniently accepting different Content-Dispositions in request-parts. If this is not acceptable, I'm unsure if it would be wise for my code to rely on the _incidental_ support for other multipart requests, as long as the Content-Disposition of the request parts starts with form-data. Please do tell if I missed something here. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67626] multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used
https://bz.apache.org/bugzilla/show_bug.cgi?id=67626 Mark Thomas changed: What|Removed |Added OS||All Severity|normal |enhancement --- Comment #1 from Mark Thomas --- As per the servlet specification, multipart/form-data is supported. multipart/mixed is not. That anything else works at all is more luck than intention. The Tomcat code is a port from Commons FileUpload so some comments may not be 100% correct. It may be possible to extend the support in Tomcat to include multipart/mixed but that would depend on it remaining compatible with the Servlet specification required behaviour. I'll take a look but no promises. Switching to 'enhancement' for now. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67626] multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used
https://bz.apache.org/bugzilla/show_bug.cgi?id=67626 --- Comment #2 from hans.ris...@data-experts.de --- Thank you, that's all I can ask for really. >From the comment, I already suspected as much, but I was unsure where to search which is supported. My understanding there is very limited, so I'll appreciate you having a closer look. >From what I've seen I believe accepting different Content-Disposition values should not do harm as far as HTTP goes, but I didn't know to check the Servlet specification. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/659 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 4c4dac3ee551c73afd173f50d3c8653cd2a496f9 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/983 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] e027a7c37d889a6ff16214d749036e6a5301e917 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Buildbot failure in on tomcat-11.0.x
On Fri, Oct 6, 2023 at 12:50 PM wrote: > > Build status: BUILD FAILED: failed compile (failure) > Worker used: bb_worker2_ubuntu > URL: https://ci2.apache.org/#builders/112/builds/659 > Blamelist: Mark Thomas > Build Text: failed compile (failure) > Status Detected: new failure > Build Source Stamp: [branch main] 4c4dac3ee551c73afd173f50d3c8653cd2a496f9 The translation for versionLoggerListener.vm.vendor in catalina.startup for RU is causing problems. Not sure why. I'll delete the string in poeditor. Also there is an extra EOL space at the end of some other RU strings that were added that makes checkstyle unhappy. Rémy > > > Steps: > > worker_preparation: 0 > > git: 0 > > shell: 0 > > shell_1: 0 > > shell_2: 0 > > shell_3: 0 > > shell_4: 0 > > shell_5: 0 > > compile: 1 > > shell_6: 0 > > shell_7: 0 > > shell_8: 0 > > shell_9: 0 > > Rsync docs to nightlies.apache.org: 0 > > shell_10: 0 > > Rsync RAT to nightlies.apache.org: 0 > > compile_1: 2 > > shell_11: 0 > > Rsync Logs to nightlies.apache.org: 0 > > > -- ASF Buildbot > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix build
This is an automated email from the ASF dual-hosted git repository.
remm 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 cdeb5bf119 Fix build
cdeb5bf119 is described below
commit cdeb5bf119da58a587c5cc07f70e61312c404018
Author: remm
AuthorDate: Fri Oct 6 13:52:12 2023 +0200
Fix build
---
java/org/apache/catalina/startup/LocalStrings_ru.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties
b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index 3922b4ed64..bd56a68a3e 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -34,5 +34,5 @@ versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
versionLoggerListener.os.arch=Архитектура: {0}
versionLoggerListener.os.version=Версия ОС: {0}
-versionLoggerListener.vm.vendor=Производитель JVM:{0}
+versionLoggerListener.vm.vendor=Производитель JVM: {0}
versionLoggerListener.vm.version=Версия JVM:{0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix build
This is an automated email from the ASF dual-hosted git repository.
remm 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 2796a27fe2 Fix build
2796a27fe2 is described below
commit 2796a27fe2b0b9d2f8b21990601c521e46da2198
Author: remm
AuthorDate: Fri Oct 6 13:52:12 2023 +0200
Fix build
---
java/org/apache/catalina/startup/LocalStrings_ru.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties
b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index 3922b4ed64..bd56a68a3e 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -34,5 +34,5 @@ versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
versionLoggerListener.os.arch=Архитектура: {0}
versionLoggerListener.os.version=Версия ОС: {0}
-versionLoggerListener.vm.vendor=Производитель JVM:{0}
+versionLoggerListener.vm.vendor=Производитель JVM: {0}
versionLoggerListener.vm.version=Версия JVM:{0}
-
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 build
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 38b5969e72 Fix build
38b5969e72 is described below
commit 38b5969e72207ac39c14aa0f462d0c5019cb56ea
Author: remm
AuthorDate: Fri Oct 6 13:52:12 2023 +0200
Fix build
---
java/org/apache/catalina/startup/LocalStrings_ru.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties
b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index 3922b4ed64..bd56a68a3e 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -34,5 +34,5 @@ versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
versionLoggerListener.os.arch=Архитектура: {0}
versionLoggerListener.os.version=Версия ОС: {0}
-versionLoggerListener.vm.vendor=Производитель JVM:{0}
+versionLoggerListener.vm.vendor=Производитель JVM: {0}
versionLoggerListener.vm.version=Версия JVM:{0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix build
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 82794edf38 Fix build
82794edf38 is described below
commit 82794edf3878c8775ce9e9516b65e564c13074d7
Author: remm
AuthorDate: Fri Oct 6 13:52:12 2023 +0200
Fix build
---
java/org/apache/catalina/startup/LocalStrings_ru.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties
b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index 546bc64683..b92af96780 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -33,5 +33,5 @@ versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
versionLoggerListener.os.arch=Архитектура: {0}
versionLoggerListener.os.version=Версия ОС: {0}
-versionLoggerListener.vm.vendor=Производитель JVM:{0}
+versionLoggerListener.vm.vendor=Производитель JVM: {0}
versionLoggerListener.vm.version=Версия JVM:{0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
remm 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 eb884fff46 Fix checkstyle
eb884fff46 is described below
commit eb884fff4670ca7294442d0a196fbc7d6ec576ad
Author: remm
AuthorDate: Fri Oct 6 14:01:37 2023 +0200
Fix checkstyle
Poeditor is up to date as well.
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++--
.../apache/tomcat/util/descriptor/web/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ru.properties | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index dfe4389831..ded8982253 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -23,4 +23,4 @@ coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН
вкл
coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читать из
ServletInputStream до тех пор пока не завершится предыдущее чтение и IsReady()
не вернёт true
coyoteRequest.sendfileNotCanonical=Невозможно определить каноническок имя
файла [{0}]] указанное для использования с sendfile
-coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
+coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 0e3dab9065..2cd1b6a14f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -67,7 +67,7 @@ htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика запускает сборку
мусора. Будьте осторожны при использовании её на продуктивных системах.
htmlManagerServlet.diagnosticsSsl=Диагностика конфигурации TLS для коннекторов
htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
-htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
+htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифры
htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS
хостов и их шифры
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index b9a2dc78dd..2be84ca60d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -31,7 +31,7 @@ jsp.error.not.in.template=[{0}] не разрешено в теле текста
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.scripting.variable.missing_name=Не возможно определить имя
скриптовой переменной из атрибута [{0}]
-jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
+jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
jsp.error.taglibDirective.uriInvalid=URI предоставленый для библиотеки тегов
[{0}] не является валидным URI
jsp.error.tld.mandatory.element.missing=Обязательный TLD элемент [{0}]
отсутствует или пуст в TLD [{1}]
jsp.error.unable.renameClassFile=не возможно переименовать файл класса с [{0}]
в [{1}]
@@ -54,4 +54,4 @@ jspc.webfrg.header=\n\
-->
jspc.webxml.footer=
-org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
+org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
diff --git
a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 12f5df20bb..9fbd19264f 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
@@ -16,4 +16,4 @@
[tomcat] branch 10.1.x updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
remm 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 e12c9f37b0 Fix checkstyle
e12c9f37b0 is described below
commit e12c9f37b00b9c0994f949ec240bca16f884aa6f
Author: remm
AuthorDate: Fri Oct 6 14:01:37 2023 +0200
Fix checkstyle
Poeditor is up to date as well.
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++--
.../apache/tomcat/util/descriptor/web/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ru.properties | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index dfe4389831..ded8982253 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -23,4 +23,4 @@ coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН
вкл
coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читать из
ServletInputStream до тех пор пока не завершится предыдущее чтение и IsReady()
не вернёт true
coyoteRequest.sendfileNotCanonical=Невозможно определить каноническок имя
файла [{0}]] указанное для использования с sendfile
-coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
+coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 0e3dab9065..2cd1b6a14f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -67,7 +67,7 @@ htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика запускает сборку
мусора. Будьте осторожны при использовании её на продуктивных системах.
htmlManagerServlet.diagnosticsSsl=Диагностика конфигурации TLS для коннекторов
htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
-htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
+htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифры
htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS
хостов и их шифры
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index e3e7cf4ca5..5f0ddbdf93 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -32,7 +32,7 @@ jsp.error.not.in.template=[{0}] не разрешено в теле текста
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.scripting.variable.missing_name=Не возможно определить имя
скриптовой переменной из атрибута [{0}]
-jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
+jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
jsp.error.taglibDirective.uriInvalid=URI предоставленый для библиотеки тегов
[{0}] не является валидным URI
jsp.error.tld.mandatory.element.missing=Обязательный TLD элемент [{0}]
отсутствует или пуст в TLD [{1}]
jsp.error.unable.renameClassFile=не возможно переименовать файл класса с [{0}]
в [{1}]
@@ -55,4 +55,4 @@ jspc.webfrg.header=\n\
-->
jspc.webxml.footer=
-org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
+org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
diff --git
a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 12f5df20bb..9fbd19264f 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
@@ -16,4 +16,4
[tomcat] branch 9.0.x updated: Fix checkstyle
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 6bb231c68b Fix checkstyle
6bb231c68b is described below
commit 6bb231c68bfc8fa004a610f380ced3819dc6b5fc
Author: remm
AuthorDate: Fri Oct 6 14:01:37 2023 +0200
Fix checkstyle
Poeditor is up to date as well.
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++--
.../apache/tomcat/util/descriptor/web/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ru.properties | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index dfe4389831..ded8982253 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -23,4 +23,4 @@ coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН
вкл
coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читать из
ServletInputStream до тех пор пока не завершится предыдущее чтение и IsReady()
не вернёт true
coyoteRequest.sendfileNotCanonical=Невозможно определить каноническок имя
файла [{0}]] указанное для использования с sendfile
-coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
+coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 0e3dab9065..2cd1b6a14f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -67,7 +67,7 @@ htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика запускает сборку
мусора. Будьте осторожны при использовании её на продуктивных системах.
htmlManagerServlet.diagnosticsSsl=Диагностика конфигурации TLS для коннекторов
htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
-htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
+htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифры
htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS
хостов и их шифры
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 7902f0f245..40f07ac4a0 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -32,7 +32,7 @@ jsp.error.not.in.template=[{0}] не разрешено в теле текста
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.scripting.variable.missing_name=Не возможно определить имя
скриптовой переменной из атрибута [{0}]
-jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
+jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
jsp.error.taglibDirective.uriInvalid=URI предоставленый для библиотеки тегов
[{0}] не является валидным URI
jsp.error.tld.mandatory.element.missing=Обязательный TLD элемент [{0}]
отсутствует или пуст в TLD [{1}]
jsp.error.unable.renameClassFile=не возможно переименовать файл класса с [{0}]
в [{1}]
@@ -43,4 +43,4 @@ jsp.tldCache.tldInDir=TLD файлы были найдены в директор
jspc.webxml.footer=
-org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
+org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
diff --git
a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 12f5df20bb..9fbd19264f 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_r
[tomcat] branch 8.5.x updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d7407a8864 Fix checkstyle
d7407a8864 is described below
commit d7407a8864f329bd0102a7eac4f9cf7920f24ce5
Author: remm
AuthorDate: Fri Oct 6 14:01:37 2023 +0200
Fix checkstyle
Poeditor is up to date as well.
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++--
.../apache/tomcat/util/descriptor/web/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ru.properties | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index dfe4389831..ded8982253 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -23,4 +23,4 @@ coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН
вкл
coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читать из
ServletInputStream до тех пор пока не завершится предыдущее чтение и IsReady()
не вернёт true
coyoteRequest.sendfileNotCanonical=Невозможно определить каноническок имя
файла [{0}]] указанное для использования с sendfile
-coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
+coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к
сессии при очистке запроса
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 7a62c7f809..5b06eec1e7 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -66,7 +66,7 @@ htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика запускает сборку
мусора. Будьте осторожны при использовании её на продуктивных системах.
htmlManagerServlet.diagnosticsSsl=Диагностика конфигурации TLS для коннекторов
htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
-htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
+htmlManagerServlet.diagnosticsSslConnectorCertsText=Список сконфигурированных
виртуальных TLS хостов и цепочки сертификатов безопасности для каждого из них
htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифры
htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS
хостов и их шифры
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 7902f0f245..40f07ac4a0 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -32,7 +32,7 @@ jsp.error.not.in.template=[{0}] не разрешено в теле текста
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.scripting.variable.missing_name=Не возможно определить имя
скриптовой переменной из атрибута [{0}]
-jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
+jsp.error.taglibDirective.absUriCannotBeResolved=Абсолютный uri: [{0}] не
может быть разрешен ни в web.xml ни в jar файлах развернутых с этим приложением
jsp.error.taglibDirective.uriInvalid=URI предоставленый для библиотеки тегов
[{0}] не является валидным URI
jsp.error.tld.mandatory.element.missing=Обязательный TLD элемент [{0}]
отсутствует или пуст в TLD [{1}]
jsp.error.unable.renameClassFile=не возможно переименовать файл класса с [{0}]
в [{1}]
@@ -43,4 +43,4 @@ jsp.tldCache.tldInDir=TLD файлы были найдены в директор
jspc.webxml.footer=
-org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
+org.apache.jasper.compiler.TldCache.servletContextNull=Предоставленый
ServletContext был равен null
diff --git
a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 12f5df20bb..9fbd19264f 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_r
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/660 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] eb884fff4670ca7294442d0a196fbc7d6ec576ad Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/984 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] e12c9f37b00b9c0994f949ec240bca16f884aa6f Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66875] Handling async error after spring already handled error
https://bz.apache.org/bugzilla/show_bug.cgi?id=66875 Nils Kohrs changed: What|Removed |Added Resolution|WORKSFORME |--- Status|RESOLVED|REOPENED --- Comment #5 from Nils Kohrs --- I've updated the example to spring boot 3.1.4 and still get this error on calling the endpoint: 023-10-06T15:41:55.615+02:00 ERROR 53360 --- [nio-8080-exec-3] s.e.ErrorMvcAutoConfiguration$StaticView : Cannot render error page for request [/suspend] as the response has already been committed. As a result, the response may have the wrong status code. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Update future code
On 2023/10/06 09:14:54 Rémy Maucherat wrote: > On Fri, Oct 6, 2023 at 10:42 AM Michael Osipov wrote: > > > > Please let's not use the term Panama anymore, it is like with Jigsaw. They > > were working titles, official name is Java FFM API. Even JEP 442 does not > > mention this term anymore. > > Will do. But these are FIXME comments so will be removed as soon as possible. No big deal, I also didn't mean these spots only, just a general remark for the future. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67626] multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used
https://bz.apache.org/bugzilla/show_bug.cgi?id=67626 --- Comment #3 from Michael Osipov --- The bundled Commons Upload MUST NOT be used to parse anything but, as Mark said, form data as per Servlet spec. Use an external Commons FileUpload. TL;DR Let me share a few notes from a realworld project a contractor has written for us and shown very little understanding of Spring Boot and Servlet stuff. They observed the very same behavior and they tried to be smart just like Spring Boot, but both aren't. I don't know why this has been added to the framework, but Boot tries to pre-parse multipart requests w/o any consideration making you see the issues like these. You must disable this default non-sense behavior (IMHO) with spring.servlet.multipart.enabled set to false. See also this note: https://docs.spring.io/spring-framework/reference/web/webmvc/mvc-servlet/multipart.html. Please retest, I am opting to close this as INVALID. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67626] multipart request parts require Content-Disposition: form-data, even when another multipart-subtype is used
https://bz.apache.org/bugzilla/show_bug.cgi?id=67626 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67628] New: OpenSSLCipherConfigurationParser#parse() produces misleading false positive cipher warnings
https://bz.apache.org/bugzilla/show_bug.cgi?id=67628
Bug ID: 67628
Summary: OpenSSLCipherConfigurationParser#parse() produces
misleading false positive cipher warnings
Product: Tomcat 8
Version: 8.5.x-trunk
Hardware: All
OS: All
Status: NEW
Severity: major
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: micha...@apache.org
Target Milestone:
This likely happens in all maintained versions I have just observed this in
8.5.94-dev. This one tooks me some hours to understand and analyze, after
7129db33aa2797b8da17a9aeffeedfafdc725e7a I see false positive warnings which
are almost impossible to analyze for many users.
I am running off Java 8 and OpenSSL 1.1.1t (HP-UX), 1.1.1w-freebsd/3.0.11
(FreeBSD).
Consider the following config in server.xml:
>honorCipherOrder="true" disableSessionTickets="true"
>
> ciphers="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS:!SHA1:!SHA256:!SHA384">
> certificateKeyPassword="..." type="RSA" />
>
Suddenly I see the following warning:
> 2023-10-05T21:36:05.274 WARNUNG [main]
> org.apache.tomcat.util.net.SSLUtilBase.getEnabled Some of the specified
> [ciphers] are not supported by the SSL engine and have been skipped:
> [[TLS_DH_DSS_WITH_AES_256_GCM_SHA384, TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
> TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384,
> TLS_AES_128_CCM_SHA256, TLS_DH_DSS_WITH_AES_128_GCM_SHA256,
> TLS_DH_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256,
> TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256]]
I have started diffing my config back and forth, but wasn't able to spot the
issue comparing my cipher expression compared to ALL. Added the following diff
to better understand the issue:
> diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> index d300737f69..7f62a18ca7 100644
> --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
> +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
> @@ -175,0 +176,1 @@ public abstract class SSLUtilBase implements SSLUtil {
> +log.info("[" + name + "] with configured: " + configured + ",
> implemented: " + implemented + ", enabled: " + enabled);
Still doesn't work out for me. Looking at SslUtilBase:
>List configuredCiphers = sslHostConfig.getJsseCipherNames();
>Set implementedCiphers = getImplementedCiphers();
Returns false data! While #getImplementedCiphers() truly returns the
implemented ciphers by the underlying OpenSSL version,
sslHostConfig.getJsseCipherNames() does NOT invoke OpenSSL at all. It invokes
"OpenSSLCipherConfigurationParser.parse(getCiphers());" which gives me:
> TLS_AES_128_CCM_SHA256
> TLS_AES_128_GCM_SHA256
> TLS_AES_256_GCM_SHA384
> TLS_CHACHA20_POLY1305_SHA256
> TLS_DHE_RSA_WITH_AES_128_CCM
> TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
> TLS_DHE_RSA_WITH_AES_256_CCM
> TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
> TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256
> TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384
> TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
> TLS_DH_DSS_WITH_AES_128_GCM_SHA256
> TLS_DH_DSS_WITH_AES_256_GCM_SHA384
> TLS_DH_RSA_WITH_AES_128_GCM_SHA256
> TLS_DH_RSA_WITH_AES_256_GCM_SHA384
> TLS_ECDHE_ECDSA_WITH_AES_128_CCM
> TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
> TLS_ECDHE_ECDSA_WITH_AES_256_CCM
> TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
> TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256
> TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384
> TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
> TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
> TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
> TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256
> TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384
> TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
> TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
> TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
> TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
> TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
> TLS_RSA_WITH_AES_128_CCM
> TLS_RSA_WITH_AES_128_GCM_SHA256
> TLS_RSA_WITH_AES_256_CCM
> TLS_RSA_WITH_AES_256_GCM_SHA384
> TLS_RSA_WITH_ARIA_128_GCM_SHA256
> TLS_RSA_WITH_ARIA_256_GCM_SHA384
The parsing and IANA mapping is done by Tomcat, NOT OpenSSL. Now let's invoke
OpenSSL:
> # openssl version
> OpenSSL 1.1.1t 7 Feb 2023
> # openssl ciphers -stdname
> 'HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS:!SHA1:!SHA256:!SHA384'
> | cut -d ' ' -f 1 | sort
> TLS_AES_128_GCM_SHA256
> TLS_AES_256_GCM_SHA384
> TLS_CHACHA20_POLY1305_SHA256
> TLS_DHE_RSA_WITH_AES_128_CCM
> TLS_DHE_RSA_WITH_AES_128_CCM_8
> TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
> TLS_DHE_RSA_WITH_AES_256_CCM
> TLS_DHE_RSA_WITH_AES_256_CCM_8
> TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
> TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256
> TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384
> TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
> TLS_ECDHE_ECDSA_WITH_AES_128_CCM
> TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
> TLS_ECDHE_ECDSA_WITH_AES_128_
[Bug 67628] OpenSSLCipherConfigurationParser#parse() produces misleading false positive cipher warnings
https://bz.apache.org/bugzilla/show_bug.cgi?id=67628 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67628] OpenSSLCipherConfigurationParser#parse() produces misleading false positive cipher warnings
https://bz.apache.org/bugzilla/show_bug.cgi?id=67628 --- Comment #1 from Michael Osipov --- Looking at apps/ciphers.c we could the same from Java, almost identical to: https://github.com/apache/tomcat/blob/eb884fff4670ca7294442d0a196fbc7d6ec576ad/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java#L71-L99 I bet that this can be moved to a static method which can take in ciphers method arg instead of "ALL" literal. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67628] OpenSSLCipherConfigurationParser#parse() produces misleading false positive cipher warnings
https://bz.apache.org/bugzilla/show_bug.cgi?id=67628 --- Comment #2 from Michael Osipov --- Here is the gist with the data: https://gist.github.com/michael-o/0b4a5c4a9362a5477c1dbca6c8ba28cb -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Buildbot failure in on tomcat-11.0.x
6 Oct 2023 08:41:59 Rémy Maucherat : On Fri, Oct 6, 2023 at 12:50 PM wrote: Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/659 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 4c4dac3ee551c73afd173f50d3c8653cd2a496f9 The translation for versionLoggerListener.vm.vendor in catalina.startup for RU is causing problems. Not sure why. I'll delete the string in poeditor. Also there is an extra EOL space at the end of some other RU strings that were added that makes checkstyle unhappy. Thanks for fixing this. I'll look into fixing this in the import process. Mark Rémy Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
