[Bug 69603] running configure of tomcat-native breaks on openssl(3.4.1) verification

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69603

--- Comment #4 from Rainer Jung  ---
The output line

using openssl from /usr/local/bin//lib and /usr/local/bin//include

indicates, that you gave /usr/local/bin/ to configure as the ath to your
OpenSSL installation. That is most likely wrong, it is the ath to your OpenSSSl
binary. Try /usr/local instead.

-- 
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-9.0.x

2025-02-28 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1293
Blamelist: Rainer Jung 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 0acf1c3daecc22411ca030955b2e367cd4e90d25


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



(tomcat) branch main updated: Fix skip.installer=true build.

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 77ce61c048 Fix skip.installer=true build.
77ce61c048 is described below

commit 77ce61c048bafabfe4feecdbab4a41e8a6658f90
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:26:14 2025 +0100

Fix skip.installer=true build.

ant target dependencies run even if the target body itself
is skipped via unless. So make sure that dependencies
use the same "unless".

It was removed in error during the installer target
refactoring to support makensis on non-Windows.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index eaa9edcda1..815f976487 100644
--- a/build.xml
+++ b/build.xml
@@ -2613,7 +2613,7 @@
 
   
 
-  
+  
 
 
   


-
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 skip.installer=true build.

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 b9d606c9d6 Fix skip.installer=true build.
b9d606c9d6 is described below

commit b9d606c9d6c42f6f5f2ae6d8d12ea45e3a972eef
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:32:33 2025 +0100

Fix skip.installer=true build.

ant target dependencies run even if the target body itself
is skipped via unless. So make sure that dependencies
use the same "unless".

It was removed in error during the installer target
refactoring to support makensis on non-Windows.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index a8b94771b7..a4fa6591d9 100644
--- a/build.xml
+++ b/build.xml
@@ -2594,7 +2594,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
   
 
-  
+  
 
 
   


-
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 changelog typo

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 a4bb571caf Fix changelog typo
a4bb571caf is described below

commit a4bb571caf806dd366af094726a980c5ba9ef588
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:55:26 2025 +0100

Fix changelog typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9a11a6e627..d21a6e3917 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -328,7 +328,7 @@
 encodedReverseSolidusHandling, to control how
 %5c sequences in URLs are handled. The default behaviour 
is
 unchanged (decode) keeping in mind that the
-allowBackslash attributes determines how the decoded
+allowBackslash attribute determines how the decoded
 URI is processed. (markt)
   
   


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



(tomcat) branch 11.0.x updated: Fix changelog typo.

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 9c1d7b9918 Fix changelog typo.
9c1d7b9918 is described below

commit 9c1d7b991884c85213e8e39a6590067877bbeda3
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:54:30 2025 +0100

Fix changelog typo.
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 48e946a063..ca75b87dd1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -342,7 +342,7 @@
 encodedReverseSolidusHandling, to control how
 %5c sequences in URLs are handled. The default behaviour 
is
 unchanged (decode) keeping in mind that the
-allowBackslash attributes determines how the decoded
+allowBackslash attribute determines how the decoded
 URI is processed. (markt)
   
   


-
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 changelog typo

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 0acf1c3dae Fix changelog typo
0acf1c3dae is described below

commit 0acf1c3daecc22411ca030955b2e367cd4e90d25
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:55:46 2025 +0100

Fix changelog typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 079c360808..645257868e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -321,7 +321,7 @@
 encodedReverseSolidusHandling, to control how
 %5c sequences in URLs are handled. The default behaviour 
is
 unchanged (decode) keeping in mind that the
-allowBackslash attributes determines how the decoded
+allowBackslash attribute determines how the decoded
 URI is processed. (markt)
   
   


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



(tomcat) branch main updated: 69602: Allow weak etags in If-Range header

2025-02-28 Thread remm
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 7f0df68d29 69602: Allow weak etags in If-Range header
7f0df68d29 is described below

commit 7f0df68d292bcb576a48b975f169010b911d728c
Author: remm 
AuthorDate: Fri Feb 28 23:40:42 2025 +0100

69602: Allow weak etags in If-Range header

Adjust with the specification language, '"' in the first three chars
should detect if this should be a date or an etag.
Trim first.
---
 .../apache/catalina/servlets/DefaultServlet.java   | 38 +-
 .../servlets/TestDefaultServletRangeRequests.java  | 36 ++--
 webapps/docs/changelog.xml |  5 +++
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 0e4a33e50c..9fb75069f1 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2376,40 +2376,46 @@ public class DefaultServlet extends HttpServlet {
 // If-Range is not present
 return true;
 }
-String headerValue = headerEnum.nextElement();
+String headerValue = headerEnum.nextElement().trim();
 if (headerEnum.hasMoreElements()) {
 // Multiple If-Range headers
 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return false;
 }
 
-long headerValueTime = -1L;
-try {
-headerValueTime = request.getDateHeader("If-Range");
-} catch (IllegalArgumentException e) {
-// Ignore
-}
-
-if (headerValueTime == -1L) {
-// Not HTTP-date so this should be a single strong etag
-if (headerValue.length() < 2 || headerValue.charAt(0) != '"' ||
+if (headerValue.length() > 2 && (headerValue.charAt(0) == '"' || 
headerValue.charAt(2) == '"')) {
+boolean weakETag = headerValue.startsWith("W/\"");
+if ((!weakETag && headerValue.charAt(0) != '"') ||
 headerValue.charAt(headerValue.length() - 1) != '"' ||
-headerValue.indexOf('"', 1) != headerValue.length() - 1) {
-// Not a single, strong entity tag
+headerValue.indexOf('"', weakETag ? 3 : 1) != 
headerValue.length() - 1) {
+// Not a single entity tag
 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return false;
 }
 // If the ETag the client gave does not match the entity
 // etag, then the entire entity is returned.
-if (resourceETag != null && resourceETag.startsWith("\"") && 
resourceETag.equals(headerValue.trim())) {
+if (resourceETag != null && resourceETag.equals(headerValue)) {
 return true;
 } else {
 return false;
 }
 } else {
-// unit of HTTP date is second, ignore millisecond part.
-return resourceLastModified >= headerValueTime && 
resourceLastModified < headerValueTime + 1000;
+long headerValueTime = -1L;
+try {
+headerValueTime = request.getDateHeader("If-Range");
+} catch (IllegalArgumentException e) {
+// Ignore
+}
+if (headerValueTime >= 0) {
+// unit of HTTP date is second, ignore millisecond part.
+return resourceLastModified >= headerValueTime && 
resourceLastModified < headerValueTime + 1000;
+} else {
+// Not a single entity tag and not a valid date either
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+return false;
+}
 }
+
 }
 
 /**
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java 
b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
index af6031a159..4fb3952531 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRangeRequests.java
@@ -16,7 +16,10 @@
  */
 package org.apache.catalina.servlets;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,9 +33,12 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catal

(tomcat) branch 9.0.x updated: Fix skip.installer=true build.

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 8391012537 Fix skip.installer=true build.
8391012537 is described below

commit 8391012537a1dd266c70f21cd766326f54275068
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:33:30 2025 +0100

Fix skip.installer=true build.

ant target dependencies run even if the target body itself
is skipped via unless. So make sure that dependencies
use the same "unless".

It was removed in error during the installer target
refactoring to support makensis on non-Windows.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 8b9f85e0cd..d2182dd600 100644
--- a/build.xml
+++ b/build.xml
@@ -2591,7 +2591,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
   
 
-  
+  
 
 
   


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



(tomcat) branch 11.0.x updated: Fix skip.installer=true build.

2025-02-28 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new b9712a33d9 Fix skip.installer=true build.
b9712a33d9 is described below

commit b9712a33d9644a3966cdfa03f7fff60dc3313f04
Author: Rainer Jung 
AuthorDate: Fri Feb 28 20:31:26 2025 +0100

Fix skip.installer=true build.

ant target dependencies run even if the target body itself
is skipped via unless. So make sure that dependencies
use the same "unless".

It was removed in error during the installer target
refactoring to support makensis on non-Windows.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d0e6a5065e..183445696c 100644
--- a/build.xml
+++ b/build.xml
@@ -2566,7 +2566,7 @@
 
   
 
-  
+  
 
 
   


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



[Bug 69603] running configure of tomcat-native breaks on openssl(3.4.1) verification

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69603

--- Comment #2 from Chuck Caldarale  ---
The OpenSSL version check does not use the openssl executable, but instead the
value of OPENSSL_VERSION_NUMBER (or LIBRESSL_VERSION_NUMBER) from the
/usr/local/bin/include/openssl/opensslv.h header file.

Can you check to see what value is in that file?

-- 
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 69603] running configure of tomcat-native breaks on openssl(3.4.1) verification

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69603

--- Comment #3 from Stephen Krause  ---
From:  /usr/local/include/openssl

# define OPENSSL_VERSION_TEXT "OpenSSL 3.4.1 11 Feb 2025"

/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
#  define _OPENSSL_VERSION_PRE_RELEASE 0x0L
# else
#  define _OPENSSL_VERSION_PRE_RELEASE 0xfL
# endif
# define OPENSSL_VERSION_NUMBER  \
( (OPENSSL_VERSION_MAJOR<<28)\
  |(OPENSSL_VERSION_MINOR<<20)   \
  |(OPENSSL_VERSION_PATCH<<4)\
  |_OPENSSL_VERSION_PRE_RELEASE )

# ifdef  __cplusplus
}
# endif

-- 
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 69206] jdbc-pool is not returning the proxied Statement from a ResultSet

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69206

Mark Thomas  changed:

   What|Removed |Added

 CC||detlef.bren...@karakun.com

--- Comment #4 from Mark Thomas  ---
*** Bug 69601 has been marked as a duplicate of this bug. ***

-- 
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 69601] JDBC Pool "not a proxy instance"

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69601

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---


*** This bug has been marked as a duplicate of bug 69206 ***

-- 
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



(tomcat) branch main updated: Improvements to Japanese translations by tak7iji.

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 11b5eb7a67 Improvements to Japanese translations by tak7iji.
11b5eb7a67 is described below

commit 11b5eb7a678d28fb1c7ddc792dd62149d6310d09
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:13:31 2025 +

Improvements to Japanese translations by tak7iji.
---
 java/org/apache/catalina/servlets/LocalStrings_ja.properties  | 2 ++
 java/org/apache/catalina/valves/LocalStrings_ja.properties| 6 ++
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties| 3 +++
 java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 2 ++
 webapps/docs/changelog.xml| 3 +++
 5 files changed, 16 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties 
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index d390e74d8c..8f70c9b1ec 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -57,6 +57,8 @@ defaultServlet.skipfail=[{1}]バイトをスキップして要求された範囲
 defaultServlet.unknownBomConfig=useBomIfPresentの初期化パラメーターに提供された認識されない値 [{0}]
 defaultServlet.xslError=XSL変換エラー
 
+webdavservlet.dataSourceStore.error=パス [{1}] の無効なプロパティで [{0}] を処理中にエラーが発生しました
+webdavservlet.dataSourceStore.noDataSource=データソース [{0}] が webapp 環境に見つかりませんでした
 webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID 
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
 webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
 webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties 
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 49aa83ff24..42aaa0e1ba 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -138,6 +138,12 @@ http.511.reason=Network Authentication Required
 loadBalancerDrainingValve.draining=ロードバランサは DISABLED 状態にあり、このノードを使用していません
 loadBalancerDrainingValve.skip=クライアントは有効な [{0}] Cookie 
を提示しているため、リバランスはスキップされています
 
+parameterLimitValve.closeError=設定をクローズする際のエラー
+parameterLimitValve.invalidLine=各行には少なくとも 1 つの ''='' が含まれている必要があります。無効な行 [{0}]
+parameterLimitValve.noConfiguration=構成リソースが見つかりません [{0}]
+parameterLimitValve.readConfiguration=[/WEB-INF/{0}] から設定を読み取ります
+parameterLimitValve.readError=設定の読み込みエラー
+
 patternTokenizer.unexpectedParenthesis=パターンに予期しない ')' があります
 
 persistentValve.acquireFailed=リクエスト [{0}] 
は、利用可能な許可がなかったため、セッションごとのセマフォを取得できませんでした
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 7273841ba9..d8cde8f634 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -43,6 +43,9 @@ toStringUtil.classpath.unknown=Unknown - URLClassLoader 
のインスタンスで
 
 uDecoder.eof=予期せぬ場所で終端に達しました。
 uDecoder.isHexDigit=16進エンコーディングが無効です
+uDecoder.noBackslash=エンコードされたバックスラッシュ文字は許可されていません
 uDecoder.noSlash="/" を符号化して含めることはできません。
 uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
+uDecoder.urlDecode.rejectEncodedReverseSolidus=デコーダが %5c 
シーケンスを拒否するように設定されているため、[{0}] はデコードできませんでした
+uDecoder.urlDecode.rejectEncodedSolidus=デコーダが %2f シーケンスを拒否するように設定されているため、[{0}] 
はデコードできませんでした
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 4129aabc83..66376b8427 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -17,3 +17,5 @@
 # To edit translations see: 
https://tomcat.apache.org/getinvolved.html#Translations
 
 jre22Compat.javaPre22=クラスが見つからないため、コードが Java 22 以前の JVM で実行されていると仮定します
+
+jre24Compat.javaPre24=メソッドが見つからないため、コードはJava 24以前のJVMで実行されていると想定されます
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ddbce78481..7c3c7baf41 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -264,6 +264,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/01: Tag 11.0.5

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 11.0.5
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 1ba1f9061e49ce03c77b57beff3d50e5c2c3ee29
Author: Mark Thomas 
AuthorDate: Fri Feb 28 16:12:04 2025 +

Tag 11.0.5
---
 build.properties.release |  54 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 8257 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 8256 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..f64882405a
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2025-02-28T15:54:41Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.15 compiled on August 25 2024
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:23.0.2+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   UTF-8
+#
+# Release Manager: markt
+release-java-version=23.0.2+7
+release-ant-version=1.10.15
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..ad5bd7af34
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..90e7fe533d
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..5997983200
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=11.0.5
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Pr

(tomcat) tag 11.0.5 created (now 1ba1f9061e)

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 11.0.5
in repository https://gitbox.apache.org/repos/asf/tomcat.git


  at 1ba1f9061e (commit)
This tag includes the following new commits:

 new 1ba1f9061e Tag 11.0.5

The 1 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.



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



[Bug 69602] New: IF-Range Check for Strong-ETags breaks download of large videos

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69602

Bug ID: 69602
   Summary: IF-Range Check for Strong-ETags breaks download of
large videos
   Product: Tomcat 9
   Version: 9.0.99
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: c...@stl.gmbh
  Target Milestone: -

Hi guys,

we recognized a severe problem when using tomcat to deliver web based trainings
housing large videos.

How to reproduce:

Microsoft Edge Browser:

* request a large video
* getting a weak ETag, which is default of the DefaultServelet
* cancelling the streaming
* jump to a further location in the video
* Microsoft Edge request the same video but this time with a range request
** if-range: W/"696184473-170930608"
** range: bytes=89030656-696184472
* Tomcat 9.0.99 produced a status 400 since the new if-range validation rejects
weak ETags
** cf.
https://github.com/apache/tomcat/commit/99f25115e34ffaa1c7f7bf7003077b12931c5d72

So by default Tomcat 9 rejects ETags that it delivered itself.

Current workaround: adapt Default-Servlet-Config


useStrongETags
true


I guess this is a bad constellation:
* either activate strong ETags by default
** probable performance impact
* accept weak ETags in if-ranges
** concurs with if-range syntax
*** https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Range

Thank you for helping with this issue.

-- 
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 69602] IF-Range Check for Strong-ETags breaks download of large videos

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69602

Remy Maucherat  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Remy Maucherat  ---
Ok, I see no indication that weak etags are not allowed there, If-Range is
either an etag (W/"something" or "something") or a date.

As for the cost of enabling string tags, it's not that terrible in most cases.
It will go over the file content only once to hash it, then the result will be
cached.

-- 
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 69602] IF-Range Check for Strong-ETags breaks download of large videos

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69602

--- Comment #2 from Chris  ---
After the code refactoring a String 

W/"696184473-170930608"

is falling through the if expression check

if (headerValue.length() < 2 || headerValue.charAt(0) != '"' ||
headerValue.charAt(headerValue.length() - 1) != '"' ||
headerValue.indexOf('"', 1) != headerValue.length() - 1) {
// Not a single, strong entity tag
  response.sendError(HttpServletResponse.SC_BAD_REQUEST);
  return false;
}

Since the String does not start with:
headerValue.charAt(0)
vs.
W/"696184473-170930608"

-- 
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



(tomcat) branch main updated: Code clean-up - formatting. No functional change

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 57d8ee6f3c Code clean-up - formatting. No functional change
57d8ee6f3c is described below

commit 57d8ee6f3c41de43519301967120feb655d7be3c
Author: Mark Thomas 
AuthorDate: Fri Feb 28 17:12:56 2025 +

Code clean-up - formatting. No functional change
---
 .../optimizations/ELInterpreterTagSetters.java | 78 +++---
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java 
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index e2ea5f1773..327b61d77d 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -31,32 +31,32 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A non-specification compliant {@link ELInterpreter} that optimizes a subset
- * of setters for tag attributes.
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset 
of setters for tag attributes.
  * 
  * The cases optimized by this implementation are:
  * 
  * expressions that are solely a literal boolean
- * expressions that are solely a constant string used (with coercion where
- * necessary) with a setter that accepts:
- * 
- * boolean / Boolean
- * char / Character
- * BigDecimal
- * long / Long
- * int / Integer
- * short / Short
- * byte / Byte
- * double / Double
- * float / Float
- * BigInteger
- * Enum
- * String
- * 
+ * expressions that are solely a constant string used (with coercion where 
necessary) with a setter that
+ * accepts:
+ * 
+ * 
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ * 
+ * 
  * 
- * The specification compliance issue is that it essentially skips the first
- * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
- * codes the use of the 4th {@link ELResolver} in that list.
+ * The specification compliance issue is that it essentially skips the first 
three {@link ELResolver}s listed in section
+ * JSP.2.9 and effectively hard codes the use of the 4th {@link ELResolver} in 
that list.
  *
  * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872";
  */
@@ -70,8 +70,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 private final Pattern PATTERN_NUMERIC = 
Pattern.compile("[$][{]([\"'])([+-]?\\d+(\\.\\d+)?)\\1[}]");
 
 @Override
-public String interpreterCall(JspCompilationContext context,
-boolean isTagFile, String expression,
+public String interpreterCall(JspCompilationContext context, boolean 
isTagFile, String expression,
 Class expectedType, String fnmapvar) {
 
 String result = null;
@@ -91,7 +90,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 result = "Boolean.FALSE";
 }
 }
-// Character
+// Character
 } else if (Character.TYPE == expectedType) {
 Matcher m = PATTERN_STRING_CONSTANT.matcher(expression);
 if (m.matches()) {
@@ -102,7 +101,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 if (m.matches()) {
 return "Character.valueOf(\'" + m.group(2).charAt(0) + "\')";
 }
-// Numeric - BigDecimal
+// Numeric - BigDecimal
 } else if (BigDecimal.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -115,7 +114,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - long/Long
+// Numeric - long/Long
 } else if (Long.TYPE == expectedType || Long.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -133,7 +132,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - int/Integer
+// Numeric - int/Integer
 } else if (Integer.TYPE == expectedType || Integer.class == 
expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -150,7 +149,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
  

(tomcat) branch 11.0.x updated: Code clean-up - formatting. No functional change

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 9ccf92401e Code clean-up - formatting. No functional change
9ccf92401e is described below

commit 9ccf92401e0e0124163453edde83187d0730089e
Author: Mark Thomas 
AuthorDate: Fri Feb 28 17:14:17 2025 +

Code clean-up - formatting. No functional change
---
 .../optimizations/ELInterpreterTagSetters.java | 78 +++---
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java 
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index e2ea5f1773..327b61d77d 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -31,32 +31,32 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A non-specification compliant {@link ELInterpreter} that optimizes a subset
- * of setters for tag attributes.
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset 
of setters for tag attributes.
  * 
  * The cases optimized by this implementation are:
  * 
  * expressions that are solely a literal boolean
- * expressions that are solely a constant string used (with coercion where
- * necessary) with a setter that accepts:
- * 
- * boolean / Boolean
- * char / Character
- * BigDecimal
- * long / Long
- * int / Integer
- * short / Short
- * byte / Byte
- * double / Double
- * float / Float
- * BigInteger
- * Enum
- * String
- * 
+ * expressions that are solely a constant string used (with coercion where 
necessary) with a setter that
+ * accepts:
+ * 
+ * 
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ * 
+ * 
  * 
- * The specification compliance issue is that it essentially skips the first
- * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
- * codes the use of the 4th {@link ELResolver} in that list.
+ * The specification compliance issue is that it essentially skips the first 
three {@link ELResolver}s listed in section
+ * JSP.2.9 and effectively hard codes the use of the 4th {@link ELResolver} in 
that list.
  *
  * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872";
  */
@@ -70,8 +70,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 private final Pattern PATTERN_NUMERIC = 
Pattern.compile("[$][{]([\"'])([+-]?\\d+(\\.\\d+)?)\\1[}]");
 
 @Override
-public String interpreterCall(JspCompilationContext context,
-boolean isTagFile, String expression,
+public String interpreterCall(JspCompilationContext context, boolean 
isTagFile, String expression,
 Class expectedType, String fnmapvar) {
 
 String result = null;
@@ -91,7 +90,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 result = "Boolean.FALSE";
 }
 }
-// Character
+// Character
 } else if (Character.TYPE == expectedType) {
 Matcher m = PATTERN_STRING_CONSTANT.matcher(expression);
 if (m.matches()) {
@@ -102,7 +101,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 if (m.matches()) {
 return "Character.valueOf(\'" + m.group(2).charAt(0) + "\')";
 }
-// Numeric - BigDecimal
+// Numeric - BigDecimal
 } else if (BigDecimal.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -115,7 +114,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - long/Long
+// Numeric - long/Long
 } else if (Long.TYPE == expectedType || Long.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -133,7 +132,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - int/Integer
+// Numeric - int/Integer
 } else if (Integer.TYPE == expectedType || Integer.class == 
expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -150,7 +149,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
  

(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ee8bead7af Code clean-up - formatting. No functional change
ee8bead7af is described below

commit ee8bead7aff41fb7f7831cdaad401197810af689
Author: Mark Thomas 
AuthorDate: Fri Feb 28 17:14:54 2025 +

Code clean-up - formatting. No functional change
---
 .../optimizations/ELInterpreterTagSetters.java | 78 +++---
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java 
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index de6b954d40..36f320e731 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -31,32 +31,32 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A non-specification compliant {@link ELInterpreter} that optimizes a subset
- * of setters for tag attributes.
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset 
of setters for tag attributes.
  * 
  * The cases optimized by this implementation are:
  * 
  * expressions that are solely a literal boolean
- * expressions that are solely a constant string used (with coercion where
- * necessary) with a setter that accepts:
- * 
- * boolean / Boolean
- * char / Character
- * BigDecimal
- * long / Long
- * int / Integer
- * short / Short
- * byte / Byte
- * double / Double
- * float / Float
- * BigInteger
- * Enum
- * String
- * 
+ * expressions that are solely a constant string used (with coercion where 
necessary) with a setter that
+ * accepts:
+ * 
+ * 
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ * 
+ * 
  * 
- * The specification compliance issue is that it essentially skips the first
- * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
- * codes the use of the 4th {@link ELResolver} in that list.
+ * The specification compliance issue is that it essentially skips the first 
three {@link ELResolver}s listed in section
+ * JSP.2.9 and effectively hard codes the use of the 4th {@link ELResolver} in 
that list.
  *
  * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872";
  */
@@ -70,8 +70,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 private final Pattern PATTERN_NUMERIC = 
Pattern.compile("[$][{]([\"'])([+-]?\\d+(\\.\\d+)?)\\1[}]");
 
 @Override
-public String interpreterCall(JspCompilationContext context,
-boolean isTagFile, String expression,
+public String interpreterCall(JspCompilationContext context, boolean 
isTagFile, String expression,
 Class expectedType, String fnmapvar) {
 
 String result = null;
@@ -91,7 +90,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 result = "Boolean.FALSE";
 }
 }
-// Character
+// Character
 } else if (Character.TYPE == expectedType) {
 Matcher m = PATTERN_STRING_CONSTANT.matcher(expression);
 if (m.matches()) {
@@ -102,7 +101,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 if (m.matches()) {
 return "Character.valueOf(\'" + m.group(2).charAt(0) + "\')";
 }
-// Numeric - BigDecimal
+// Numeric - BigDecimal
 } else if (BigDecimal.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -115,7 +114,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - long/Long
+// Numeric - long/Long
 } else if (Long.TYPE == expectedType || Long.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -133,7 +132,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - int/Integer
+// Numeric - int/Integer
 } else if (Integer.TYPE == expectedType || Integer.class == 
expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -150,7 +149,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }

(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new fe81621547 Code clean-up - formatting. No functional change
fe81621547 is described below

commit fe816215478942c3d4207bc7003bf022efbe4b96
Author: Mark Thomas 
AuthorDate: Fri Feb 28 17:14:37 2025 +

Code clean-up - formatting. No functional change
---
 .../optimizations/ELInterpreterTagSetters.java | 78 +++---
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java 
b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
index e2ea5f1773..327b61d77d 100644
--- a/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
+++ b/java/org/apache/jasper/optimizations/ELInterpreterTagSetters.java
@@ -31,32 +31,32 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A non-specification compliant {@link ELInterpreter} that optimizes a subset
- * of setters for tag attributes.
+ * A non-specification compliant {@link ELInterpreter} that optimizes a subset 
of setters for tag attributes.
  * 
  * The cases optimized by this implementation are:
  * 
  * expressions that are solely a literal boolean
- * expressions that are solely a constant string used (with coercion where
- * necessary) with a setter that accepts:
- * 
- * boolean / Boolean
- * char / Character
- * BigDecimal
- * long / Long
- * int / Integer
- * short / Short
- * byte / Byte
- * double / Double
- * float / Float
- * BigInteger
- * Enum
- * String
- * 
+ * expressions that are solely a constant string used (with coercion where 
necessary) with a setter that
+ * accepts:
+ * 
+ * 
+ * boolean / Boolean
+ * char / Character
+ * BigDecimal
+ * long / Long
+ * int / Integer
+ * short / Short
+ * byte / Byte
+ * double / Double
+ * float / Float
+ * BigInteger
+ * Enum
+ * String
+ * 
+ * 
  * 
- * The specification compliance issue is that it essentially skips the first
- * three {@link ELResolver}s listed in section JSP.2.9 and effectively hard
- * codes the use of the 4th {@link ELResolver} in that list.
+ * The specification compliance issue is that it essentially skips the first 
three {@link ELResolver}s listed in section
+ * JSP.2.9 and effectively hard codes the use of the 4th {@link ELResolver} in 
that list.
  *
  * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=64872";
  */
@@ -70,8 +70,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 private final Pattern PATTERN_NUMERIC = 
Pattern.compile("[$][{]([\"'])([+-]?\\d+(\\.\\d+)?)\\1[}]");
 
 @Override
-public String interpreterCall(JspCompilationContext context,
-boolean isTagFile, String expression,
+public String interpreterCall(JspCompilationContext context, boolean 
isTagFile, String expression,
 Class expectedType, String fnmapvar) {
 
 String result = null;
@@ -91,7 +90,7 @@ public class ELInterpreterTagSetters implements ELInterpreter 
{
 result = "Boolean.FALSE";
 }
 }
-// Character
+// Character
 } else if (Character.TYPE == expectedType) {
 Matcher m = PATTERN_STRING_CONSTANT.matcher(expression);
 if (m.matches()) {
@@ -102,7 +101,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 if (m.matches()) {
 return "Character.valueOf(\'" + m.group(2).charAt(0) + "\')";
 }
-// Numeric - BigDecimal
+// Numeric - BigDecimal
 } else if (BigDecimal.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -115,7 +114,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - long/Long
+// Numeric - long/Long
 } else if (Long.TYPE == expectedType || Long.class == expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -133,7 +132,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
 }
-// Numeric - int/Integer
+// Numeric - int/Integer
 } else if (Integer.TYPE == expectedType || Integer.class == 
expectedType) {
 Matcher m = PATTERN_NUMERIC.matcher(expression);
 if (m.matches()) {
@@ -150,7 +149,7 @@ public class ELInterpreterTagSetters implements 
ELInterpreter {
 // Continue and resolve the value at runtime
 }
  

[Bug 69603] New: running configure of tomcat-native breaks on openssl(3.4.1) verification

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69603

Bug ID: 69603
   Summary: running configure of tomcat-native breaks on
openssl(3.4.1) verification
   Product: Tomcat Native
   Version: 2.0.8
  Hardware: Other
OS: Linux
Status: NEW
  Severity: blocker
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: stephen.kra...@seattle.gov
  Target Milestone: ---

Good day,

Trying to run a configure of tomcat-native (v2.0.8) and get the following
error:
checking for OpenSSL library... /usr/local/bin/
using openssl from /usr/local/bin//lib and /usr/local/bin//include
checking OpenSSL library version >= 3.0.0... configure: error: Your version of
OpenSSL is not compatible with this version of tcnative

Current updated version of OpenSSL is version 3.4.1:
[tomcat@server01 tomcat-native-2.0.8-src]$ which openssl
/usr/local/bin/openssl
[tomcat@server01 tomcat-native-2.0.8-src]$ openssl version
OpenSSL 3.4.1 11 Feb 2025 (Library: OpenSSL 3.4.1 11 Feb 2025)

Linux Server version:
NAME="Oracle Linux Server"
VERSION="8.10"
ID="ol"
ID_LIKE="fedora"
VARIANT="Server"
VARIANT_ID="server"
VERSION_ID="8.10"
PLATFORM_ID="platform:el8"
PRETTY_NAME="Oracle Linux Server 8.10"


My goal is to configure tomcat-native and setup tomcat connector to use SSL
with Nio2protocol.  Currently can't seem to get that to work.  I was able to
get tomcat running with a jsse and self signed certificate but I can't use a
self-signed certs outside of sandbox environments. I originally tried to
configure tomcat-native when OpenSSL was version 1.1.1f and in doing the
openssl upgrade I still get the error on configure.

Tomcat 11.0.3
Tomcat-Native 2.0.8
APR 1.7.5
JDK 17.0.13

Any assistance would be greatly appreciated. Happy to gather more info if
needed.

Cheers,
Stephen

-- 
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



svn commit: r75214 - in /dev/tomcat/tomcat-11/v11.0.5: ./ bin/ bin/embed/ src/

2025-02-28 Thread markt
Author: markt
Date: Fri Feb 28 16:50:41 2025
New Revision: 75214

Log:
Upload 11.0.5 for voting

Added:
dev/tomcat/tomcat-11/v11.0.5/
dev/tomcat/tomcat-11/v11.0.5/KEYS
dev/tomcat/tomcat-11/v11.0.5/README.html
dev/tomcat/tomcat-11/v11.0.5/RELEASE-NOTES
dev/tomcat/tomcat-11/v11.0.5/bin/
dev/tomcat/tomcat-11/v11.0.5/bin/README.html
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.zip   (with 
props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.zip.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-deployer.zip.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-fulldocs.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-windows-x64.zip   
(with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-windows-x64.zip.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5-windows-x64.zip.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.exe   (with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.exe.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.exe.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.tar.gz   (with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.zip   (with props)
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.zip.asc
dev/tomcat/tomcat-11/v11.0.5/bin/apache-tomcat-11.0.5.zip.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/embed/
dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.zip   
(with props)
dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.zip.asc
dev/tomcat/tomcat-11/v11.0.5/bin/embed/apache-tomcat-11.0.5-embed.zip.sha512
dev/tomcat/tomcat-11/v11.0.5/src/
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.tar.gz   (with 
props)
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.zip   (with props)
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.zip.asc
dev/tomcat/tomcat-11/v11.0.5/src/apache-tomcat-11.0.5-src.zip.sha512

Added: dev/tomcat/tomcat-11/v11.0.5/KEYS
==
--- dev/tomcat/tomcat-11/v11.0.5/KEYS (added)
+++ dev/tomcat/tomcat-11/v11.0.5/KEYS Fri Feb 28 16:50:41 2025
@@ -0,0 +1,573 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e
+aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QARAQAB
+tCJNYXJrIEUgRCBUaG9tYXMgPG1hcmt0QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJK
+tA7pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEBDAHFovYFnn2YgQAKN6
+FLG/I1Ij3PUlC/XNlhasQxPeE3w2OvttweOQPYkblJ9nHtGH5pNqG2/qoGShlpI0
+4jJy9GxWKOo7NV4v7M0mbVlCXVgjdlvMFWdL7lnocggwJA

[Bug 69603] running configure of tomcat-native breaks on openssl(3.4.1) verification

2025-02-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69603

Stephen Krause  changed:

   What|Removed |Added

   Severity|blocker |normal
   Priority|P2  |P4

--- Comment #1 from Stephen Krause  ---
OK - I seemed to have found a way to get the configure to work:

 ./configure --with-ssl=/usr/local/bin --disable-openssl-version-check
--with-apr=$APR_HOME --with-java-home=$JAVA_HOME --prefix=$CATALINA_HOME


I will downgrade the bug to something else 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



Re: [VOTE] Release Apache Tomcat 11.0.5

2025-02-28 Thread Dimitris Soumis
On Fri, Feb 28, 2025 at 7:13 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 11.0.5 release is now available for voting.
>
> The notable changes compared to 11.0.4 include:
>
> - Improve the checks for exposure to and protection against
>CVE-2024-56337 so that reflection is not used unless required. The
>checks for whether the file system is case sensitive or not have been
>removed.
>
> - Use Transfer-Encoding for compression rather than Content-Encoding if
>the client submits a TE header containing gzip
>
> - Add makensis as an option for building the Installer for Windows on
>non-Windows platforms.
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory. Applications using deprecated APIs may require
> further changes.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.5/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1534
>
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.5
> 1ba1f9061e49ce03c77b57beff3d50e5c2c3ee29
>
> The proposed 11.0.5 release is:
> [ ] -1 Broken - do not release
> [ X] +1 Stable - go ahead and release as 11.0.5
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
+1 Build is reproducible and all tests pass on Fedora 41 with Java 21,
tcnative-2.0.8, apr-1.7.4, openssl-3.2.4.


(tomcat) branch 11.0.x updated: Improvements to French translations. (remm)

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new dff26c29be Improvements to French translations. (remm)
dff26c29be is described below

commit dff26c29be376fb1f7c4460e12b0cdd0c31a607a
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:24:41 2025 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
 java/org/apache/catalina/valves/LocalStrings_fr.properties   | 6 ++
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties 
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 202ea351b5..c401a32aec 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -57,6 +57,8 @@ defaultServlet.skipfail=La lecture a échouée parce que seuls 
[{0}] octets éta
 defaultServlet.unknownBomConfig=La valeur [{0}] inconnue a été donnée pour le 
paramètre d’initialisation useBomIfPresent
 defaultServlet.xslError=Erreur de transformation XSL
 
+webdavservlet.dataSourceStore.error=Erreur [{0}] lors du traitement des 
prorpiétés pour le chemin [{1}]
+webdavservlet.dataSourceStore.noDataSource=La DataSource [{0}] n''a pas été 
trouvé dans l''environnement de la webapp
 webdavservlet.externalEntityIgnored=La requête a inclus une référence à une 
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
 webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour 
[{0}]
 webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 2f2044af02..c28c762fbf 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -141,6 +141,12 @@ jdbcAccessLogValve.exception=Exception en insérant 
l'entrée de l'accès
 loadBalancerDrainingValve.draining=Le balanceur de charge est dans l'étât 
DISABLED, le changement de répartition de la charge est sauté
 loadBalancerDrainingValve.skip=Le client a envoyé un cookie [{0}] valide, le 
le changement de répartition de la charge est sauté
 
+parameterLimitValve.closeError=Erreur lors de la fermeture de la configuration
+parameterLimitValve.invalidLine=Chaque ligne doit contenir au moins un 
caractère ''='', la ligne invalide est [{0}]
+parameterLimitValve.noConfiguration=La ressource de configuration [{0}] n''a 
pas été trouvée
+parameterLimitValve.readConfiguration=Lecture de la configuration à partir de 
[/WEB-INF/{0}]
+parameterLimitValve.readError=Erreur lors de la lecture de la configuration
+
 patternTokenizer.unexpectedParenthesis=')' inattendu dans le modèle
 
 persistentValve.acquireFailed=La requête pour [{0}] n''a pas obtenu le 
sémaphore associé à la session car aucun permis n''était disponible
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 328bdb3186..0de9d94e2d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -43,6 +43,9 @@ toStringUtil.classpath.unknown=Inconnu - n'est pas une 
instance de URLClassLoade
 
 uDecoder.eof=Fin de fichier (EOF)
 uDecoder.isHexDigit=L'encodage hexadécimal est invalide
+uDecoder.noBackslash=Le caractère antislash encodé n'est pas autorisé
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
 uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu 
de caractères [{1}]
 uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le 
caractère % doit être suivi de deux chiffres héxadécimaux
+uDecoder.urlDecode.rejectEncodedReverseSolidus=Echec du décodage de [{0}] car 
il contenait une séquence %5c que le décodeur est configuré pour rejeter
+uDecoder.urlDecode.rejectEncodedSolidus=Echec du décodage de [{0}] car il 
contenait une séquence %2f que le décodeur est configuré pour rejeter
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 872f72a898..b21c818cd1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
   
 Update JSign to 7.1. (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) branch 11.0.x updated: Improvements to Japanese translations by tak7iji.

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 3032dcec32 Improvements to Japanese translations by tak7iji.
3032dcec32 is described below

commit 3032dcec3237831a0cba9890dce23560f9d0a5df
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:25:17 2025 +

Improvements to Japanese translations by tak7iji.
---
 java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
 java/org/apache/catalina/valves/LocalStrings_ja.properties   | 6 ++
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties 
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index d390e74d8c..8f70c9b1ec 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -57,6 +57,8 @@ defaultServlet.skipfail=[{1}]バイトをスキップして要求された範囲
 defaultServlet.unknownBomConfig=useBomIfPresentの初期化パラメーターに提供された認識されない値 [{0}]
 defaultServlet.xslError=XSL変換エラー
 
+webdavservlet.dataSourceStore.error=パス [{1}] の無効なプロパティで [{0}] を処理中にエラーが発生しました
+webdavservlet.dataSourceStore.noDataSource=データソース [{0}] が webapp 環境に見つかりませんでした
 webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID 
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
 webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
 webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties 
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 49f12feac3..9ed4ac5056 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -141,6 +141,12 @@ jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例
 loadBalancerDrainingValve.draining=ロードバランサは DISABLED 状態にあり、このノードを使用していません
 loadBalancerDrainingValve.skip=クライアントは有効な [{0}] Cookie 
を提示しているため、リバランスはスキップされています
 
+parameterLimitValve.closeError=設定をクローズする際のエラー
+parameterLimitValve.invalidLine=各行には少なくとも 1 つの ''='' が含まれている必要があります。無効な行 [{0}]
+parameterLimitValve.noConfiguration=構成リソースが見つかりません [{0}]
+parameterLimitValve.readConfiguration=[/WEB-INF/{0}] から設定を読み取ります
+parameterLimitValve.readError=設定の読み込みエラー
+
 patternTokenizer.unexpectedParenthesis=パターンに予期しない ')' があります
 
 persistentValve.acquireFailed=リクエスト [{0}] 
は、利用可能な許可がなかったため、セッションごとのセマフォを取得できませんでした
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 7273841ba9..d8cde8f634 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -43,6 +43,9 @@ toStringUtil.classpath.unknown=Unknown - URLClassLoader 
のインスタンスで
 
 uDecoder.eof=予期せぬ場所で終端に達しました。
 uDecoder.isHexDigit=16進エンコーディングが無効です
+uDecoder.noBackslash=エンコードされたバックスラッシュ文字は許可されていません
 uDecoder.noSlash="/" を符号化して含めることはできません。
 uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
+uDecoder.urlDecode.rejectEncodedReverseSolidus=デコーダが %5c 
シーケンスを拒否するように設定されているため、[{0}] はデコードできませんでした
+uDecoder.urlDecode.rejectEncodedSolidus=デコーダが %2f シーケンスを拒否するように設定されているため、[{0}] 
はデコードできませんでした
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b21c818cd1..48e946a063 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,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



Buildbot failure in on tomcat-9.0.x

2025-02-28 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1291
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] f68b93860429034f19213b694f172304100cadb7


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



(tomcat) branch main updated: Improvements to French translations. (remm)

2025-02-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new f72a18ddd4 Improvements to French translations. (remm)
f72a18ddd4 is described below

commit f72a18ddd496efe34f25746b340eac8052ff05a5
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:12:08 2025 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/servlets/LocalStrings_fr.properties  | 2 ++
 java/org/apache/catalina/valves/LocalStrings_fr.properties| 6 ++
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties| 3 +++
 java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml| 3 +++
 5 files changed, 16 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties 
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 202ea351b5..c401a32aec 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -57,6 +57,8 @@ defaultServlet.skipfail=La lecture a échouée parce que seuls 
[{0}] octets éta
 defaultServlet.unknownBomConfig=La valeur [{0}] inconnue a été donnée pour le 
paramètre d’initialisation useBomIfPresent
 defaultServlet.xslError=Erreur de transformation XSL
 
+webdavservlet.dataSourceStore.error=Erreur [{0}] lors du traitement des 
prorpiétés pour le chemin [{1}]
+webdavservlet.dataSourceStore.noDataSource=La DataSource [{0}] n''a pas été 
trouvé dans l''environnement de la webapp
 webdavservlet.externalEntityIgnored=La requête a inclus une référence à une 
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
 webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour 
[{0}]
 webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index e4f7481167..1295c165e0 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -138,6 +138,12 @@ http.511.reason=L’authentification du réseau est nécessaire
 loadBalancerDrainingValve.draining=Le balanceur de charge est dans l'étât 
DISABLED, le changement de répartition de la charge est sauté
 loadBalancerDrainingValve.skip=Le client a envoyé un cookie [{0}] valide, le 
le changement de répartition de la charge est sauté
 
+parameterLimitValve.closeError=Erreur lors de la fermeture de la configuration
+parameterLimitValve.invalidLine=Chaque ligne doit contenir au moins un 
caractère ''='', la ligne invalide est [{0}]
+parameterLimitValve.noConfiguration=La ressource de configuration [{0}] n''a 
pas été trouvée
+parameterLimitValve.readConfiguration=Lecture de la configuration à partir de 
[/WEB-INF/{0}]
+parameterLimitValve.readError=Erreur lors de la lecture de la configuration
+
 patternTokenizer.unexpectedParenthesis=')' inattendu dans le modèle
 
 persistentValve.acquireFailed=La requête pour [{0}] n''a pas obtenu le 
sémaphore associé à la session car aucun permis n''était disponible
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 328bdb3186..0de9d94e2d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -43,6 +43,9 @@ toStringUtil.classpath.unknown=Inconnu - n'est pas une 
instance de URLClassLoade
 
 uDecoder.eof=Fin de fichier (EOF)
 uDecoder.isHexDigit=L'encodage hexadécimal est invalide
+uDecoder.noBackslash=Le caractère antislash encodé n'est pas autorisé
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
 uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu 
de caractères [{1}]
 uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le 
caractère % doit être suivi de deux chiffres héxadécimaux
+uDecoder.urlDecode.rejectEncodedReverseSolidus=Echec du décodage de [{0}] car 
il contenait une séquence %5c que le décodeur est configuré pour rejeter
+uDecoder.urlDecode.rejectEncodedSolidus=Echec du décodage de [{0}] car il 
contenait une séquence %2f que le décodeur est configuré pour rejeter
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 6051bcc9b1..4c54681a66 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -17,3 +17,5 @@
 # To edit translations see: 
https://tomcat.apache.org/getinvolved.html#Translations
 
 jre22Compat.javaPre22=Le code est considéré être exécuté sur une JVM 
antérieure à Java 22 car 

(tomcat) branch 10.1.x updated: Improvements to Japanese translations by tak7iji.

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new b25956d25c Improvements to Japanese translations by tak7iji.
b25956d25c is described below

commit b25956d25cf6cac03637b28bf5a21435b2378634
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:29:37 2025 +

Improvements to Japanese translations by tak7iji.
---
 java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties 
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index c56a57b4fd..46abdc42bc 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -55,6 +55,8 @@ defaultServlet.skipfail=[{1}]バイトをスキップして要求された範囲
 defaultServlet.unknownBomConfig=useBomIfPresentの初期化パラメーターに提供された認識されない値 [{0}]
 defaultServlet.xslError=XSL変換エラー
 
+webdavservlet.dataSourceStore.error=パス [{1}] の無効なプロパティで [{0}] を処理中にエラーが発生しました
+webdavservlet.dataSourceStore.noDataSource=データソース [{0}] が webapp 環境に見つかりませんでした
 webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID 
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
 webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
 webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 59d4ed8a24..2da4684dca 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -45,6 +45,9 @@ toStringUtil.classpath.unknown=Unknown - URLClassLoader 
のインスタンスで
 
 uDecoder.eof=予期せぬ場所で終端に達しました。
 uDecoder.isHexDigit=16進エンコーディングが無効です
+uDecoder.noBackslash=エンコードされたバックスラッシュ文字は許可されていません
 uDecoder.noSlash="/" を符号化して含めることはできません。
 uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
+uDecoder.urlDecode.rejectEncodedReverseSolidus=デコーダが %5c 
シーケンスを拒否するように設定されているため、[{0}] はデコードできませんでした
+uDecoder.urlDecode.rejectEncodedSolidus=デコーダが %2f シーケンスを拒否するように設定されているため、[{0}] 
はデコードできませんでした
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89bc6c5747..9a11a6e627 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,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 9.0.x updated: Improvements to French translations. (remm)

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 234847dd47 Improvements to French translations. (remm)
234847dd47 is described below

commit 234847dd47a717e6fd16d74463e1aae6d7597b03
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:31:48 2025 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties 
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index abf744bff6..3e02bfad2f 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -55,6 +55,8 @@ defaultServlet.skipfail=La lecture a échouée parce que seuls 
[{0}] octets éta
 defaultServlet.unknownBomConfig=La valeur [{0}] inconnue a été donnée pour le 
paramètre d’initialisation useBomIfPresent
 defaultServlet.xslError=Erreur de transformation XSL
 
+webdavservlet.dataSourceStore.error=Erreur [{0}] lors du traitement des 
prorpiétés pour le chemin [{1}]
+webdavservlet.dataSourceStore.noDataSource=La DataSource [{0}] n''a pas été 
trouvé dans l''environnement de la webapp
 webdavservlet.externalEntityIgnored=La requête a inclus une référence à une 
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
 webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour 
[{0}]
 webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 79d2fdfa8d..2602772f71 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -45,6 +45,9 @@ toStringUtil.classpath.unknown=Inconnu - n'est pas une 
instance de URLClassLoade
 
 uDecoder.eof=Fin de fichier (EOF)
 uDecoder.isHexDigit=L'encodage hexadécimal est invalide
+uDecoder.noBackslash=Le caractère antislash encodé n'est pas autorisé
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
 uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu 
de caractères [{1}]
 uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le 
caractère % doit être suivi de deux chiffres héxadécimaux
+uDecoder.urlDecode.rejectEncodedReverseSolidus=Echec du décodage de [{0}] car 
il contenait une séquence %5c que le décodeur est configuré pour rejeter
+uDecoder.urlDecode.rejectEncodedSolidus=Echec du décodage de [{0}] car il 
contenait une séquence %2f que le décodeur est configuré pour rejeter
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5782bb666d..84411d9bba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -181,6 +181,9 @@
   
 Update JSign to 7.1. (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) branch 10.1.x updated: Improvements to French translations. (remm)

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 5b6f7f9e1f Improvements to French translations. (remm)
5b6f7f9e1f is described below

commit 5b6f7f9e1f5c453ff5eab19c5f23e0009723083a
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:29:21 2025 +

Improvements to French translations. (remm)
---
 java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties 
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index abf744bff6..3e02bfad2f 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -55,6 +55,8 @@ defaultServlet.skipfail=La lecture a échouée parce que seuls 
[{0}] octets éta
 defaultServlet.unknownBomConfig=La valeur [{0}] inconnue a été donnée pour le 
paramètre d’initialisation useBomIfPresent
 defaultServlet.xslError=Erreur de transformation XSL
 
+webdavservlet.dataSourceStore.error=Erreur [{0}] lors du traitement des 
prorpiétés pour le chemin [{1}]
+webdavservlet.dataSourceStore.noDataSource=La DataSource [{0}] n''a pas été 
trouvé dans l''environnement de la webapp
 webdavservlet.externalEntityIgnored=La requête a inclus une référence à une 
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
 webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour 
[{0}]
 webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 79d2fdfa8d..2602772f71 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -45,6 +45,9 @@ toStringUtil.classpath.unknown=Inconnu - n'est pas une 
instance de URLClassLoade
 
 uDecoder.eof=Fin de fichier (EOF)
 uDecoder.isHexDigit=L'encodage hexadécimal est invalide
+uDecoder.noBackslash=Le caractère antislash encodé n'est pas autorisé
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
 uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu 
de caractères [{1}]
 uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le 
caractère % doit être suivi de deux chiffres héxadécimaux
+uDecoder.urlDecode.rejectEncodedReverseSolidus=Echec du décodage de [{0}] car 
il contenait une séquence %5c que le décodeur est configuré pour rejeter
+uDecoder.urlDecode.rejectEncodedSolidus=Echec du décodage de [{0}] car il 
contenait une séquence %2f que le décodeur est configuré pour rejeter
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 71dda74844..89bc6c5747 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
   
 Update JSign to 7.1. (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) branch 9.0.x updated: Improvements to Japanese translations by tak7iji.

2025-02-28 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f68b938604 Improvements to Japanese translations by tak7iji.
f68b938604 is described below

commit f68b93860429034f19213b694f172304100cadb7
Author: Mark Thomas 
AuthorDate: Fri Feb 28 10:32:21 2025 +

Improvements to Japanese translations by tak7iji.
---
 java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties   | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties 
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index c56a57b4fd..46abdc42bc 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -55,6 +55,8 @@ defaultServlet.skipfail=[{1}]バイトをスキップして要求された範囲
 defaultServlet.unknownBomConfig=useBomIfPresentの初期化パラメーターに提供された認識されない値 [{0}]
 defaultServlet.xslError=XSL変換エラー
 
+webdavservlet.dataSourceStore.error=パス [{1}] の無効なプロパティで [{0}] を処理中にエラーが発生しました
+webdavservlet.dataSourceStore.noDataSource=データソース [{0}] が webapp 環境に見つかりませんでした
 webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID 
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
 webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
 webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 59d4ed8a24..2da4684dca 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -45,6 +45,9 @@ toStringUtil.classpath.unknown=Unknown - URLClassLoader 
のインスタンスで
 
 uDecoder.eof=予期せぬ場所で終端に達しました。
 uDecoder.isHexDigit=16進エンコーディングが無効です
+uDecoder.noBackslash=エンコードされたバックスラッシュ文字は許可されていません
 uDecoder.noSlash="/" を符号化して含めることはできません。
 uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
+uDecoder.urlDecode.rejectEncodedReverseSolidus=デコーダが %5c 
シーケンスを拒否するように設定されているため、[{0}] はデコードできませんでした
+uDecoder.urlDecode.rejectEncodedSolidus=デコーダが %2f シーケンスを拒否するように設定されているため、[{0}] 
はデコードできませんでした
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 84411d9bba..079c360808 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -184,6 +184,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



[VOTE] Release Apache Tomcat 10.1.37

2025-02-28 Thread Christopher Schultz

The proposed Apache Tomcat 10.1.37 release is now available for
voting.

All committers and PMC members are kindly requested to provide a vote if 
possible. ANY TOMCAT USER MAY VOTE, though only PMC members votes are 
binding. We welcome non-committer votes or comments on release builds.


The notable changes compared to 10.1.36 are:

- Improve the checks for exposure to and protection against
  CVE-2024-56337 so that reflection is not used unless required. The
  checks for whether the file system is case sensitive or not have been
  removed.

- Use Transfer-Encoding for compression rather than Content-Encoding if
  the client submits a TE header containing gzip

- Add makensis as an option for building the Installer for Windows on
  non-Windows platforms.

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.37/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1535

The tag is:
https://github.com/apache/tomcat/tree/10.1.37
https://github.com/apache/tomcat/commit/e4338ee7a3e0f22d85f7cb2e04dacee752eaa619

Please reply with a +1 for release or +0/-0/-1 with an explanation.

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



svn commit: r75219 - in /dev/tomcat/tomcat-10/v10.1.37: ./ bin/ bin/embed/ src/

2025-02-28 Thread schultz
Author: schultz
Date: Sat Mar  1 06:04:17 2025
New Revision: 75219

Log:
Upload 10.1.37 for voting.

Added:
dev/tomcat/tomcat-10/v10.1.37/
dev/tomcat/tomcat-10/v10.1.37/KEYS
dev/tomcat/tomcat-10/v10.1.37/README.html
dev/tomcat/tomcat-10/v10.1.37/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.37/bin/
dev/tomcat/tomcat-10/v10.1.37/bin/README.html
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.zip.asc
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.exe   (with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.exe.asc
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.exe.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.zip   (with props)
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.zip.asc
dev/tomcat/tomcat-10/v10.1.37/bin/apache-tomcat-10.1.37.zip.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/embed/
dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.zip.asc

dev/tomcat/tomcat-10/v10.1.37/bin/embed/apache-tomcat-10.1.37-embed.zip.sha512
dev/tomcat/tomcat-10/v10.1.37/src/
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.zip.asc
dev/tomcat/tomcat-10/v10.1.37/src/apache-tomcat-10.1.37-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.1.37/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.37/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.37/KEYS Sat Mar  1 06:04:17 2025
@@ -0,0 +1,562 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0Xj

(tomcat) tag 10.1.37 created (now e4338ee7a3)

2025-02-28 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 10.1.37
in repository https://gitbox.apache.org/repos/asf/tomcat.git


  at e4338ee7a3 (commit)
This tag includes the following new commits:

 new e4338ee7a3 Tag 10.1.37

The 1 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.



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



(tomcat) 01/01: Tag 10.1.37

2025-02-28 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 10.1.37
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e4338ee7a3e0f22d85f7cb2e04dacee752eaa619
Author: Christopher Schultz 
AuthorDate: Sat Mar 1 01:02:13 2025 -0500

Tag 10.1.37
---
 build.properties.release | 54 
 res/maven/mvn.properties.release | 27 
 webapps/docs/changelog.xml   |  2 +-
 3 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..cea915a50c
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2025-03-01T05:59:06Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/local/bin/gpg
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.15 compiled on August 25 2024
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:23.0.2+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  aarch64 Mac OS X 15.1.1
+# File encoding:   UTF-8
+#
+# Release Manager: schultz
+release-java-version=23.0.2+7
+release-ant-version=1.10.15
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..96907c2c99
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# 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.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.1.37
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/local/bin/gpg
+
+# Set the user name to use to upload the artefacts to Nexus.
+asf.ldap.username=schultz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d21a6e3917..e9d39855dd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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