(tomcat) branch 9.0.x updated: Fix BZ 68546 - minor optimization
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 87b9dea659 Fix BZ 68546 - minor optimization
87b9dea659 is described below
commit 87b9dea659f60c640c1f680cfa1c2325f836f985
Author: Mark Thomas
AuthorDate: Mon Jun 3 15:16:24 2024 +0100
Fix BZ 68546 - minor optimization
Based on a patch by Dan Armstrong
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
webapps/docs/changelog.xml | 9 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 9c3756d3c1..6264782134 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -639,7 +639,8 @@ class Generator {
// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
// contains 3 packages and is always added to the imports.
out.printin("_jspx_imports_packages = new java.util.LinkedHashSet<>(");
-out.print(Integer.toString(packages.size()));
+// Allow for the default load factor of 0.75
+out.print(Integer.toString((int) Math.ceil(packages.size() / 0.75)));
out.print(");");
out.println();
for (String packageName : packages) {
@@ -653,7 +654,7 @@ class Generator {
out.println();
} else {
out.printin("_jspx_imports_classes = new
java.util.LinkedHashSet<>(");
-out.print(Integer.toString(classes.size()));
+out.print(Integer.toString((int) Math.ceil(classes.size() /
0.75)));
out.print(");");
out.println();
for (String className : classes) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 210ae56616..0e06c11a6c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,15 @@
+
+
+
+68546: Small additional optimisation for initial loading of
+Servlet code generated for JSPs. Based on a suggestion by Dan
Armstrong.
+(markt)
+
+
+
-
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 BZ 68546 - minor optimization
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 3a509e6687 Fix BZ 68546 - minor optimization
3a509e6687 is described below
commit 3a509e66877cfe3507a83d7be9a5b2fa5828b43f
Author: Mark Thomas
AuthorDate: Mon Jun 3 15:16:24 2024 +0100
Fix BZ 68546 - minor optimization
Based on a patch by Dan Armstrong
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
webapps/docs/changelog.xml | 9 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index b305431ce7..addaff3f6b 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -625,7 +625,8 @@ class Generator {
// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
// contains 3 packages and is always added to the imports.
out.printin("_jspx_imports_packages = new java.util.LinkedHashSet<>(");
-out.print(Integer.toString(packages.size()));
+// Allow for the default load factor of 0.75
+out.print(Integer.toString((int) Math.ceil(packages.size() / 0.75)));
out.print(");");
out.println();
for (String packageName : packages) {
@@ -639,7 +640,7 @@ class Generator {
out.println();
} else {
out.printin("_jspx_imports_classes = new
java.util.LinkedHashSet<>(");
-out.print(Integer.toString(classes.size()));
+out.print(Integer.toString((int) Math.ceil(classes.size() /
0.75)));
out.print(");");
out.println();
for (String className : classes) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bceee651b2..390870161c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,15 @@
+
+
+
+68546: Small additional optimisation for initial loading of
+Servlet code generated for JSPs. Based on a suggestion by Dan
Armstrong.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix BZ 68546 - minor optimization
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 a258c11c7e Fix BZ 68546 - minor optimization
a258c11c7e is described below
commit a258c11c7e4bfb9236a6278eec96716e941ed349
Author: Mark Thomas
AuthorDate: Mon Jun 3 15:16:24 2024 +0100
Fix BZ 68546 - minor optimization
Based on a patch by Dan Armstrong
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
webapps/docs/changelog.xml | 9 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 84f1c3e9b9..efbf17588a 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -621,7 +621,8 @@ class Generator {
// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
// contains 3 packages and is always added to the imports.
out.printin("_jspx_imports_packages = new java.util.LinkedHashSet<>(");
-out.print(Integer.toString(packages.size()));
+// Allow for the default load factor of 0.75
+out.print(Integer.toString((int) Math.ceil(packages.size() / 0.75)));
out.print(");");
out.println();
for (String packageName : packages) {
@@ -635,7 +636,7 @@ class Generator {
out.println();
} else {
out.printin("_jspx_imports_classes = new
java.util.LinkedHashSet<>(");
-out.print(Integer.toString(classes.size()));
+out.print(Integer.toString((int) Math.ceil(classes.size() /
0.75)));
out.print(");");
out.println();
for (String className : classes) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b8293139f2..cd704f988c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,15 @@
+
+
+
+68546: Small additional optimisation for initial loading of
+Servlet code generated for JSPs. Based on a suggestion by Dan
Armstrong.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Updates to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3fcece07f6e5f275caa32b8adec950eec47f252b
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:23:47 2024 +0100
Updates to Japanese translations
---
java/org/apache/coyote/http11/LocalStrings_ja.properties | 4
java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 1b29ac7586..890f868c08 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=JMXにアップグレードプ
http11processor.fallToDebug=\n\
\ 注: 以降のHTTPリクエスト構文解析エラーの発生はDEBUGレベルでログに出力されます。
http11processor.header.parse=HTTP リクエストヘッダーを解析中のエラー
+http11processor.request.alreadyChunked=リクエストの準備中にエラーが発生しました。Transfer-Encoding
には [{0}] より前に chunked があります
http11processor.request.finish=リクエスト終了処理エラー
http11processor.request.inconsistentHosts=リクエスト行に指定されたホストが Host ヘッダーの値と矛盾しています。
http11processor.request.invalidScheme=HTTP リクエストに無効なスキーマを指定した完全 URI が含まれています
@@ -34,6 +35,9 @@ http11processor.request.noHostHeader=HTTP/1.1 リクエストで host ヘッダ
http11processor.request.nonNumericContentLength=リクエストの content-length
ヘッダに数値でない値が含まれています
http11processor.request.prepare=リクエスト準備中のエラー
http11processor.request.process=リクエスト処理中のエラー
+http11processor.request.unsupportedEncoding=リクエストの準備中にエラーが発生しました。サポートされていない
Transfer-Encodng\n\
+\ [{0}]
+http11processor.request.unsupportedVersion=リクエストの準備中にエラーが発生しました。サポートされていない
HTTP バージョン [{0}]
http11processor.response.finish=レスポンス終了処理のエラー
http11processor.response.invalidHeader=値 [{1}] を持つHTTPレスポンスヘッダ [{0}]
は、無効であるためレスポンスから削除されました
http11processor.sendfile.error=sendfileを使ってデータを送信中にエラーが発生しました。これは開始点または終了点の無効なリクエスト属性によって引き起こされる可能性があります。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 7a383a9e35..a5bab91999 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -124,6 +124,7 @@ streamProcessor.service.error=リクエスト処理中のエラー
streamStateMachine.debug.change=コネクション [{0}]、ストリーム [{1}]、状態を [{2}] から [{3}]
へ変更しました。
streamStateMachine.invalidFrame=コネクション [{0}]、ストリーム [{1}]、状態 [{2}]、フレーム種類 [{3}]
+streamStateMachine.invalidReset=コネクション [{0}]、ストリーム [{1}]、ストリームは IDLE
状態のときにリセットできません
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
index a95ae9dc20..b0dab840b3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
@@ -45,6 +45,7 @@ http.tooManyColons=IPv6 アドレスでは文字 : を 2 つ以上連続する
http.tooManyDoubleColons=IPv6アドレスは単一の '::'シーケンスのみを含むことができます。
http.tooManyHextets=IPv6 アドレスは [{0}] ヘクステットで構成されていますが、正常な IPv6 アドレスなら 8
ヘクステット以上になりません。
+httpHeaderParser.invalidCrlfNoCR=行末シーケンスが無効です (LF の前に CR がありません)
httpHeaderParser.invalidHeader=HTTP ヘッダーの [{0}] 行目は RFC 9112
に準拠していません。リクエストは拒否されました。
sf.bareitem.invalidCharacter=ベアアイテムの開始を解析中に無効な文字 [{0}] が見つかりました
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 7b155e09b4..9e6a5e10fc 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -158,6 +158,8 @@ socket.apr.write.error=ラッパー [{2}] 経由で APR/native ソケット [{1}
socket.closed=このコネクションに関連付けられたソケットは閉じられました。
socket.sslreneg=SSLコネクションの再ネゴシエーション時の例外
+socketProperties.negativeUnlockTimeout=unlockTimeout に設定された負の値は無視されました
+
socketWrapper.readTimeout=読み込みタイムアウト
socketWrapper.writeTimeout=書き込みタイムアウト
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
index c73442450f..39513bbb90 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=ラッチが制限 [{0}] を超えました
(tomcat) branch 9.0.x updated (31c472b8c0 -> 3fcece07f6)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 31c472b8c0 Simplify new a851a6dc63 Updates to French translations new 3fcece07f6 Updates to Japanese translations The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++ java/org/apache/coyote/http11/LocalStrings_ja.properties | 4 java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 + java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++ webapps/docs/changelog.xml | 6 ++ 10 files changed, 24 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Updates to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a851a6dc6326acde56444708413e87025d014fe0
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:23:17 2024 +0100
Updates to French translations
---
java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
5 files changed, 11 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 1c419a6139..4f26a52071 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=Impossible
d'enregistrer le pr
http11processor.fallToDebug=\n\
\ Note : les occurrences suivantes d'erreurs d'analyse de requête HTTP seront
enregistrées au niveau DEBUG.
http11processor.header.parse=Erreur lors de l'analyse d'un en-tête de requête
HTTP
+http11processor.request.alreadyChunked=Erreur lors de la préparation de la
requête, l''encodage de transfert liste chunked avant [{0}]
http11processor.request.finish=Erreur en terminant la requête
http11processor.request.inconsistentHosts=L'hôte spécifié dans la ligne de
requête ne correspond pas à celui de l'en-tête hôte
http11processor.request.invalidScheme=La requête HTTP contenait une URi
absolue avec un schéma invalide
@@ -34,6 +35,8 @@ http11processor.request.noHostHeader=La requ6ete HTTP/1.1 ne
contient pas d'en-t
http11processor.request.nonNumericContentLength=La requête contenait un
en-tête content-length avec une valeur non numérique
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
+http11processor.request.unsupportedEncoding=Erreur lors de la préparation de
la requête, l''encodage de transfert [{0}] n''est pas supporté
+http11processor.request.unsupportedVersion=Erreur lors de la préparation de la
requête, la version HTTP [{0}] n''est pas supportée
http11processor.response.finish=Erreur en finissant la réponse
http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
index a4e90bd377..f85db16ee7 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
@@ -45,6 +45,7 @@ http.tooManyColons=Une adresse IPv6 ne peut pas contenir plus
de deux caractère
http.tooManyDoubleColons=Une adresse IPv6 ne peut contenir qu'une seule
séquence "::"
http.tooManyHextets=L''adresse IPv6 contient [{0}] groupes de 4 octets mais
une adresse IPv6 valide ne doit pas en avoir plus de 8
+httpHeaderParser.invalidCrlfNoCR=Séquence de fin de ligne invalide (pas de CR
avant LF)
httpHeaderParser.invalidHeader=La ligne d''en-tête HTTP [{0}] ne respecte pas
la RFC 9112. La requête a été rejetée.
sf.bareitem.invalidCharacter=Le caractère [{0}] invalide a été rencontré en
début d''un objet
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index b88a44ac1e..d41cc7dd97 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -158,6 +158,8 @@ socket.apr.write.error=Erreur inattendue [{0}] lors de
l''écriture de données
socket.closed=Le socket associé à cette connection a été fermé
socket.sslreneg=Exception lors de la renégociation de la connection SSL
+socketProperties.negativeUnlockTimeout=La valeur négative pour unlockTimeout a
été ignorée
+
socketWrapper.readTimeout=Timeout en lecture
socketWrapper.writeTimeout=Timeout en écriture
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index ff5b2b03b8..32b21e2f60 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=La limite [{0}] du loquet (latch) a ét
(tomcat) branch 10.1.x updated (5b59a769d2 -> e32988eb22)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 5b59a769d2 Simplify new ae04d4e10c Updates to French translations new e32988eb22 Updates to Japanese translations The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++ java/org/apache/coyote/http11/LocalStrings_ja.properties | 4 java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 + java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++ webapps/docs/changelog.xml | 6 ++ 10 files changed, 24 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Updates to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e32988eb2200769e76cbbd28dbeac8e0db7a5513
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:22:02 2024 +0100
Updates to Japanese translations
---
java/org/apache/coyote/http11/LocalStrings_ja.properties | 4
java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 1b29ac7586..890f868c08 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=JMXにアップグレードプ
http11processor.fallToDebug=\n\
\ 注: 以降のHTTPリクエスト構文解析エラーの発生はDEBUGレベルでログに出力されます。
http11processor.header.parse=HTTP リクエストヘッダーを解析中のエラー
+http11processor.request.alreadyChunked=リクエストの準備中にエラーが発生しました。Transfer-Encoding
には [{0}] より前に chunked があります
http11processor.request.finish=リクエスト終了処理エラー
http11processor.request.inconsistentHosts=リクエスト行に指定されたホストが Host ヘッダーの値と矛盾しています。
http11processor.request.invalidScheme=HTTP リクエストに無効なスキーマを指定した完全 URI が含まれています
@@ -34,6 +35,9 @@ http11processor.request.noHostHeader=HTTP/1.1 リクエストで host ヘッダ
http11processor.request.nonNumericContentLength=リクエストの content-length
ヘッダに数値でない値が含まれています
http11processor.request.prepare=リクエスト準備中のエラー
http11processor.request.process=リクエスト処理中のエラー
+http11processor.request.unsupportedEncoding=リクエストの準備中にエラーが発生しました。サポートされていない
Transfer-Encodng\n\
+\ [{0}]
+http11processor.request.unsupportedVersion=リクエストの準備中にエラーが発生しました。サポートされていない
HTTP バージョン [{0}]
http11processor.response.finish=レスポンス終了処理のエラー
http11processor.response.invalidHeader=値 [{1}] を持つHTTPレスポンスヘッダ [{0}]
は、無効であるためレスポンスから削除されました
http11processor.sendfile.error=sendfileを使ってデータを送信中にエラーが発生しました。これは開始点または終了点の無効なリクエスト属性によって引き起こされる可能性があります。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 7a383a9e35..a5bab91999 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -124,6 +124,7 @@ streamProcessor.service.error=リクエスト処理中のエラー
streamStateMachine.debug.change=コネクション [{0}]、ストリーム [{1}]、状態を [{2}] から [{3}]
へ変更しました。
streamStateMachine.invalidFrame=コネクション [{0}]、ストリーム [{1}]、状態 [{2}]、フレーム種類 [{3}]
+streamStateMachine.invalidReset=コネクション [{0}]、ストリーム [{1}]、ストリームは IDLE
状態のときにリセットできません
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
index a95ae9dc20..b0dab840b3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
@@ -45,6 +45,7 @@ http.tooManyColons=IPv6 アドレスでは文字 : を 2 つ以上連続する
http.tooManyDoubleColons=IPv6アドレスは単一の '::'シーケンスのみを含むことができます。
http.tooManyHextets=IPv6 アドレスは [{0}] ヘクステットで構成されていますが、正常な IPv6 アドレスなら 8
ヘクステット以上になりません。
+httpHeaderParser.invalidCrlfNoCR=行末シーケンスが無効です (LF の前に CR がありません)
httpHeaderParser.invalidHeader=HTTP ヘッダーの [{0}] 行目は RFC 9112
に準拠していません。リクエストは拒否されました。
sf.bareitem.invalidCharacter=ベアアイテムの開始を解析中に無効な文字 [{0}] が見つかりました
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index b629f867de..18dd1c55ac 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -139,6 +139,8 @@ sniExtractor.tooEarly=クライアントのhelloが解析される前にこの
socket.closed=このコネクションに関連付けられたソケットは閉じられました。
socket.sslreneg=SSLコネクションの再ネゴシエーション時の例外
+socketProperties.negativeUnlockTimeout=unlockTimeout に設定された負の値は無視されました
+
socketWrapper.readTimeout=読み込みタイムアウト
socketWrapper.writeTimeout=書き込みタイムアウト
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
index c73442450f..39513bbb90 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=ラッチが制限 [{0}] を超えました
(tomcat) 01/02: Updates to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ae04d4e10c149ded361ae85aafc14446d5026482
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:21:35 2024 +0100
Updates to French translations
---
java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
5 files changed, 11 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 1c419a6139..4f26a52071 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=Impossible
d'enregistrer le pr
http11processor.fallToDebug=\n\
\ Note : les occurrences suivantes d'erreurs d'analyse de requête HTTP seront
enregistrées au niveau DEBUG.
http11processor.header.parse=Erreur lors de l'analyse d'un en-tête de requête
HTTP
+http11processor.request.alreadyChunked=Erreur lors de la préparation de la
requête, l''encodage de transfert liste chunked avant [{0}]
http11processor.request.finish=Erreur en terminant la requête
http11processor.request.inconsistentHosts=L'hôte spécifié dans la ligne de
requête ne correspond pas à celui de l'en-tête hôte
http11processor.request.invalidScheme=La requête HTTP contenait une URi
absolue avec un schéma invalide
@@ -34,6 +35,8 @@ http11processor.request.noHostHeader=La requ6ete HTTP/1.1 ne
contient pas d'en-t
http11processor.request.nonNumericContentLength=La requête contenait un
en-tête content-length avec une valeur non numérique
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
+http11processor.request.unsupportedEncoding=Erreur lors de la préparation de
la requête, l''encodage de transfert [{0}] n''est pas supporté
+http11processor.request.unsupportedVersion=Erreur lors de la préparation de la
requête, la version HTTP [{0}] n''est pas supportée
http11processor.response.finish=Erreur en finissant la réponse
http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
index a4e90bd377..f85db16ee7 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
@@ -45,6 +45,7 @@ http.tooManyColons=Une adresse IPv6 ne peut pas contenir plus
de deux caractère
http.tooManyDoubleColons=Une adresse IPv6 ne peut contenir qu'une seule
séquence "::"
http.tooManyHextets=L''adresse IPv6 contient [{0}] groupes de 4 octets mais
une adresse IPv6 valide ne doit pas en avoir plus de 8
+httpHeaderParser.invalidCrlfNoCR=Séquence de fin de ligne invalide (pas de CR
avant LF)
httpHeaderParser.invalidHeader=La ligne d''en-tête HTTP [{0}] ne respecte pas
la RFC 9112. La requête a été rejetée.
sf.bareitem.invalidCharacter=Le caractère [{0}] invalide a été rencontré en
début d''un objet
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index e357d83ee8..88179b0560 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -139,6 +139,8 @@ sniExtractor.tooEarly=Il est illégal d'appeler cette
méthode avant que le hell
socket.closed=Le socket associé à cette connection a été fermé
socket.sslreneg=Exception lors de la renégociation de la connection SSL
+socketProperties.negativeUnlockTimeout=La valeur négative pour unlockTimeout a
été ignorée
+
socketWrapper.readTimeout=Timeout en lecture
socketWrapper.writeTimeout=Timeout en écriture
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index ff5b2b03b8..32b21e2f60 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=La limite [{0}] du loquet (latch) a ét
(tomcat) 02/02: Updates to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 47b65009e9a5946ec19f507021a136b62eca5cde
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:19:16 2024 +0100
Updates to Japanese translations
---
java/org/apache/coyote/http11/LocalStrings_ja.properties | 4
java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 5120c732fb..7f2858d7ef 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=JMXにアップグレードプ
http11processor.fallToDebug=\n\
\ 注: 以降のHTTPリクエスト構文解析エラーの発生はDEBUGレベルでログに出力されます。
http11processor.header.parse=HTTP リクエストヘッダーを解析中のエラー
+http11processor.request.alreadyChunked=リクエストの準備中にエラーが発生しました。Transfer-Encoding
には [{0}] より前に chunked があります
http11processor.request.finish=リクエスト終了処理エラー
http11processor.request.inconsistentHosts=リクエスト行に指定されたホストが Host ヘッダーの値と矛盾しています。
http11processor.request.invalidScheme=HTTP リクエストに無効なスキーマを指定した完全 URI が含まれています
@@ -34,6 +35,9 @@ http11processor.request.noHostHeader=HTTP/1.1 リクエストで host ヘッダ
http11processor.request.nonNumericContentLength=リクエストの content-length
ヘッダに数値でない値が含まれています
http11processor.request.prepare=リクエスト準備中のエラー
http11processor.request.process=リクエスト処理中のエラー
+http11processor.request.unsupportedEncoding=リクエストの準備中にエラーが発生しました。サポートされていない
Transfer-Encodng\n\
+\ [{0}]
+http11processor.request.unsupportedVersion=リクエストの準備中にエラーが発生しました。サポートされていない
HTTP バージョン [{0}]
http11processor.response.finish=レスポンス終了処理のエラー
http11processor.response.invalidHeader=値 [{1}] を持つHTTPレスポンスヘッダ [{0}]
は、無効であるためレスポンスから削除されました
http11processor.sendfile.error=sendfileを使ってデータを送信中にエラーが発生しました。これは開始点または終了点の無効なリクエスト属性によって引き起こされる可能性があります。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index f72063af9b..e6a03e3efa 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -124,6 +124,7 @@ streamProcessor.service.error=リクエスト処理中のエラー
streamStateMachine.debug.change=コネクション [{0}]、ストリーム [{1}]、状態を [{2}] から [{3}]
へ変更しました。
streamStateMachine.invalidFrame=コネクション [{0}]、ストリーム [{1}]、状態 [{2}]、フレーム種類 [{3}]
+streamStateMachine.invalidReset=コネクション [{0}]、ストリーム [{1}]、ストリームは IDLE
状態のときにリセットできません
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
index a95ae9dc20..b0dab840b3 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
@@ -45,6 +45,7 @@ http.tooManyColons=IPv6 アドレスでは文字 : を 2 つ以上連続する
http.tooManyDoubleColons=IPv6アドレスは単一の '::'シーケンスのみを含むことができます。
http.tooManyHextets=IPv6 アドレスは [{0}] ヘクステットで構成されていますが、正常な IPv6 アドレスなら 8
ヘクステット以上になりません。
+httpHeaderParser.invalidCrlfNoCR=行末シーケンスが無効です (LF の前に CR がありません)
httpHeaderParser.invalidHeader=HTTP ヘッダーの [{0}] 行目は RFC 9112
に準拠していません。リクエストは拒否されました。
sf.bareitem.invalidCharacter=ベアアイテムの開始を解析中に無効な文字 [{0}] が見つかりました
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 5d6c9592a5..255aa3aff3 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -140,6 +140,8 @@ sniExtractor.tooEarly=クライアントのhelloが解析される前にこの
socket.closed=このコネクションに関連付けられたソケットは閉じられました。
socket.sslreneg=SSLコネクションの再ネゴシエーション時の例外
+socketProperties.negativeUnlockTimeout=unlockTimeout に設定された負の値は無視されました
+
socketWrapper.readTimeout=読み込みタイムアウト
socketWrapper.writeTimeout=書き込みタイムアウト
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
index c73442450f..39513bbb90 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=ラッチが制限 [{0}] を超えました
+
taskQueue.notRunning
(tomcat) 01/02: Updates to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a67d89482225b54de19b02cfa854f22f86ecc138
Author: Mark Thomas
AuthorDate: Mon Jun 3 10:17:18 2024 +0100
Updates to French translations
---
java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
5 files changed, 11 insertions(+)
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 1dc15c7036..96aaadfb4e 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -22,6 +22,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=Impossible
d'enregistrer le pr
http11processor.fallToDebug=\n\
\ Note : les occurrences suivantes d'erreurs d'analyse de requête HTTP seront
enregistrées au niveau DEBUG.
http11processor.header.parse=Erreur lors de l'analyse d'un en-tête de requête
HTTP
+http11processor.request.alreadyChunked=Erreur lors de la préparation de la
requête, l''encodage de transfert liste chunked avant [{0}]
http11processor.request.finish=Erreur en terminant la requête
http11processor.request.inconsistentHosts=L'hôte spécifié dans la ligne de
requête ne correspond pas à celui de l'en-tête hôte
http11processor.request.invalidScheme=La requête HTTP contenait une URi
absolue avec un schéma invalide
@@ -34,6 +35,8 @@ http11processor.request.noHostHeader=La requ6ete HTTP/1.1 ne
contient pas d'en-t
http11processor.request.nonNumericContentLength=La requête contenait un
en-tête content-length avec une valeur non numérique
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
+http11processor.request.unsupportedEncoding=Erreur lors de la préparation de
la requête, l''encodage de transfert [{0}] n''est pas supporté
+http11processor.request.unsupportedVersion=Erreur lors de la préparation de la
requête, la version HTTP [{0}] n''est pas supportée
http11processor.response.finish=Erreur en finissant la réponse
http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
index a4e90bd377..f85db16ee7 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
@@ -45,6 +45,7 @@ http.tooManyColons=Une adresse IPv6 ne peut pas contenir plus
de deux caractère
http.tooManyDoubleColons=Une adresse IPv6 ne peut contenir qu'une seule
séquence "::"
http.tooManyHextets=L''adresse IPv6 contient [{0}] groupes de 4 octets mais
une adresse IPv6 valide ne doit pas en avoir plus de 8
+httpHeaderParser.invalidCrlfNoCR=Séquence de fin de ligne invalide (pas de CR
avant LF)
httpHeaderParser.invalidHeader=La ligne d''en-tête HTTP [{0}] ne respecte pas
la RFC 9112. La requête a été rejetée.
sf.bareitem.invalidCharacter=Le caractère [{0}] invalide a été rencontré en
début d''un objet
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 037cdb5d6d..1dc5b2df60 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -140,6 +140,8 @@ sniExtractor.tooEarly=Il est illégal d'appeler cette
méthode avant que le hell
socket.closed=Le socket associé à cette connection a été fermé
socket.sslreneg=Exception lors de la renégociation de la connection SSL
+socketProperties.negativeUnlockTimeout=La valeur négative pour unlockTimeout a
été ignorée
+
socketWrapper.readTimeout=Timeout en lecture
socketWrapper.writeTimeout=Timeout en écriture
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index ff5b2b03b8..32b21e2f60 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+limitLatch.exceeded=La limite [{0}] du loquet (latch) a ét
(tomcat) branch main updated (b7fbe3fdb7 -> 47b65009e9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from b7fbe3fdb7 Simplify new a67d894822 Updates to French translations new 47b65009e9 Updates to Japanese translations The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/coyote/http11/LocalStrings_fr.properties | 3 +++ java/org/apache/coyote/http11/LocalStrings_ja.properties | 4 java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties | 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties | 1 + java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/threads/LocalStrings_ja.properties | 2 ++ webapps/docs/changelog.xml | 6 ++ 10 files changed, 24 insertions(+) - 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: Simplify
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 31c472b8c0 Simplify
31c472b8c0 is described below
commit 31c472b8c06b99aee3e2a4ad1203ecef44c6e5eb
Author: Mark Thomas
AuthorDate: Mon Jun 3 08:55:55 2024 +0100
Simplify
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 9d13db7c72..1a74f3b84c 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1291,7 +1291,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readInterest = true;
long readTimeout =
handler.getProtocol().getStreamReadTimeout();
if (readTimeout > 0) {
-readTimeoutExpiry = System.currentTimeMillis() +
handler.getProtocol().getStreamReadTimeout();
+readTimeoutExpiry = System.currentTimeMillis() +
readTimeout;
} else {
readTimeoutExpiry = Long.MAX_VALUE;
}
-
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: Simplify
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 5b59a769d2 Simplify
5b59a769d2 is described below
commit 5b59a769d2ee3e2b84cd8bd97aa3b4d8199cc609
Author: Mark Thomas
AuthorDate: Mon Jun 3 08:55:55 2024 +0100
Simplify
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 062221d9a4..4fec394f35 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1293,7 +1293,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readInterest = true;
long readTimeout =
handler.getProtocol().getStreamReadTimeout();
if (readTimeout > 0) {
-readTimeoutExpiry = System.currentTimeMillis() +
handler.getProtocol().getStreamReadTimeout();
+readTimeoutExpiry = System.currentTimeMillis() +
readTimeout;
} else {
readTimeoutExpiry = Long.MAX_VALUE;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (f8eecc13b5 -> b7fbe3fdb7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from f8eecc13b5 Set IntelliJ IDEA IDE Language Level to Experimental add b7fbe3fdb7 Simplify No new revisions were added by this update. Summary of changes: java/org/apache/coyote/http2/Stream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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 BZ 69068 - trigger read timeouts for async reads on HTTP/2
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 9b205ce9d9 Fix BZ 69068 - trigger read timeouts for async reads on
HTTP/2
9b205ce9d9 is described below
commit 9b205ce9d968972fa9f6dd3848307d662dcc18c8
Author: Mark Thomas
AuthorDate: Sun Jun 2 15:22:54 2024 +0100
Fix BZ 69068 - trigger read timeouts for async reads on HTTP/2
Test case provided by hypnoce
---
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 23
java/org/apache/coyote/http2/StreamProcessor.java | 20 +++
test/org/apache/coyote/http2/Http2TestBase.java| 2 +-
.../apache/coyote/http2/TestAsyncReadListener.java | 145 +
webapps/docs/changelog.xml | 8 ++
6 files changed, 198 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 137e3346db..891ba7ad81 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -121,6 +121,7 @@ streamProcessor.error.connection=Connection [{0}], Stream
[{1}], An error occurr
streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred
during processing that was fatal to the stream
streamProcessor.flushBufferedWrite.entry=Connection [{0}], Stream [{1}],
Flushing buffered writes
streamProcessor.service.error=Error during request processing
+streamProcessor.streamReadTimeout=Stream read timeout
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}],
Frame type [{3}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index a357d34cf7..9d13db7c72 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1160,6 +1160,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
abstract boolean isRequestBodyFullyRead();
abstract void insertReplayedBody(ByteChunk body);
+
+protected abstract boolean timeoutRead(long now);
}
@@ -1186,6 +1188,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// 'write mode'.
private volatile ByteBuffer inBuffer;
private volatile boolean readInterest;
+// If readInterest is true, data must be available to read no later
than this time.
+private volatile long readTimeoutExpiry;
private volatile boolean closed;
private boolean resetReceived;
@@ -1285,6 +1289,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (!isRequestBodyFullyRead()) {
readInterest = true;
+long readTimeout =
handler.getProtocol().getStreamReadTimeout();
+if (readTimeout > 0) {
+readTimeoutExpiry = System.currentTimeMillis() +
handler.getProtocol().getStreamReadTimeout();
+} else {
+readTimeoutExpiry = Long.MAX_VALUE;
+}
}
return false;
@@ -1436,6 +1446,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
}
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+return readInterest && now > readTimeoutExpiry;
+}
}
@@ -1497,5 +1513,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
void insertReplayedBody(ByteChunk body) {
// NO-OP
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+// Reading from a saved request. Will never time out.
+return false;
+}
}
}
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 0e99606f57..872cc75687 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
import java.io.File;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
@@ -25,6 +26,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletResponse;
import org.apache.coyote.AbstractProcessor;
@@ -554,4 +556,22 @@ class StreamProcessor extends Abs
(tomcat) branch 10.1.x updated: Fix BZ 69068 - trigger read timeouts for async reads on HTTP/2
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 382ae1f1dc Fix BZ 69068 - trigger read timeouts for async reads on
HTTP/2
382ae1f1dc is described below
commit 382ae1f1dc25f30d1991ebd1adf2cfc9b71ba570
Author: Mark Thomas
AuthorDate: Sun Jun 2 15:22:54 2024 +0100
Fix BZ 69068 - trigger read timeouts for async reads on HTTP/2
Test case provided by hypnoce
---
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 23
java/org/apache/coyote/http2/StreamProcessor.java | 20 +++
test/org/apache/coyote/http2/Http2TestBase.java| 2 +-
.../apache/coyote/http2/TestAsyncReadListener.java | 145 +
webapps/docs/changelog.xml | 4 +
6 files changed, 194 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 137e3346db..891ba7ad81 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -121,6 +121,7 @@ streamProcessor.error.connection=Connection [{0}], Stream
[{1}], An error occurr
streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred
during processing that was fatal to the stream
streamProcessor.flushBufferedWrite.entry=Connection [{0}], Stream [{1}],
Flushing buffered writes
streamProcessor.service.error=Error during request processing
+streamProcessor.streamReadTimeout=Stream read timeout
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}],
Frame type [{3}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 096cc52c30..062221d9a4 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1162,6 +1162,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
abstract boolean isRequestBodyFullyRead();
abstract void insertReplayedBody(ByteChunk body);
+
+protected abstract boolean timeoutRead(long now);
}
@@ -1188,6 +1190,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// 'write mode'.
private volatile ByteBuffer inBuffer;
private volatile boolean readInterest;
+// If readInterest is true, data must be available to read no later
than this time.
+private volatile long readTimeoutExpiry;
private volatile boolean closed;
private boolean resetReceived;
@@ -1287,6 +1291,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (!isRequestBodyFullyRead()) {
readInterest = true;
+long readTimeout =
handler.getProtocol().getStreamReadTimeout();
+if (readTimeout > 0) {
+readTimeoutExpiry = System.currentTimeMillis() +
handler.getProtocol().getStreamReadTimeout();
+} else {
+readTimeoutExpiry = Long.MAX_VALUE;
+}
}
return false;
@@ -1438,6 +1448,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
}
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+return readInterest && now > readTimeoutExpiry;
+}
}
@@ -1499,5 +1515,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
void insertReplayedBody(ByteChunk body) {
// NO-OP
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+// Reading from a saved request. Will never time out.
+return false;
+}
}
}
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 43865c1ea4..4e5645736e 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
import java.io.File;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
@@ -25,6 +26,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.http.HttpServletResponse;
@@ -553,4 +555,22 @@ class StreamProcessor extends Abs
(tomcat) branch main updated: Fix BZ 69068 - trigger read timeouts for async reads on HTTP/2
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 8010d91672 Fix BZ 69068 - trigger read timeouts for async reads on
HTTP/2
8010d91672 is described below
commit 8010d91672bc8038f34b51339a6e3f5f18d7c316
Author: Mark Thomas
AuthorDate: Sun Jun 2 15:22:54 2024 +0100
Fix BZ 69068 - trigger read timeouts for async reads on HTTP/2
Test case provided by hypnoce
---
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 23
java/org/apache/coyote/http2/StreamProcessor.java | 20 +++
test/org/apache/coyote/http2/Http2TestBase.java| 2 +-
.../apache/coyote/http2/TestAsyncReadListener.java | 145 +
webapps/docs/changelog.xml | 4 +
6 files changed, 194 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 5f6cadde11..68baa3d265 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -121,6 +121,7 @@ streamProcessor.error.connection=Connection [{0}], Stream
[{1}], An error occurr
streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred
during processing that was fatal to the stream
streamProcessor.flushBufferedWrite.entry=Connection [{0}], Stream [{1}],
Flushing buffered writes
streamProcessor.service.error=Error during request processing
+streamProcessor.streamReadTimeout=Stream read timeout
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}],
Frame type [{3}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index a0a5f1f7f9..0151414589 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1075,6 +1075,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
abstract boolean isRequestBodyFullyRead();
abstract void insertReplayedBody(ByteChunk body);
+
+protected abstract boolean timeoutRead(long now);
}
@@ -1101,6 +1103,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// 'write mode'.
private volatile ByteBuffer inBuffer;
private volatile boolean readInterest;
+// If readInterest is true, data must be available to read no later
than this time.
+private volatile long readTimeoutExpiry;
private volatile boolean closed;
private boolean resetReceived;
@@ -1199,6 +1203,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (!isRequestBodyFullyRead()) {
readInterest = true;
+long readTimeout =
handler.getProtocol().getStreamReadTimeout();
+if (readTimeout > 0) {
+readTimeoutExpiry = System.currentTimeMillis() +
handler.getProtocol().getStreamReadTimeout();
+} else {
+readTimeoutExpiry = Long.MAX_VALUE;
+}
}
return false;
@@ -1350,6 +1360,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
}
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+return readInterest && now > readTimeoutExpiry;
+}
}
@@ -1411,5 +1427,12 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
void insertReplayedBody(ByteChunk body) {
// NO-OP
}
+
+
+@Override
+protected boolean timeoutRead(long now) {
+// Reading from a saved request. Will never time out.
+return false;
+}
}
}
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index ab01e7ae7d..fdc8c4b160 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
import java.io.File;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
@@ -25,6 +26,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.http.HttpServletResponse;
@@ -543,4 +545,22 @@ class StreamProcessor extends Abs
(tomcat) branch 9.0.x updated: Fix typo
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 d26e61bf58 Fix typo
d26e61bf58 is described below
commit d26e61bf58a143a15d00c28f97da363a7cf04ee4
Author: Mark Thomas
AuthorDate: Fri May 31 16:27:24 2024 +0100
Fix typo
---
java/org/apache/coyote/Processor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/Processor.java
b/java/org/apache/coyote/Processor.java
index 64192f474d..c82f0df75f 100644
--- a/java/org/apache/coyote/Processor.java
+++ b/java/org/apache/coyote/Processor.java
@@ -68,7 +68,7 @@ public interface Processor {
* represent a timeout that is triggered independently of the socket
read/write timeouts.
*
* @param now The time (as returned by {@link System#currentTimeMillis()}
to use as the current time to determine
- *whether the timeout has expired. If negative, the
timeout will always be treated as ifq it has
+ *whether the timeout has expired. If negative, the
timeout will always be treated as if it has
*expired.
*/
void timeoutAsync(long now);
-
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 typo
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 1cc9cc8944 Fix typo
1cc9cc8944 is described below
commit 1cc9cc8944941c3b67e25327ecb32ac4fd5b5955
Author: Mark Thomas
AuthorDate: Fri May 31 16:27:24 2024 +0100
Fix typo
---
java/org/apache/coyote/Processor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/Processor.java
b/java/org/apache/coyote/Processor.java
index 64192f474d..c82f0df75f 100644
--- a/java/org/apache/coyote/Processor.java
+++ b/java/org/apache/coyote/Processor.java
@@ -68,7 +68,7 @@ public interface Processor {
* represent a timeout that is triggered independently of the socket
read/write timeouts.
*
* @param now The time (as returned by {@link System#currentTimeMillis()}
to use as the current time to determine
- *whether the timeout has expired. If negative, the
timeout will always be treated as ifq it has
+ *whether the timeout has expired. If negative, the
timeout will always be treated as if it has
*expired.
*/
void timeoutAsync(long now);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
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 8bf9122c96 Fix typo
8bf9122c96 is described below
commit 8bf9122c96b2e57fa642fab1763a549ee5e3dbc1
Author: Mark Thomas
AuthorDate: Fri May 31 16:27:24 2024 +0100
Fix typo
---
java/org/apache/coyote/Processor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/Processor.java
b/java/org/apache/coyote/Processor.java
index 64192f474d..c82f0df75f 100644
--- a/java/org/apache/coyote/Processor.java
+++ b/java/org/apache/coyote/Processor.java
@@ -68,7 +68,7 @@ public interface Processor {
* represent a timeout that is triggered independently of the socket
read/write timeouts.
*
* @param now The time (as returned by {@link System#currentTimeMillis()}
to use as the current time to determine
- *whether the timeout has expired. If negative, the
timeout will always be treated as ifq it has
+ *whether the timeout has expired. If negative, the
timeout will always be treated as if it has
*expired.
*/
void timeoutAsync(long now);
-
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: Version updates for Objenesis, Checkstyle and SpotBugs
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 47b7f1e38d Version updates for Objenesis, Checkstyle and SpotBugs
47b7f1e38d is described below
commit 47b7f1e38d009bf1587fba7c9f4c4a766b0e647d
Author: Mark Thomas
AuthorDate: Fri May 31 13:30:33 2024 +0100
Version updates for Objenesis, Checkstyle and SpotBugs
---
build.properties.default | 14 +++---
webapps/docs/changelog.xml | 9 +
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 847ff1047a..0730f75a92 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -200,7 +200,7 @@ commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
-# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
+# checksums for commons-daemon-1.4.0-native-src.tar.gz,
commons-daemon-1.4.0-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
@@ -258,10 +258,10 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.3
+objenesis.version=3.4
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
+objenesis.checksum.value=51242320cb2bb25a3f36e2e21fa87de0|675cbe121a68019235d27f6c34b4f0ac30e07418
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.16.0
+checkstyle.version=10.17.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
+checkstyle.checksum.value=e35e8bb505a2cde19d361d95e9f70ff1481a4216824fdfe88d99de5607aae89c8fca1f38e768d2ae39c61269ee6be27e0b214f19861214448a5e46f30ccfbcac
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
@@ -294,10 +294,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.4
+spotbugs.version=4.8.5
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
+spotbugs.checksum.value=3310ffa7d18f4d9d8a87926bcd256709866bfa3337df69c183e18bb0491aa639f93c70ade764fdb13f499fa971980cd7ce99594e3e818f6cafc69675da901416
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 70ee863ee6..fe80b25520 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,15 @@
Update to Commons Daemon 1.4.0. (markt)
+
+Update to Objenesis 3.4. (markt)
+
+
+Update to Checkstyle 10.17.0. (markt)
+
+
+Update to SpotBugs 4.8.5. (markt)
+
-
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: Version updates for Objenesis, Checkstyle and SpotBugs
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 55d7802cef Version updates for Objenesis, Checkstyle and SpotBugs
55d7802cef is described below
commit 55d7802cefc25572b29a9da3cfcc55d8c8443fbc
Author: Mark Thomas
AuthorDate: Fri May 31 13:30:33 2024 +0100
Version updates for Objenesis, Checkstyle and SpotBugs
---
build.properties.default | 14 +++---
webapps/docs/changelog.xml | 9 +
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f21deda735..a7a5c28e5b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -198,7 +198,7 @@ commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
-# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
+# checksums for commons-daemon-1.4.0-native-src.tar.gz,
commons-daemon-1.4.0-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
@@ -256,10 +256,10 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.3
+objenesis.version=3.4
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
+objenesis.checksum.value=51242320cb2bb25a3f36e2e21fa87de0|675cbe121a68019235d27f6c34b4f0ac30e07418
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.16.0
+checkstyle.version=10.17.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
+checkstyle.checksum.value=e35e8bb505a2cde19d361d95e9f70ff1481a4216824fdfe88d99de5607aae89c8fca1f38e768d2ae39c61269ee6be27e0b214f19861214448a5e46f30ccfbcac
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
@@ -292,10 +292,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.4
+spotbugs.version=4.8.5
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
+spotbugs.checksum.value=3310ffa7d18f4d9d8a87926bcd256709866bfa3337df69c183e18bb0491aa639f93c70ade764fdb13f499fa971980cd7ce99594e3e818f6cafc69675da901416
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 777b0e9598..4204687f55 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,15 @@
Update to Commons Daemon 1.4.0. (markt)
+
+Update to Objenesis 3.4. (markt)
+
+
+Update to Checkstyle 10.17.0. (markt)
+
+
+Update to SpotBugs 4.8.5. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Version updates for Objenesis, Checkstyle and SpotBugs
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 2976648811 Version updates for Objenesis, Checkstyle and SpotBugs
2976648811 is described below
commit 2976648811eea988f5238f0fb012dc8390f0caf8
Author: Mark Thomas
AuthorDate: Fri May 31 13:30:33 2024 +0100
Version updates for Objenesis, Checkstyle and SpotBugs
---
build.properties.default | 14 +++---
webapps/docs/changelog.xml | 9 +
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b651b26eff..2c53190018 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -177,7 +177,7 @@ commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
-# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
+# checksums for commons-daemon-1.4.0-native-src.tar.gz,
commons-daemon-1.4.0-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
@@ -235,10 +235,10 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.3
+objenesis.version=3.4
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
+objenesis.checksum.value=51242320cb2bb25a3f36e2e21fa87de0|675cbe121a68019235d27f6c34b4f0ac30e07418
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.16.0
+checkstyle.version=10.17.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
+checkstyle.checksum.value=e35e8bb505a2cde19d361d95e9f70ff1481a4216824fdfe88d99de5607aae89c8fca1f38e768d2ae39c61269ee6be27e0b214f19861214448a5e46f30ccfbcac
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
@@ -271,10 +271,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.4
+spotbugs.version=4.8.5
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
+spotbugs.checksum.value=3310ffa7d18f4d9d8a87926bcd256709866bfa3337df69c183e18bb0491aa639f93c70ade764fdb13f499fa971980cd7ce99594e3e818f6cafc69675da901416
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b0f241936b..3f76e7306c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,15 @@
Update to Jakarta Authentication API 3.1. (markt)
+
+Update to Objenesis 3.4. (markt)
+
+
+Update to Checkstyle 10.17.0. (markt)
+
+
+Update to SpotBugs 4.8.5. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: Update Tomcat Native docs for 2.0.7 release
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new ace75cdce Update Tomcat Native docs for 2.0.7 release
ace75cdce is described below
commit ace75cdce7c440fafb1172b069cd4aa11fe7e68e
Author: Mark Thomas
AuthorDate: Fri May 31 12:35:19 2024 +0100
Update Tomcat Native docs for 2.0.7 release
---
xdocs/index.xml | 4 ++--
xdocs/miscellaneous/project.xml | 1 +
xdocs/{project.xml => news/2024.xml} | 39 ++--
xdocs/news/project.xml | 1 +
xdocs/project.xml| 1 +
5 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 6735177a7..24be0623d 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -42,10 +42,10 @@
-2 October 2023 - TC-Native-2.0.6
+8 February 2024 - TC-Native-2.0.7
released
The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 2.0.6 Stable.
+Tomcat Native 2.0.7 Stable.
The sources and the binaries for selected platforms are available from the
Download page.
diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index 9ddf2f6a5..016f529dd 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -35,6 +35,7 @@
+
diff --git a/xdocs/project.xml b/xdocs/news/2024.xml
similarity index 55%
copy from xdocs/project.xml
copy to xdocs/news/2024.xml
index cdb08d119..9312811e8 100644
--- a/xdocs/project.xml
+++ b/xdocs/news/2024.xml
@@ -15,29 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-https://tomcat.apache.org/;>
+
+]>
+
- The Apache Tomcat Native Library 2.0
+
-
-The Apache Tomcat Native Library
-
+
+2024 News and Status
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+The Apache Tomcat team is proud to announce the immediate
+availability of Tomcat Native 2.0.7.
+
+
+
+
-
+
+
diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml
index 968bb6246..11758a025 100644
--- a/xdocs/news/project.xml
+++ b/xdocs/news/project.xml
@@ -35,6 +35,7 @@
+
diff --git a/xdocs/project.xml b/xdocs/project.xml
index cdb08d119..36804cec3 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -35,6 +35,7 @@
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1918074 - /tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
Author: markt Date: Fri May 31 11:44:17 2024 New Revision: 1918074 URL: http://svn.apache.org/viewvc?rev=1918074=rev Log: Remove 2.0.8 changelog entries Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1918074=1918073=1918074=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Fri May 31 11:44:17 2024 @@ -4,16 +4,6 @@ This is the Changelog for Apache Tomcat Native 2.0.x. The Tomcat Native 2.0.x branch started from the 1.2.33 tag. -Changes in 2.0.8 - - - Fix a crash on Windows when SSLContext.setCACertificate() - is invoked with a null value for caCertificateFile - and a non-null value for caCertificatePath - until properly addressed with - https://github.com/openssl/openssl/issues/24416. (michaelo) - - Changes in 2.0.7 @@ -174,4 +164,4 @@ changelog. Copyright 2008-2024, The Apache Software Foundation - \ No newline at end of file + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1918073 - in /tomcat/site/trunk/docs/native-doc: images/asf-feather.png images/asf-logo.svg index.html miscellaneous/changelog.html miscellaneous/tls-renegotiation.html news/2022.html new
Author: markt Date: Fri May 31 11:37:40 2024 New Revision: 1918073 URL: http://svn.apache.org/viewvc?rev=1918073=rev Log: Update native docs for 2.0.7 release Added: tomcat/site/trunk/docs/native-doc/images/asf-logo.svg tomcat/site/trunk/docs/native-doc/news/2024.html Removed: tomcat/site/trunk/docs/native-doc/images/asf-feather.png Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html tomcat/site/trunk/docs/native-doc/news/2022.html tomcat/site/trunk/docs/native-doc/news/2023.html Added: tomcat/site/trunk/docs/native-doc/images/asf-logo.svg URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/images/asf-logo.svg?rev=1918073=auto == --- tomcat/site/trunk/docs/native-doc/images/asf-logo.svg (added) +++ tomcat/site/trunk/docs/native-doc/images/asf-logo.svg Fri May 31 11:37:40 2024 @@ -0,0 +1,226 @@ + + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" +viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1918073=1918072=1918073=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Fri May 31 11:37:40 2024 @@ -1,5 +1,5 @@ -Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Documentation IndexIntroduction +The Apache Tomcat Native Library 2.0 - Documentation Indexhttps://tomcat.apache.org/;>http://www.apache.org/; target="_blank">The Apache Tomcat Native Library 2.0LinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202420232022Documentation IndexIntroduction The Apache Tomcat Native Library is an optional component for use with @@ -10,10 +10,10 @@ Headlines -2 October 2023 - TC-Native-2.0.6 +8 February 2024 - TC-Native-2.0.7 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 2.0.6 Stable. +Tomcat Native 2.0.7 Stable. The sources and the binaries for selected platforms are available from the Download page. @@ -135,9 +135,8 @@ export LD_LIBRARY_PATH Refer to the tomcat documentation to configure the connectors (See https://tomcat.apache.org/tomcat-11.0-doc/config/http.html;>Tomcat 11.0.x, -https://tomcat.apache.org/tomcat-10.1-doc/config/http.html;>Tomcat 10.1.x, -https://tomcat.apache.org/tomcat-9.0-doc/config/http.html;>Tomcat 9.0.x and -https://tomcat.apache.org/tomcat-8.5-doc/config/http.html;>Tomcat 8.5.x) +https://tomcat.apache.org/tomcat-10.1-doc/config/http.html;>Tomcat 10.1.x and +https://tomcat.apache.org/tomcat-9.0-doc/config/http.html;>Tomcat 9.0.x) @@ -157,5 +156,5 @@ export LD_LIBRARY_PATH -Copyright 2008-2022, The Apache Software Foundation +Copyright 2008-2024, The Apache Software Foundation \ No newline at end of file Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1918073=1918072=1918073=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Fri May 31 11:37:40 2024 @@ -1,9 +1,58 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Preface +The Apache Tomcat Native Library 2.0 - Miscellaneous Documentation - https://tomcat.apache.org/;>http://www.apache.org/; target=&
(tomcat) branch 9.0.x updated: chore: fix some misaligned whitespace in web.xml
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 97e14d6ad0 chore: fix some misaligned whitespace in web.xml 97e14d6ad0 is described below commit 97e14d6ad044ee5277b0e83104035716b6fa75e9 Author: Robin Verduijn AuthorDate: Fri May 24 16:20:36 2024 -0700 chore: fix some misaligned whitespace in web.xml --- conf/web.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index b38c6a1b5f..b4fc5b61da 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -73,7 +73,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -4741,7 +4741,7 @@ - + index.html - 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: chore: fix some misaligned whitespace in web.xml
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 52b37d2ee6 chore: fix some misaligned whitespace in web.xml 52b37d2ee6 is described below commit 52b37d2ee69512cff234c71e2d87d49a4f18a2ea Author: Robin Verduijn AuthorDate: Fri May 24 16:20:36 2024 -0700 chore: fix some misaligned whitespace in web.xml --- conf/web.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index 085d84e82c..a788672a42 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -78,7 +78,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -4741,7 +4741,7 @@ - + index.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: chore: fix some misaligned whitespace in web.xml
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 cfc555a46e chore: fix some misaligned whitespace in web.xml cfc555a46e is described below commit cfc555a46ed0ccba70b92690365bf7846f1f5baf Author: Robin Verduijn AuthorDate: Fri May 24 16:20:36 2024 -0700 chore: fix some misaligned whitespace in web.xml --- conf/web.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index aa2292c336..d4037523fc 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -78,7 +78,7 @@ - + @@ -364,7 +364,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -4721,7 +4721,7 @@ - + index.html - 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: Update change log
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 247266bbcc Update change log 247266bbcc is described below commit 247266bbccd539b76b5743c01ea9cb037660655d Author: Mark Thomas AuthorDate: Fri May 31 12:25:04 2024 +0100 Update change log --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 1cca834da8..70ee863ee6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -118,6 +118,10 @@ 69066: Fix regression in SPNEGO authenticator when processing Base64. Submitted by Daniel Lyko. (remm) + +Update minimum recommended version of Tomcat Native to 1.3.0. Pull +request 728 provided by Dimitrios Soumis. (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: Update recommended Tomcat native version to 1.3.0
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 9e50f634a6 Update recommended Tomcat native version to 1.3.0
9e50f634a6 is described below
commit 9e50f634a67a57e5968f20609d7a977704b87aea
Author: Dimitrios Soumis
AuthorDate: Wed May 29 14:43:30 2024 +0300
Update recommended Tomcat native version to 1.3.0
---
java/org/apache/catalina/core/AprLifecycleListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 498e5179d2..9a564af339 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -65,8 +65,8 @@ public class AprLifecycleListener implements
LifecycleListener {
protected static final int TCN_REQUIRED_MINOR = 2;
protected static final int TCN_REQUIRED_PATCH = 14;
protected static final int TCN_RECOMMENDED_MAJOR = 1;
-protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 38;
+protected static final int TCN_RECOMMENDED_MINOR = 3;
+protected static final int TCN_RECOMMENDED_PV = 0;
// -- Properties
-
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: Remove redundancy in BUILDING.txt
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 ca38837830 Remove redundancy in BUILDING.txt ca38837830 is described below commit ca38837830b757b8ffc8ba746f61477ec85188ca Author: Dimitrios Soumis AuthorDate: Fri May 31 12:45:11 2024 +0300 Remove redundancy in BUILDING.txt --- BUILDING.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.txt b/BUILDING.txt index fc440f237b..386a6a90a6 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -364,7 +364,7 @@ properties, which all are "true" by default: execute.test.nio2=true The SSL tests will be run twice. Once with the JSSE implementation and once -with the OpenSSL implementation. The OpenSSL implementation can only can be +with the OpenSSL implementation. The OpenSSL implementation can only be tested if Tomcat-Native library binaries are found by the testsuite. The "test.apr.loc" property specifies the directory where the library binaries are located. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove redundancy in BUILDING.txt
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 1d4013d9aa Remove redundancy in BUILDING.txt 1d4013d9aa is described below commit 1d4013d9aa6c5daf5f11d8e043618ba5e9d8739b Author: Dimitrios Soumis AuthorDate: Fri May 31 12:45:11 2024 +0300 Remove redundancy in BUILDING.txt --- BUILDING.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.txt b/BUILDING.txt index fc440f237b..386a6a90a6 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -364,7 +364,7 @@ properties, which all are "true" by default: execute.test.nio2=true The SSL tests will be run twice. Once with the JSSE implementation and once -with the OpenSSL implementation. The OpenSSL implementation can only can be +with the OpenSSL implementation. The OpenSSL implementation can only be tested if Tomcat-Native library binaries are found by the testsuite. The "test.apr.loc" property specifies the directory where the library binaries are located. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917948 - /tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt
Author: markt Date: Fri May 24 18:10:25 2024 New Revision: 1917948 URL: http://svn.apache.org/viewvc?rev=1917948=rev Log: Update TCK results for new run Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt?rev=1917948=1917947=1917948=diff == --- tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt (original) +++ tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Fri May 24 18:10:25 2024 @@ -18,7 +18,7 @@ TCK Version, digital SHA-256 fingerprint TCK 6.1.0 https://download.eclipse.org/ee4j/servlet/jakartaee11/staged/eftl/ - SHA256: 999a30cb8fc13752d3f9cc0fb7eb159d81421c7b4b432e963fd67cf04c591743 + SHA256: 1170697a87622a920bd50f0a68ed594c6efc5e17dd370566312194c4e12bec29 Implementation runtime Version(s) tested: Apache Tomcat @@ -37,13 +37,13 @@ Java runtime used to run the implementat Summary of the information for the certification environment: Ubuntu 22.04.4 LTS â https://github.com/apache/tomcat-tck - hash 4e0f9067ae6d2ffac2559c8206361654dc1b02d5 + hash d89e48859a822e96fb3126e9559bc29166e386ce A statement attesting that all TCK requirements have been met, including any compatibility rules: Confirmed Test results: - Java 17: Tests run: 1714, Failures: 0, Errors: 0, Skipped: 7 - Java 21: Tests run: 1714, Failures: 0, Errors: 0, Skipped: 7 + Java 17: Tests run: 1716, Failures: 0, Errors: 0, Skipped: 7 + Java 21: Tests run: 1716, Failures: 0, Errors: 0, Skipped: 7 The 7 skipped tests were the optional HTTP/2 server push tests \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-tck) branch main updated: No longer required
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-tck.git The following commit(s) were added to refs/heads/main by this push: new d89e488 No longer required d89e488 is described below commit d89e48859a822e96fb3126e9559bc29166e386ce Author: Mark Thomas AuthorDate: Fri May 24 18:01:17 2024 +0100 No longer required Addressed by the fix for https://github.com/jakartaee/servlet/issues/638 --- servlet-tck/pom.xml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml index 2ade4da..674ac2a 100644 --- a/servlet-tck/pom.xml +++ b/servlet-tck/pom.xml @@ -90,10 +90,6 @@ junit 4.13.2 - -org.slf4j -slf4j-simple - @@ -136,7 +132,7 @@ integration-test - jakarta.servlet:tck-runtime + jakarta.tck:servlet-tck-runtime **/ClientCertTests.java **/ClientCertAnnoTests.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update to Jakarta Annotations API 3.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 980b4a2b1915065e8b1ffc757e4aedc43f569fcc Author: Mark Thomas AuthorDate: Fri May 24 15:01:58 2024 +0100 Update to Jakarta Annotations API 3.0 --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 25cecdd9cd..202dda7b4c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -137,6 +137,9 @@ Update to Commons Daemon 1.4.0. (markt) + +Update to Jakarta Annotations API 3.0. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update to Jakarta Authentication API 3.1.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e029254f1cb2cca54db43b82a7eec378dff9142
Author: Mark Thomas
AuthorDate: Fri May 24 15:12:18 2024 +0100
Update to Jakarta Authentication API 3.1.
---
build.xml | 2 +-
.../auth/message/config/AuthConfigFactory.java | 25 --
webapps/docs/changelog.xml | 3 +++
webapps/docs/class-loader-howto.xml| 2 +-
webapps/docs/config/jaspic.xml | 4 ++--
5 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/build.xml b/build.xml
index 277c0873c8..052d6e9afb 100644
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,7 @@
-
+
diff --git a/java/jakarta/security/auth/message/config/AuthConfigFactory.java
b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
index 0fecabc248..2229eb66b8 100644
--- a/java/jakarta/security/auth/message/config/AuthConfigFactory.java
+++ b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
@@ -17,7 +17,6 @@
package jakarta.security.auth.message.config;
import java.security.Security;
-import java.security.SecurityPermission;
import java.util.Map;
import jakarta.security.auth.message.module.ServerAuthModule;
@@ -25,30 +24,6 @@ import jakarta.security.auth.message.module.ServerAuthModule;
public abstract class AuthConfigFactory {
public static final String DEFAULT_FACTORY_SECURITY_PROPERTY =
"authconfigprovider.factory";
-public static final String GET_FACTORY_PERMISSION_NAME =
"getProperty.authconfigprovider.factory";
-public static final String SET_FACTORY_PERMISSION_NAME =
"setProperty.authconfigprovider.factory";
-public static final String PROVIDER_REGISTRATION_PERMISSION_NAME =
"setProperty.authconfigfactory.provider";
-
-/**
- * @deprecated Following JEP 411
- */
-@Deprecated(forRemoval = true)
-public static final SecurityPermission getFactorySecurityPermission =
-new SecurityPermission(GET_FACTORY_PERMISSION_NAME);
-
-/**
- * @deprecated Following JEP 411
- */
-@Deprecated(forRemoval = true)
-public static final SecurityPermission setFactorySecurityPermission =
-new SecurityPermission(SET_FACTORY_PERMISSION_NAME);
-
-/**
- * @deprecated Following JEP 411
- */
-@Deprecated(forRemoval = true)
-public static final SecurityPermission
providerRegistrationSecurityPermission =
-new SecurityPermission(PROVIDER_REGISTRATION_PERMISSION_NAME);
private static final String DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL =
"org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl";
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 202dda7b4c..78e8bacf37 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -140,6 +140,9 @@
Update to Jakarta Annotations API 3.0. (markt)
+
+ Update to Jakarta Authentication API 3.1. (markt)
+
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index abc5bb80b9..efefcdc20b 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -152,7 +152,7 @@ loaders as it is initialized:
jasper.jar Optional. Tomcat Jasper JSP Compiler and
Runtime.
jasper-el.jar Optional. Tomcat EL implementation.
-jaspic-api.jar Jakarta Authentication 3.0 API.
+jaspic-api.jar Jakarta Authentication 3.1 API.
jsp-api.jar Optional. Jakarta Pages 4.0 API.
servlet-api.jar Jakarta Servlet 6.1 API.
tomcat-api.jar Several interfaces defined by Tomcat.
diff --git a/webapps/docs/config/jaspic.xml b/webapps/docs/config/jaspic.xml
index 546918ab4a..b6c5d8197b 100644
--- a/webapps/docs/config/jaspic.xml
+++ b/webapps/docs/config/jaspic.xml
@@ -35,8 +35,8 @@
Tomcat implements https://jakarta.ee/specifications/authentication/3.0/;>Jakarta
- Authentication 3.0. The implementation is primarily intended to enable
the
+ href="https://jakarta.ee/specifications/authentication/3.1/;>Jakarta
+ Authentication 3.1. The implementation is primarily intended to enable
the
integration of 3rd party authentication implementations with Tomcat.
Jakarta Authentication may be configured in one of two ways:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (8e09685a9c -> 9e029254f1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 8e09685a9c Various spec version updates new 980b4a2b19 Update to Jakarta Annotations API 3.0 new 9e029254f1 Update to Jakarta Authentication API 3.1. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 2 +- .../auth/message/config/AuthConfigFactory.java | 25 -- webapps/docs/changelog.xml | 6 ++ webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/config/jaspic.xml | 4 ++-- 5 files changed, 10 insertions(+), 29 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Various spec version updates
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 8e09685a9c Various spec version updates 8e09685a9c is described below commit 8e09685a9c647eacdfddc56bfb9a1bbefa2730b3 Author: Mark Thomas AuthorDate: Fri May 24 14:39:36 2024 +0100 Various spec version updates --- RELEASE-NOTES | 8 webapps/docs/class-loader-howto.xml | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 28680c7743..df6fd20d0e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -77,16 +77,16 @@ for use by web applications (by placing them in "lib"): * jasper.jar (Jasper 2 Compiler and Runtime) * jasper-el.jar (Jasper 2 EL implementation) * jsp-api.jar (JSP 4.0 API) -* servlet-api.jar (Servlet 6.0 API) +* servlet-api.jar (Servlet 6.1 API) * tomcat-api.jar (Interfaces shared by Catalina and Jasper) * tomcat-coyote.jar (Tomcat connectors and utility classes) * tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP 2) * tomcat-jdbc.jar (Tomcat's database connection pooling solution) * tomcat-jni.jar (Interface to the native component of the APR/native connector) * tomcat-util.jar (Various utilities) -* tomcat-websocket.jar (WebSocket 2.1 implementation) -* websocket-api.jar (WebSocket 2.1 API) -* websocket-client-api.jar (WebSocket 2.1 Client API) +* tomcat-websocket.jar (WebSocket 2.2 implementation) +* websocket-api.jar (WebSocket 2.2 API) +* websocket-client-api.jar (WebSocket 2.2 Client API) You can make additional APIs available to all of your web applications by putting unpacked classes into a "classes" directory (not created by default), diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 66ee7cb79d..abc5bb80b9 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -130,7 +130,7 @@ loaders as it is initialized: By default, this includes the following: -annotations-api.jar Jakarta Annotations 2.1.1 classes. +annotations-api.jar Jakarta Annotations 3.0 classes. catalina.jar Implementation of the Catalina servlet container portion of Tomcat. @@ -175,12 +175,12 @@ loaders as it is initialized: components of Apache Tomcat. tomcat-util-scan.jar Provides the class scanning functionality used by Tomcat. -tomcat-websocket.jar Optional. Jakarta WebSocket 2.1 +tomcat-websocket.jar Optional. Jakarta WebSocket 2.2 implementation -websocket-api.jar Optional. Jakarta WebSocket 2.1 API +websocket-api.jar Optional. Jakarta WebSocket 2.2 API websocket-client-api.jar Optional. Jakarta WebSocket -2.1 Client API +2.2 Client API WebappX A class loader is created for each web application that is deployed in a single Tomcat instance. All unpacked - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Align jakarta.annotations package with 3.0 specification
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 54e7873052 Align jakarta.annotations package with 3.0 specification
54e7873052 is described below
commit 54e7873052d5b73146853fa626f75623534c36e8
Author: Mark Thomas
AuthorDate: Fri May 24 14:32:29 2024 +0100
Align jakarta.annotations package with 3.0 specification
---
build.xml| 2 +-
java/jakarta/annotation/ManagedBean.java | 39
2 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/build.xml b/build.xml
index ecc7ee4767..277c0873c8 100644
--- a/build.xml
+++ b/build.xml
@@ -68,7 +68,7 @@
-
+
diff --git a/java/jakarta/annotation/ManagedBean.java
b/java/jakarta/annotation/ManagedBean.java
deleted file mode 100644
index 7a839d802d..00
--- a/java/jakarta/annotation/ManagedBean.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package jakarta.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Identifies a POJO as a managed bean.
- *
- * @since Common Annotations 1.1
- *
- * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI
beans instead.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated(since = "2.1.1", forRemoval = true)
-public @interface ManagedBean {
-/**
- * @return Name of the managed bean
- */
-String value() default "";
-}
-
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: Code clean-up - formatting. No functional change
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 f0187b2349 Code clean-up - formatting. No functional change
f0187b2349 is described below
commit f0187b2349144855b9ff1ec7f2d266d4f6fe928e
Author: Mark Thomas
AuthorDate: Fri May 24 13:22:33 2024 +0100
Code clean-up - formatting. No functional change
---
.../catalina/valves/AbstractAccessLogValve.java| 12
.../valves/CrawlerSessionManagerValve.java | 10 +++
.../catalina/valves/ExtendedAccessLogValve.java| 8 +++---
.../apache/catalina/valves/JsonAccessLogValve.java | 32 --
.../catalina/valves/LoadBalancerDrainingValve.java | 4 +--
.../apache/catalina/valves/PersistentValve.java| 11
java/org/apache/catalina/valves/RemoteIpValve.java | 4 +--
.../org/apache/catalina/valves/SemaphoreValve.java | 3 +-
.../catalina/valves/StuckThreadDetectionValve.java | 11
9 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 86df26194f..3f39d609f0 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -359,7 +359,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
private final Locale cacheDefaultLocale;
private final DateFormatCache parent;
protected final Cache cLFCache;
-private final Map formatCache = new HashMap<>();
+private final Map formatCache = new HashMap<>();
protected DateFormatCache(int size, Locale loc, DateFormatCache
parent) {
cacheSize = size;
@@ -406,14 +406,14 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Global date format cache.
*/
-private static final DateFormatCache globalDateCache = new
DateFormatCache(globalCacheSize, Locale.getDefault(),
-null);
+private static final DateFormatCache globalDateCache =
+new DateFormatCache(globalCacheSize, Locale.getDefault(), null);
/**
* Thread local date format cache.
*/
-private static final ThreadLocal localDateCache =
ThreadLocal
-.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
+private static final ThreadLocal localDateCache =
+ThreadLocal.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
/**
@@ -1858,7 +1858,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
// is encountered plus at the end.
default:
}
-// Control (1-31), delete (127) or above 127
+// Control (1-31), delete (127) or above 127
} else {
// Write unchanged string parts
if (current > next) {
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index de00f438fe..954082fe2f 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -45,8 +45,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
private static final Log log =
LogFactory.getLog(CrawlerSessionManagerValve.class);
-private final Map clientIdSessionId = new
ConcurrentHashMap<>();
-private final Map sessionIdClientId = new
ConcurrentHashMap<>();
+private final Map clientIdSessionId = new
ConcurrentHashMap<>();
+private final Map sessionIdClientId = new
ConcurrentHashMap<>();
private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo!
Slurp.*|.*Feedfetcher-Google.*";
private Pattern uaPattern = null;
@@ -139,7 +139,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
}
-public Map getClientIpSessionId() {
+public Map getClientIpSessionId() {
return clientIdSessionId;
}
@@ -272,10 +272,10 @@ public class CrawlerSessionManagerValve extends ValveBase
{
private static class CrawlerHttpSessionBindingListener implements
HttpSessionBindingListener, Serializable {
private static final long serialVersionUID = 1L;
-private final transient Map clientIdSessionId;
+private final transient Map clientIdSessionId;
private final transient String clientIdentifier;
-private CrawlerHttpSessionBindingListener(Map
clientIdSessionId, String clientIdentifier) {
+private CrawlerHttpSessionBindingL
(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change
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 b473b6f6f4 Code clean-up - formatting. No functional change
b473b6f6f4 is described below
commit b473b6f6f4fd6f665958483609961691f6328795
Author: Mark Thomas
AuthorDate: Fri May 24 13:22:26 2024 +0100
Code clean-up - formatting. No functional change
---
.../catalina/valves/AbstractAccessLogValve.java| 14 +-
.../valves/CrawlerSessionManagerValve.java | 10 +++
.../catalina/valves/ExtendedAccessLogValve.java| 10 +++
.../apache/catalina/valves/JsonAccessLogValve.java | 32 --
.../catalina/valves/LoadBalancerDrainingValve.java | 4 +--
.../apache/catalina/valves/PersistentValve.java| 11
java/org/apache/catalina/valves/RemoteIpValve.java | 4 +--
.../org/apache/catalina/valves/SemaphoreValve.java | 3 +-
.../catalina/valves/StuckThreadDetectionValve.java | 11
9 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index ac81d1184f..2b1b064ca8 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -362,7 +362,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
private final Locale cacheDefaultLocale;
private final DateFormatCache parent;
protected final Cache cLFCache;
-private final Map formatCache = new HashMap<>();
+private final Map formatCache = new HashMap<>();
protected DateFormatCache(int size, Locale loc, DateFormatCache
parent) {
cacheSize = size;
@@ -409,14 +409,14 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Global date format cache.
*/
-private static final DateFormatCache globalDateCache = new
DateFormatCache(globalCacheSize, Locale.getDefault(),
-null);
+private static final DateFormatCache globalDateCache =
+new DateFormatCache(globalCacheSize, Locale.getDefault(), null);
/**
* Thread local date format cache.
*/
-private static final ThreadLocal localDateCache =
ThreadLocal
-.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
+private static final ThreadLocal localDateCache =
+ThreadLocal.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
/**
@@ -1341,7 +1341,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Append the time to the buffer in the appropriate format.
*
- * @param buf The buffer to append to.
+ * @param buf The buffer to append to.
* @param time The time to log in nanoseconds.
*/
public abstract void append(CharArrayWriter buf, long time);
@@ -1917,7 +1917,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
// is encountered plus at the end.
default:
}
-// Control (1-31), delete (127) or above 127
+// Control (1-31), delete (127) or above 127
} else {
// Write unchanged string parts
if (current > next) {
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 21f032847f..491fcb17fd 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -45,8 +45,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
private static final Log log =
LogFactory.getLog(CrawlerSessionManagerValve.class);
-private final Map clientIdSessionId = new
ConcurrentHashMap<>();
-private final Map sessionIdClientId = new
ConcurrentHashMap<>();
+private final Map clientIdSessionId = new
ConcurrentHashMap<>();
+private final Map sessionIdClientId = new
ConcurrentHashMap<>();
private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo!
Slurp.*|.*Feedfetcher-Google.*";
private Pattern uaPattern = null;
@@ -139,7 +139,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
}
-public Map getClientIpSessionId() {
+public Map getClientIpSessionId() {
return clientIdSessionId;
}
@@ -272,10 +272,10 @@ public class CrawlerSessionManagerValve extends ValveBase
{
private st
(tomcat) branch main updated: Code clean-up - formatting. No functional change.
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 43f42a327e Code clean-up - formatting. No functional change.
43f42a327e is described below
commit 43f42a327ef6992065d597a5f46e5119610e5841
Author: Mark Thomas
AuthorDate: Fri May 24 13:10:33 2024 +0100
Code clean-up - formatting. No functional change.
---
.../catalina/valves/AbstractAccessLogValve.java| 14 +-
.../valves/CrawlerSessionManagerValve.java | 10 +++
.../catalina/valves/ExtendedAccessLogValve.java| 10 +++
java/org/apache/catalina/valves/FilterValve.java | 5 ++--
.../apache/catalina/valves/JsonAccessLogValve.java | 32 --
.../catalina/valves/LoadBalancerDrainingValve.java | 4 +--
.../apache/catalina/valves/PersistentValve.java| 11
java/org/apache/catalina/valves/RemoteIpValve.java | 4 +--
.../org/apache/catalina/valves/SemaphoreValve.java | 3 +-
.../catalina/valves/StuckThreadDetectionValve.java | 11
10 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 50a5fbeeb2..a0f0163e9a 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -362,7 +362,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
private final Locale cacheDefaultLocale;
private final DateFormatCache parent;
protected final Cache cLFCache;
-private final Map formatCache = new HashMap<>();
+private final Map formatCache = new HashMap<>();
protected DateFormatCache(int size, Locale loc, DateFormatCache
parent) {
cacheSize = size;
@@ -409,14 +409,14 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Global date format cache.
*/
-private static final DateFormatCache globalDateCache = new
DateFormatCache(globalCacheSize, Locale.getDefault(),
-null);
+private static final DateFormatCache globalDateCache =
+new DateFormatCache(globalCacheSize, Locale.getDefault(), null);
/**
* Thread local date format cache.
*/
-private static final ThreadLocal localDateCache =
ThreadLocal
-.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
+private static final ThreadLocal localDateCache =
+ThreadLocal.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
/**
@@ -1339,7 +1339,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Append the time to the buffer in the appropriate format.
*
- * @param buf The buffer to append to.
+ * @param buf The buffer to append to.
* @param time The time to log in nanoseconds.
*/
public abstract void append(CharArrayWriter buf, long time);
@@ -1915,7 +1915,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
// is encountered plus at the end.
default:
}
-// Control (1-31), delete (127) or above 127
+// Control (1-31), delete (127) or above 127
} else {
// Write unchanged string parts
if (current > next) {
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 21f032847f..491fcb17fd 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -45,8 +45,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
private static final Log log =
LogFactory.getLog(CrawlerSessionManagerValve.class);
-private final Map clientIdSessionId = new
ConcurrentHashMap<>();
-private final Map sessionIdClientId = new
ConcurrentHashMap<>();
+private final Map clientIdSessionId = new
ConcurrentHashMap<>();
+private final Map sessionIdClientId = new
ConcurrentHashMap<>();
private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo!
Slurp.*|.*Feedfetcher-Google.*";
private Pattern uaPattern = null;
@@ -139,7 +139,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
}
-public Map getClientIpSessionId() {
+public Map getClientIpSessionId() {
return clientIdSessionId;
}
@@ -272,10 +272,10 @@ public class CrawlerSessionMana
(tomcat) branch main updated: Remove WebdavFixFilter
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 fe6a5a9a13 Remove WebdavFixFilter
fe6a5a9a13 is described below
commit fe6a5a9a13b875b6d4f1040ce0f9a198e9b9a56f
Author: Mark Thomas
AuthorDate: Fri May 24 13:06:17 2024 +0100
Remove WebdavFixFilter
---
.../apache/catalina/filters/WebdavFixFilter.java | 126 -
webapps/docs/changelog.xml | 2 +-
webapps/docs/config/filter.xml | 30 -
3 files changed, 1 insertion(+), 157 deletions(-)
diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java
b/java/org/apache/catalina/filters/WebdavFixFilter.java
deleted file mode 100644
index 7c50e35317..00
--- a/java/org/apache/catalina/filters/WebdavFixFilter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.
- */
-package org.apache.catalina.filters;
-
-import java.io.IOException;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.GenericFilter;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.tomcat.util.res.StringManager;
-
-/**
- * Filter that attempts to force MS WebDAV clients connecting on port 80 to
use a WebDAV client that actually works.
- * Other workarounds that might help include:
- *
- * Specifying the port, even if it is port 80, when trying to connect.
- * Cancelling the first authentication dialog box and then trying to
reconnect.
- *
- * Generally each different version of the MS client has a different set of
problems.
- *
- * TODO: Update this filter to recognise specific MS clients and apply the
appropriate workarounds for that particular
- * client
- *
- * As a filter, this is configured in web.xml like any other Filter. You
usually want to map this filter to whatever
- * your WebDAV servlet is mapped to.
- *
- * In addition to the issues fixed by this Filter, the following issues have
also been observed that cannot be fixed by
- * this filter. Where possible the filter will add an message to the logs.
- *
- * XP x64 SP2 (MiniRedir Version 3790)
- *
- * Only connects to port 80
- * Unknown issue means it doesn't work
- *
- *
- * @deprecated This will be removed in Tomcat 11 onwards. This filter is no
longer required. The WebDAV client in
- * Windows 10 / Windows Server 2012 onwards works correctly
without this filter.
- */
-@Deprecated
-public class WebdavFixFilter extends GenericFilter {
-
-private static final long serialVersionUID = 1L;
-protected static final StringManager sm =
StringManager.getManager(WebdavFixFilter.class);
-
-/* Start string for all versions */
-private static final String UA_MINIDIR_START =
"Microsoft-WebDAV-MiniRedir";
-/* XP 32-bit SP3 */
-private static final String UA_MINIDIR_5_1_2600 =
"Microsoft-WebDAV-MiniRedir/5.1.2600";
-
-/* XP 64-bit SP2 */
-private static final String UA_MINIDIR_5_2_3790 =
"Microsoft-WebDAV-MiniRedir/5.2.3790";
-
-/**
- * Check for the broken MS WebDAV client and if detected issue a re-direct
that hopefully will cause the non-broken
- * client to be used.
- */
-@Override
-public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
-throws IOException, ServletException {
-if (!(request instanceof HttpServletRequest) || !(response instanceof
HttpServletResponse)) {
-chain.doFilter(request, response);
-return;
-}
-HttpServletRequest httpRequest = ((HttpServletRequest) request);
-HttpServletResponse httpResponse = ((HttpServletResponse) response);
-String ua = httpRequest.getHeader("User-Agent");
-
-if (ua == null || ua.length() == 0 ||
!ua.startsWith(UA_MINIDIR_START)) {
-// No UA or starts
(tomcat) branch 9.0.x updated: Deprecate WebdavFixFilter
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 75cff6d27e Deprecate WebdavFixFilter
75cff6d27e is described below
commit 75cff6d27e415b99afb251067d7fcf125f72ba74
Author: Mark Thomas
AuthorDate: Fri May 24 13:03:13 2024 +0100
Deprecate WebdavFixFilter
---
java/org/apache/catalina/filters/WebdavFixFilter.java | 4
java/org/apache/catalina/servlets/WebdavServlet.java | 6 ++
webapps/docs/changelog.xml| 4
webapps/docs/config/filter.xml| 12 ++--
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java
b/java/org/apache/catalina/filters/WebdavFixFilter.java
index 1d1b555a58..c9d39e1e29 100644
--- a/java/org/apache/catalina/filters/WebdavFixFilter.java
+++ b/java/org/apache/catalina/filters/WebdavFixFilter.java
@@ -51,7 +51,11 @@ import org.apache.tomcat.util.res.StringManager;
* Only connects to port 80
* Unknown issue means it doesn't work
*
+ *
+ * @deprecated This will be removed in Tomcat 11 onwards. This filter is no
longer required. The WebDAV client in
+ * Windows 10 / Windows Server 2012 onwards works correctly
without this filter.
*/
+@Deprecated
public class WebdavFixFilter extends GenericFilter {
private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index ccdebc338e..1b5a4051ac 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -130,6 +130,12 @@ import org.xml.sax.SAXException;
* access will be able to edit content available via
http://host:port/context/content using
* http://host:port/context/webdavedit/content
*
+ *
+ * There are some known limitations of this Servlet due to it not implementing
the PROPPATCH method. Details of these
+ * limitations and progress towards addressing them are being tracked under
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=69046>bug
69046.
+ *
+ *
* @see https://tools.ietf.org/html/rfc4918;>RFC 4918
*/
public class WebdavServlet extends DefaultServlet implements
PeriodicEventListener {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c842f0077a..31a03720b3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,10 @@
Add support for shallow copies when using WebDAV. (markt)
+
+Deprecate the WebdavFixFilter as it is no longer required.
+ (markt)
+
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 12e70181de..8dcbd39ef8 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1997,12 +1997,12 @@
org.apache.catalina.filters.RequestDumperFilter.handlers = \
-Microsoft operating systems have two WebDAV clients. One is used with
-port 80, the other is used for all other ports. The implementation used
with
-port 80 does not adhere to the WebDAV specification and fails when trying
to
-communicate with the Tomcat WebDAV Servlet. This Filter provides a fix for
-this by forcing the use of the WebDAV implementation that works, even when
-connecting via port 80.
+This filter was written for Windows NT era Microsoft operating systems
+that shipped with WebDAV clients that were not compliant with the RFC. This
+filter is no longer required for current WebDAV clients provided by current
+(Windows 10 / Windows Server 2012 onwards) Windows operating systems. It
has
+been deprecated and will be removed in Tomcat 11 onwards.
+
-
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: Deprecate WebdavFixFilter
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 f4e06bde24 Deprecate WebdavFixFilter
f4e06bde24 is described below
commit f4e06bde249f2053e44e6ecbc65be9b4e4abcb36
Author: Mark Thomas
AuthorDate: Fri May 24 13:03:13 2024 +0100
Deprecate WebdavFixFilter
---
java/org/apache/catalina/filters/WebdavFixFilter.java | 4
java/org/apache/catalina/servlets/WebdavServlet.java | 6 ++
webapps/docs/changelog.xml| 4
webapps/docs/config/filter.xml| 12 ++--
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java
b/java/org/apache/catalina/filters/WebdavFixFilter.java
index 7e0c1198c8..7c50e35317 100644
--- a/java/org/apache/catalina/filters/WebdavFixFilter.java
+++ b/java/org/apache/catalina/filters/WebdavFixFilter.java
@@ -51,7 +51,11 @@ import org.apache.tomcat.util.res.StringManager;
* Only connects to port 80
* Unknown issue means it doesn't work
*
+ *
+ * @deprecated This will be removed in Tomcat 11 onwards. This filter is no
longer required. The WebDAV client in
+ * Windows 10 / Windows Server 2012 onwards works correctly
without this filter.
*/
+@Deprecated
public class WebdavFixFilter extends GenericFilter {
private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 121d2d6593..bff746db1e 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -131,6 +131,12 @@ import org.xml.sax.SAXException;
* access will be able to edit content available via
http://host:port/context/content using
* http://host:port/context/webdavedit/content
*
+ *
+ * There are some known limitations of this Servlet due to it not implementing
the PROPPATCH method. Details of these
+ * limitations and progress towards addressing them are being tracked under
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=69046>bug
69046.
+ *
+ *
* @see https://tools.ietf.org/html/rfc4918;>RFC 4918
*/
public class WebdavServlet extends DefaultServlet implements
PeriodicEventListener {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9892ca74cb..5a644959bb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,10 @@
Add support for shallow copies when using WebDAV. (markt)
+
+Deprecate the WebdavFixFilter as it is no longer required.
+ (markt)
+
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 12e70181de..8dcbd39ef8 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1997,12 +1997,12 @@
org.apache.catalina.filters.RequestDumperFilter.handlers = \
-Microsoft operating systems have two WebDAV clients. One is used with
-port 80, the other is used for all other ports. The implementation used
with
-port 80 does not adhere to the WebDAV specification and fails when trying
to
-communicate with the Tomcat WebDAV Servlet. This Filter provides a fix for
-this by forcing the use of the WebDAV implementation that works, even when
-connecting via port 80.
+This filter was written for Windows NT era Microsoft operating systems
+that shipped with WebDAV clients that were not compliant with the RFC. This
+filter is no longer required for current WebDAV clients provided by current
+(Windows 10 / Windows Server 2012 onwards) Windows operating systems. It
has
+been deprecated and will be removed in Tomcat 11 onwards.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Deprecate WebdavFixFilter
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 931fffe040 Deprecate WebdavFixFilter
931fffe040 is described below
commit 931fffe0402cc821b6214a7e98c654a073cfc138
Author: Mark Thomas
AuthorDate: Fri May 24 13:03:13 2024 +0100
Deprecate WebdavFixFilter
---
java/org/apache/catalina/filters/WebdavFixFilter.java | 4
java/org/apache/catalina/servlets/WebdavServlet.java | 6 ++
webapps/docs/changelog.xml| 4
webapps/docs/config/filter.xml| 12 ++--
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java
b/java/org/apache/catalina/filters/WebdavFixFilter.java
index 7e0c1198c8..7c50e35317 100644
--- a/java/org/apache/catalina/filters/WebdavFixFilter.java
+++ b/java/org/apache/catalina/filters/WebdavFixFilter.java
@@ -51,7 +51,11 @@ import org.apache.tomcat.util.res.StringManager;
* Only connects to port 80
* Unknown issue means it doesn't work
*
+ *
+ * @deprecated This will be removed in Tomcat 11 onwards. This filter is no
longer required. The WebDAV client in
+ * Windows 10 / Windows Server 2012 onwards works correctly
without this filter.
*/
+@Deprecated
public class WebdavFixFilter extends GenericFilter {
private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 121d2d6593..bff746db1e 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -131,6 +131,12 @@ import org.xml.sax.SAXException;
* access will be able to edit content available via
http://host:port/context/content using
* http://host:port/context/webdavedit/content
*
+ *
+ * There are some known limitations of this Servlet due to it not implementing
the PROPPATCH method. Details of these
+ * limitations and progress towards addressing them are being tracked under
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=69046>bug
69046.
+ *
+ *
* @see https://tools.ietf.org/html/rfc4918;>RFC 4918
*/
public class WebdavServlet extends DefaultServlet implements
PeriodicEventListener {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c49c0f82b4..16719d7d40 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,10 @@
Add support for shallow copies when using WebDAV. (markt)
+
+Deprecate the WebdavFixFilter as it is no longer required.
+ (markt)
+
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index ad11b5df74..cbae9e59e3 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1943,12 +1943,12 @@
org.apache.catalina.filters.RequestDumperFilter.handlers = \
-Microsoft operating systems have two WebDAV clients. One is used with
-port 80, the other is used for all other ports. The implementation used
with
-port 80 does not adhere to the WebDAV specification and fails when trying
to
-communicate with the Tomcat WebDAV Servlet. This Filter provides a fix for
-this by forcing the use of the WebDAV implementation that works, even when
-connecting via port 80.
+This filter was written for Windows NT era Microsoft operating systems
+that shipped with WebDAV clients that were not compliant with the RFC. This
+filter is no longer required for current WebDAV clients provided by current
+(Windows 10 / Windows Server 2012 onwards) Windows operating systems. It
has
+been deprecated and will be removed in Tomcat 11 onwards.
+
-
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: Update Commons Daemon to 1.4.0
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 3171eb1208 Update Commons Daemon to 1.4.0
3171eb1208 is described below
commit 3171eb1208f3a9d6902b270b6d6c00373b40e8a0
Author: Mark Thomas
AuthorDate: Fri May 24 11:20:52 2024 +0100
Update Commons Daemon to 1.4.0
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 24ead36e9b..847ff1047a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -193,20 +193,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.3.4
+commons-daemon.version=1.4.0
-# checksum for commons-daemon-1.3.4-bin.tar.gz
+# checksum for commons-daemon-1.4.0-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=adc301fe9c7e50c5ed71c6775c8c41c33a369a05c30785ccb81209089603ae66563e958b466c99fc5cd27c12625bb7def68d7d91933aa8739eb645af37f3d03e
+commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=3c10ca72fc0eb7f755c0b5452bb6d5e8b42d8f363767ffcd9a6f0883026e688ea7dff50ea05e2675a7cdf9f413cb8012ee6b79e16dfc1cd4d83bd775ea10216c
+commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=57a59d402dd0a1c99ed5da062b4616d54679e4208abec8b25742f5bf3ec1ee6b5187bc830edeaa218766215371b5519ce0a7186325c929c86b567a3078aa7555
+commons-daemon.native.win.checksum.value=5974d638994cbf821c17d0fc6b69bace08b0314ea5614c1a57175a02cda7c57a6b8ee49f8892206061f9d3385da5841db31d9ce9b3ce74cf4afc10ad8e68
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 541b3a9613..c842f0077a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,9 @@
Revert Derby to 10.16.1.1 as that is the latest version of Derby that
runs on Java 17. (markt)
+
+Update to Commons Daemon 1.4.0. (markt)
+
-
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: Update Commons Daemon to 1.4.0
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 75ff874b2b Update Commons Daemon to 1.4.0
75ff874b2b is described below
commit 75ff874b2b47e6243ba714c919ba3340a421956b
Author: Mark Thomas
AuthorDate: Fri May 24 11:20:52 2024 +0100
Update Commons Daemon to 1.4.0
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0955cbea0e..f21deda735 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -191,20 +191,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.3.4
+commons-daemon.version=1.4.0
-# checksum for commons-daemon-1.3.4-bin.tar.gz
+# checksum for commons-daemon-1.4.0-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=adc301fe9c7e50c5ed71c6775c8c41c33a369a05c30785ccb81209089603ae66563e958b466c99fc5cd27c12625bb7def68d7d91933aa8739eb645af37f3d03e
+commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=3c10ca72fc0eb7f755c0b5452bb6d5e8b42d8f363767ffcd9a6f0883026e688ea7dff50ea05e2675a7cdf9f413cb8012ee6b79e16dfc1cd4d83bd775ea10216c
+commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=57a59d402dd0a1c99ed5da062b4616d54679e4208abec8b25742f5bf3ec1ee6b5187bc830edeaa218766215371b5519ce0a7186325c929c86b567a3078aa7555
+commons-daemon.native.win.checksum.value=5974d638994cbf821c17d0fc6b69bace08b0314ea5614c1a57175a02cda7c57a6b8ee49f8892206061f9d3385da5841db31d9ce9b3ce74cf4afc10ad8e68
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a4390d3cd..9892ca74cb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,9 @@
Revert Derby to 10.16.1.1 as that is the latest version of Derby that
runs on Java 17. (markt)
+
+Update to Commons Daemon 1.4.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update Commons Daemon to 1.4.0
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 92c681994d Update Commons Daemon to 1.4.0
92c681994d is described below
commit 92c681994da6a7881337d0f5a7071f109903c808
Author: Mark Thomas
AuthorDate: Fri May 24 11:20:52 2024 +0100
Update Commons Daemon to 1.4.0
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 45a0e6d5d4..b651b26eff 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -170,20 +170,20 @@
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
# - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.3.4
+commons-daemon.version=1.4.0
-# checksum for commons-daemon-1.3.4-bin.tar.gz
+# checksum for commons-daemon-1.4.0-bin.tar.gz
commons-daemon.bin.checksum.enabled=true
commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=adc301fe9c7e50c5ed71c6775c8c41c33a369a05c30785ccb81209089603ae66563e958b466c99fc5cd27c12625bb7def68d7d91933aa8739eb645af37f3d03e
+commons-daemon.bin.checksum.value=15fccd35a711f91e5b4466d56f50585c7ae3a787a39c16e006617c86b9e9feee9fbf902582b08c2e896ca6a655500d805fdbb9c97f04f70321631168b8d42c81
# checksums for commons-daemon-1.3.4-native-src.tar.gz,
commons-daemon-1.3.4-bin-windows.zip
commons-daemon.native.src.checksum.enabled=true
commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=3c10ca72fc0eb7f755c0b5452bb6d5e8b42d8f363767ffcd9a6f0883026e688ea7dff50ea05e2675a7cdf9f413cb8012ee6b79e16dfc1cd4d83bd775ea10216c
+commons-daemon.native.src.checksum.value=8a54200d547ef7ee647e8d4910fd3cb55bf7d8fc75de8f0e01bc701ef0b386ddc3843e6c9189e34d2afd62060fb6299ea83c421cf60c7d105d04cb45904500d3
commons-daemon.native.win.checksum.enabled=true
commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=57a59d402dd0a1c99ed5da062b4616d54679e4208abec8b25742f5bf3ec1ee6b5187bc830edeaa218766215371b5519ce0a7186325c929c86b567a3078aa7555
+commons-daemon.native.win.checksum.value=5974d638994cbf821c17d0fc6b69bace08b0314ea5614c1a57175a02cda7c57a6b8ee49f8892206061f9d3385da5841db31d9ce9b3ce74cf4afc10ad8e68
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aa3966382c..c49c0f82b4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,9 @@
Revert Derby to 10.16.1.1 as that is the latest version of Derby that
runs on Java 17. (markt)
+
+Update to Commons Daemon 1.4.0. (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: Remove export / backport code - no longer required for 9.0.x
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 fe768c5655 Remove export / backport code - no longer required for 9.0.x
fe768c5655 is described below
commit fe768c565572037d70afd32c0de81d0accb44718
Author: Mark Thomas
AuthorDate: Thu May 23 13:36:41 2024 +0100
Remove export / backport code - no longer required for 9.0.x
---
.../tomcat/buildutil/translate/BackportBase.java | 65
.../buildutil/translate/BackportEnglish.java | 67
.../buildutil/translate/BackportTranslations.java | 68 -
.../tomcat/buildutil/translate/Constants.java | 2 -
.../apache/tomcat/buildutil/translate/Utils.java | 89 --
.../tomcat/buildutil/translate/TestUtils.java | 18 -
6 files changed, 309 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportBase.java
b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
deleted file mode 100644
index 1a7ab7ed8e..00
--- a/java/org/apache/tomcat/buildutil/translate/BackportBase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tomcat.buildutil.translate;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Base class providing common implementation for back-port utilities.
- */
-public abstract class BackportBase {
-
-protected final Map sourceTranslations = new
HashMap<>();
-protected final Map targetTranslations = new
HashMap<>();
-protected final File targetRoot;
-protected final Properties sourceEnglish;
-protected final Properties targetEnglish;
-protected final File storageDir;
-
-protected BackportBase(String... args) throws IOException {
-if (args.length != 1) {
-throw new IllegalArgumentException("Missing back-port target");
-}
-targetRoot = new File(args[0]);
-
-if (!targetRoot.isDirectory()) {
-throw new IllegalArgumentException("Back-port target not a
directory");
-}
-
-File sourceRoot = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(sourceRoot, directory, sourceTranslations);
-}
-
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(targetRoot, dir);
-Utils.processDirectory(targetRoot, directory, targetTranslations);
-}
-
-sourceEnglish = sourceTranslations.get("");
-targetEnglish = targetTranslations.get("");
-
-storageDir = new File(targetRoot, Constants.STORAGE_DIR);
-}
-
-protected abstract void execute() throws IOException;
-}
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
deleted file mode 100644
index 8fd8b61a3e..00
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- */
-package or
(tomcat) 01/02: Add support for shallow copies when using WebDAV
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5ba3e76797babe431f16878825e2a6a192e18863
Author: Mark Thomas
AuthorDate: Tue May 21 12:54:40 2024 +0100
Add support for shallow copies when using WebDAV
---
.../apache/catalina/servlets/WebdavServlet.java| 31 +-
webapps/docs/changelog.xml | 7 +
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index fe26facb05..c5a4111f51 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1518,7 +1518,20 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
Map errorList = new HashMap<>();
-boolean result = copyResource(errorList, path, destinationPath);
+boolean infiniteCopy = true;
+String depthHeader = req.getHeader("Depth");
+if (depthHeader != null) {
+if (depthHeader.equals("infinity")) {
+// NO-OP - this is the default
+} else if (depthHeader.equals("0")) {
+infiniteCopy = false;
+} else {
+resp.sendError(WebdavStatus.SC_BAD_REQUEST);
+return false;
+}
+}
+
+boolean result = copyResource(errorList, path, destinationPath,
infiniteCopy);
if ((!result) || (!errorList.isEmpty())) {
if (errorList.size() == 1) {
@@ -1547,16 +1560,18 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
/**
* Copy a collection.
*
- * @param errorList Hashtable containing the list of errors which occurred
during the copy operation
- * @param sourcePath of the resource to be copied
- * @param dest Destination path
+ * @param errorListMap containing the list of errors which occurred
during the copy operation
+ * @param source Path of the resource to be copied
+ * @param dest Destination path
+ * @param infiniteCopy {@code true} if this copy is to be an infinite
copy, otherwise {@code false} for a shallow
+ * copy
*
* @return true if the copy was successful
*/
-private boolean copyResource(Map errorList, String source,
String dest) {
+private boolean copyResource(Map errorList, String source,
String dest, boolean infiniteCopy) {
if (debug > 1) {
-log("Copy: " + source + " To: " + dest);
+log("Copy: " + source + " To: " + dest + " Infinite: " +
infiniteCopy);
}
WebResource sourceResource = resources.getResource(source);
@@ -1582,7 +1597,9 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
childSrc += "/";
}
childSrc += entry;
-copyResource(errorList, childSrc, childDest);
+if (infiniteCopy) {
+copyResource(errorList, childSrc, childDest, true);
+}
}
} else if (sourceResource.isFile()) {
WebResource destResource = resources.getResource(dest);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 956a1af8fc..541b3a9613 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Add support for shallow copies when using WebDAV. (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 (f6d7d02984 -> 365535db88)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from f6d7d02984 Sync FFM for 9.0 new 5ba3e76797 Add support for shallow copies when using WebDAV new 365535db88 Move infinite copy test to include all recurrsive code The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/catalina/servlets/WebdavServlet.java| 53 ++ webapps/docs/changelog.xml | 7 +++ 2 files changed, 42 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Move infinite copy test to include all recurrsive code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 365535db8833cf0c36342c9c2633ea4d4eecad63
Author: Mark Thomas
AuthorDate: Thu May 23 13:26:46 2024 +0100
Move infinite copy test to include all recurrsive code
Review by kkolinko
---
.../apache/catalina/servlets/WebdavServlet.java| 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index c5a4111f51..ccdebc338e 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1585,19 +1585,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
}
-String[] entries = resources.list(source);
-for (String entry : entries) {
-String childDest = dest;
-if (!childDest.equals("/")) {
-childDest += "/";
-}
-childDest += entry;
-String childSrc = source;
-if (!childSrc.equals("/")) {
-childSrc += "/";
-}
-childSrc += entry;
-if (infiniteCopy) {
+if (infiniteCopy) {
+String[] entries = resources.list(source);
+for (String entry : entries) {
+String childDest = dest;
+if (!childDest.equals("/")) {
+childDest += "/";
+}
+childDest += entry;
+String childSrc = source;
+if (!childSrc.equals("/")) {
+childSrc += "/";
+}
+childSrc += entry;
copyResource(errorList, childSrc, childDest, true);
}
}
-
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: Move infinite copy test to include all recurrsive code
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 09163e5985 Move infinite copy test to include all recurrsive code
09163e5985 is described below
commit 09163e5985c003bd5f33886614a72ffa1ae04f11
Author: Mark Thomas
AuthorDate: Thu May 23 13:26:46 2024 +0100
Move infinite copy test to include all recurrsive code
Review by kkolinko
---
.../apache/catalina/servlets/WebdavServlet.java| 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index b1b67030af..121d2d6593 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1586,19 +1586,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
}
-String[] entries = resources.list(source);
-for (String entry : entries) {
-String childDest = dest;
-if (!childDest.equals("/")) {
-childDest += "/";
-}
-childDest += entry;
-String childSrc = source;
-if (!childSrc.equals("/")) {
-childSrc += "/";
-}
-childSrc += entry;
-if (infiniteCopy) {
+if (infiniteCopy) {
+String[] entries = resources.list(source);
+for (String entry : entries) {
+String childDest = dest;
+if (!childDest.equals("/")) {
+childDest += "/";
+}
+childDest += entry;
+String childSrc = source;
+if (!childSrc.equals("/")) {
+childSrc += "/";
+}
+childSrc += entry;
copyResource(errorList, childSrc, childDest, true);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Move infinite copy test to include all recurrsive code
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 5b6258fb09 Move infinite copy test to include all recurrsive code
5b6258fb09 is described below
commit 5b6258fb096c2bd80ca0a944631efc887cb2b2e6
Author: Mark Thomas
AuthorDate: Thu May 23 13:26:46 2024 +0100
Move infinite copy test to include all recurrsive code
Review by kkolinko
---
.../apache/catalina/servlets/WebdavServlet.java| 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index b1b67030af..121d2d6593 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1586,19 +1586,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
}
-String[] entries = resources.list(source);
-for (String entry : entries) {
-String childDest = dest;
-if (!childDest.equals("/")) {
-childDest += "/";
-}
-childDest += entry;
-String childSrc = source;
-if (!childSrc.equals("/")) {
-childSrc += "/";
-}
-childSrc += entry;
-if (infiniteCopy) {
+if (infiniteCopy) {
+String[] entries = resources.list(source);
+for (String entry : entries) {
+String childDest = dest;
+if (!childDest.equals("/")) {
+childDest += "/";
+}
+childDest += entry;
+String childSrc = source;
+if (!childSrc.equals("/")) {
+childSrc += "/";
+}
+childSrc += entry;
copyResource(errorList, childSrc, childDest, true);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917857 - /tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt
Author: markt Date: Tue May 21 15:26:48 2024 New Revision: 1917857 URL: http://svn.apache.org/viewvc?rev=1917857=rev Log: Fix another typo Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt?rev=1917857=1917856=1917857=diff == --- tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt (original) +++ tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Tue May 21 15:26:48 2024 @@ -22,7 +22,7 @@ TCK Version, digital SHA-256 fingerprint Implementation runtime Version(s) tested: Apache Tomcat - 11.0.0-M120 + 11.0.0-M20 Public URL of TCK Results Summary: https://tomcat.apache.org/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917856 - /tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt
Author: markt Date: Tue May 21 15:25:28 2024 New Revision: 1917856 URL: http://svn.apache.org/viewvc?rev=1917856=rev Log: Fix typo Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Modified: tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt?rev=1917856=1917855=1917856=diff == --- tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt (original) +++ tomcat/site/trunk/docs/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Tue May 21 15:25:28 2024 @@ -25,7 +25,7 @@ Implementation runtime Version(s) tested 11.0.0-M120 Public URL of TCK Results Summary: - https://tomcat.apache.org/tck/servlet-6.1.0-tomcat-11.0.0-M120.txt + https://tomcat.apache.org/tck/servlet-6.1.0-tomcat-11.0.0-M20.txt Any Additional Specification Certification Requirements: None - 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: Add support for shallow copies when using WebDAV
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 22a5e178b3 Add support for shallow copies when using WebDAV
22a5e178b3 is described below
commit 22a5e178b3d9daed870d2d4f82dab242bc5eb3d2
Author: Mark Thomas
AuthorDate: Tue May 21 12:54:40 2024 +0100
Add support for shallow copies when using WebDAV
---
.../apache/catalina/servlets/WebdavServlet.java| 31 +-
webapps/docs/changelog.xml | 7 +
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index a489eb0e51..b1b67030af 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1519,7 +1519,20 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
Map errorList = new HashMap<>();
-boolean result = copyResource(errorList, path, destinationPath);
+boolean infiniteCopy = true;
+String depthHeader = req.getHeader("Depth");
+if (depthHeader != null) {
+if (depthHeader.equals("infinity")) {
+// NO-OP - this is the default
+} else if (depthHeader.equals("0")) {
+infiniteCopy = false;
+} else {
+resp.sendError(WebdavStatus.SC_BAD_REQUEST);
+return false;
+}
+}
+
+boolean result = copyResource(errorList, path, destinationPath,
infiniteCopy);
if ((!result) || (!errorList.isEmpty())) {
if (errorList.size() == 1) {
@@ -1548,16 +1561,18 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
/**
* Copy a collection.
*
- * @param errorList Map containing the list of errors which occurred
during the copy operation
- * @param sourcePath of the resource to be copied
- * @param dest Destination path
+ * @param errorListMap containing the list of errors which occurred
during the copy operation
+ * @param source Path of the resource to be copied
+ * @param dest Destination path
+ * @param infiniteCopy {@code true} if this copy is to be an infinite
copy, otherwise {@code false} for a shallow
+ * copy
*
* @return true if the copy was successful
*/
-private boolean copyResource(Map errorList, String source,
String dest) {
+private boolean copyResource(Map errorList, String source,
String dest, boolean infiniteCopy) {
if (debug > 1) {
-log("Copy: " + source + " To: " + dest);
+log("Copy: " + source + " To: " + dest + " Infinite: " +
infiniteCopy);
}
WebResource sourceResource = resources.getResource(source);
@@ -1583,7 +1598,9 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
childSrc += "/";
}
childSrc += entry;
-copyResource(errorList, childSrc, childDest);
+if (infiniteCopy) {
+copyResource(errorList, childSrc, childDest, true);
+}
}
} else if (sourceResource.isFile()) {
WebResource destResource = resources.getResource(dest);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9b8066ddd3..3a4390d3cd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Add support for shallow copies when using WebDAV. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add support for shallow copies when using WebDAV
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 4176706761 Add support for shallow copies when using WebDAV
4176706761 is described below
commit 4176706761242851b14be303daf2a00ef385ee49
Author: Mark Thomas
AuthorDate: Tue May 21 12:54:40 2024 +0100
Add support for shallow copies when using WebDAV
---
.../apache/catalina/servlets/WebdavServlet.java| 31 +-
webapps/docs/changelog.xml | 7 +
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index a489eb0e51..b1b67030af 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1519,7 +1519,20 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
Map errorList = new HashMap<>();
-boolean result = copyResource(errorList, path, destinationPath);
+boolean infiniteCopy = true;
+String depthHeader = req.getHeader("Depth");
+if (depthHeader != null) {
+if (depthHeader.equals("infinity")) {
+// NO-OP - this is the default
+} else if (depthHeader.equals("0")) {
+infiniteCopy = false;
+} else {
+resp.sendError(WebdavStatus.SC_BAD_REQUEST);
+return false;
+}
+}
+
+boolean result = copyResource(errorList, path, destinationPath,
infiniteCopy);
if ((!result) || (!errorList.isEmpty())) {
if (errorList.size() == 1) {
@@ -1548,16 +1561,18 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
/**
* Copy a collection.
*
- * @param errorList Map containing the list of errors which occurred
during the copy operation
- * @param sourcePath of the resource to be copied
- * @param dest Destination path
+ * @param errorListMap containing the list of errors which occurred
during the copy operation
+ * @param source Path of the resource to be copied
+ * @param dest Destination path
+ * @param infiniteCopy {@code true} if this copy is to be an infinite
copy, otherwise {@code false} for a shallow
+ * copy
*
* @return true if the copy was successful
*/
-private boolean copyResource(Map errorList, String source,
String dest) {
+private boolean copyResource(Map errorList, String source,
String dest, boolean infiniteCopy) {
if (debug > 1) {
-log("Copy: " + source + " To: " + dest);
+log("Copy: " + source + " To: " + dest + " Infinite: " +
infiniteCopy);
}
WebResource sourceResource = resources.getResource(source);
@@ -1583,7 +1598,9 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
childSrc += "/";
}
childSrc += entry;
-copyResource(errorList, childSrc, childDest);
+if (infiniteCopy) {
+copyResource(errorList, childSrc, childDest, true);
+}
}
} else if (sourceResource.isFile()) {
WebResource destResource = resources.getResource(dest);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 777667c181..aa3966382c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Add support for shallow copies when using WebDAV. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x updated: Add to changelog that the recommended minimum version of OpenSSL has been updated to 3.0.13.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.3.x by this push: new da47133df Add to changelog that the recommended minimum version of OpenSSL has been updated to 3.0.13. da47133df is described below commit da47133df8964eb2e3f21c9ddffb0b9fa5c35439 Author: Dimitrios Soumis AuthorDate: Tue May 21 12:37:26 2024 +0300 Add to changelog that the recommended minimum version of OpenSSL has been updated to 3.0.13. --- xdocs/miscellaneous/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index d88705ed6..4e62e78ac 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -69,6 +69,9 @@ Remove NPN support as NPN was never standardised and browser support was removed in 2019. (markt) + + Update the recommended minimum version of OpenSSL to 3.0.13. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: Add Changes in 1.3.x section
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-native.git The following commit(s) were added to refs/heads/main by this push: new 6f7ce1e41 Add Changes in 1.3.x section 6f7ce1e41 is described below commit 6f7ce1e4110481b271871733e0d65b59f3532035 Author: Dimitrios Soumis AuthorDate: Tue May 21 12:22:02 2024 +0300 Add Changes in 1.3.x section --- xdocs/miscellaneous/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 5ee7eacf0..9127260c1 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -203,6 +203,10 @@ + +Please see the 1.3.x + changelog. + Please see the 1.2.x changelog. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917848 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Tue May 21 08:25:14 2024 New Revision: 1917848 URL: http://svn.apache.org/viewvc?rev=1917848=rev Log: Remove Tomcat Native 1.2.x from download area Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1917848=1917847=1917848=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Tue May 21 08:25:14 2024 @@ -14,12 +14,9 @@ [define vo]3.0.13[end] [define w]1.3.0[end] [define wo]3.0.13[end] -[define x]1.2.39[end] -[define xo]3.0.11[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS;>KEYS | [v] | [w] | - [x] | Browse | https://archive.apache.org/dist/tomcat/tomcat-connectors/native;>Archives Release Integrity @@ -151,57 +148,6 @@ - -[x] - For more information concerning Tomcat Native 1.2.x, see the - http://tomcat.apache.org/native-1.2-doc/; class="name">Tomcat - Native site. - - Source Distributions -Please choose the correct format for your platform. - - -tar.gz -- e.g. Unix, Linux, Mac OS -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/source/tomcat-native-[x]-src.tar.gz.asc;>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/source/tomcat-native-[x]-src.tar.gz.sha512;>SHA512) - - -zip -- e.g. Windows -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/source/tomcat-native-[x]-win32-src.zip.asc;>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/source/tomcat-native-[x]-win32-src.zip.sha512;>SHA512) - - - - - Binary Distributions -Binaries are provided for Microsoft Windows. The Windows binaries are -available in two variants. The standard variant is what people usually -use. This version of the library is included in the Apache Tomcat -distributions. The OCSP-enabled variant has enabled support for -verification of client SSL certificates via the OCSP protocol -(https://bz.apache.org/bugzilla/show_bug.cgi?id=45392;>45392). -Each archive contains tcnative-1.dll for 32-bit (x86) -and 64-bit (x64) CPU architectures. You have to use the DLL that matches -CPU architecture of JVM that you use to run Tomcat. -These binaries were built with OpenSSL [xo]. - - -Standard -zip -- recommended -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/binaries/tomcat-native-[x]-openssl-[xo]-win32-bin.zip.asc;>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/binaries/tomcat-native-[x]-openssl-[xo]-win32-bin.zip.sha512;>SHA512) - - -OCSP enabled -zip -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/binaries/tomcat-native-[x]-openssl-[xo]-ocsp-win32-bin.zip.asc;>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/binaries/tomcat-native-[x]-openssl-[xo]-ocsp-win32-bin.zip.sha512;>SHA512) - - - Copyright 1999-2024, The Apache Software Foundation Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1917848=1917847=1917848=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Tue May 21 08:25:14 2024 @@ -26,12 +26,9 @@ [define vo]3.0.13[end] [define w]1.3.0[end] [define wo]3.0.13[end] -[define x]1.2.39[end] -[define xo]3.0.11[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS;>KEYS | [v] | [w] | - [x] | Browse | https://archive.apache.org/dist/tomcat/tomcat-connectors/native;>Archives @@ -174,59 +171,6 @@ - - - - - For more information concerning Tomcat Native 1.2.x, see the - http://tomcat.apache.org/native-1.2-doc/; class="name">Tomcat - Native site. - - -Please choose the correct format for your platform. - - -tar.gz -- e.g. Unix, Linux, Mac OS -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[x]/source/tomcat-native-[x]-src.tar.gz.asc;>PGP, -https://downloads.apache.org/tomcat/tomcat-conn
svn commit: r1917847 [4/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-10.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/migration-10.html (original) +++ tomcat/site/trunk/docs/migration-10.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Migration Guide - Tomcat 10.0.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/S upportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.ap ache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5Upgradinghref="./connectors-doc/index.html">Tomcat Connectorshref="./native-doc/index.html">Tomcat Native 2href="./native-1.3-doc/index.html">Tomcat Native 1.3href="./native-1.2-doc/index.html">Tomcat Native 1.2href="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug >DatabaseIRCGet >InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support >Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Table_of_Contents">Table of Contents +Apache Tomcat - Migration Guide - Tomcat 10.0.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/S upportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.ap ache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5Upgradinghref="./connectors-doc/index.html">Tomcat Connectorshref="./native-doc/index.html">Tomcat Native 2href="./native-1.3-doc/index.html">Tomcat Native 1.3href="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug >DatabaseIRCGet >InvolvedOverviewhref="./source.html ">Source codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache
svn commit: r1917847 [10/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/tomcat-55-eol.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/tomcat-55-eol.html (original) +++ tomcat/site/trunk/docs/tomcat-55-eol.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - End of life for Apache Tomcat 5.5.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/imag es/SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomca t.apache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5 UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet Involved OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacy https://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContent2011-08-10 End of life for Apache Tomcat 5.5.x +Apache Tomcat - End of life for Apache Tomcat 5.5.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/imag es/SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomca t.apache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5 UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.htm l">Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContent2011-08-10 End of life for Apache Tomcat 5.5.x The Apache Tomcat team announces that support for Apache Tomcat 5.5.x will end on 30 September 2012. Modified: tomcat/site/trunk/docs/tomcat-60-eol.html URL:
svn commit: r1917847 [11/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Which Version Do I Want?https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing .html" target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownload< a href="./whichversion.html">Which version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug Database IRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentApache Tomcat Versions +Apache Tomcat - Which Version Do I Want?https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing .html" target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownload< a href="./whichversion.html">Which version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>P rivacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentApache Tomcat Versions Apache Tomcat is an open source software implementation of a subset of the Jakarta EE (formally Java EE) technologies. Different versions of Apache Tomcat are available for different versions of the specifications. The Modified:
svn commit: r1917847 [5/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Migration Guidehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-sma ll.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/downloa d-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentBefore upgrading or migrating +Apache Tomcat - Migration Guidehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-sma ll.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/downloa d-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothref="https://cwiki.apache.org/confluence/x/vIPzBQ;>Translations href="./tools.html">ToolsMediahref="https://twitter.com/theapachetomcat;>Twitterhref="https://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehref="https://blogs.apache.org/tomcat/;>BlogMisc href="./whoweare.html">Who We Arehref="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>Swag href="./heritage.html">Heritagehref="http://www.apache.org;>Apache Homehref="./resources.html">Resourceshref="./contact.html">Contacthref="./legal.html">Legalhref="https://privacy.apache.org/policies/privacy-policy-public.html;>Privacy href="https://www.apache.org/foundation/contributing.html;>Support Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Before_upgrading_or_migrating">Before upgrading or migratingclass="text"> When updating from one major Apache Tomcat version a newer one, please make sure that the JVM that is installed on your
svn commit: r1917847 [9/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-jk.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/security-jk.html (original) +++ tomcat/site/trunk/docs/security-jk.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Apache Tomcat JK Connectors vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache. org/images/SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet Involved OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Pri vacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents +Apache Tomcat - Apache Tomcat JK Connectors vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache. org/images/SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contribu ting.html">Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents Apache Tomcat JK Connectors vulnerabilitiesFixed in Apache Tomcat JK Connector 1.2.49Fixed in Apache Tomcat JK Connector 1.2.46Fixed in Apache Tomcat JK Connector 1.2.43Fixed in Apache Tomcat JK Connector 1.2.42Fixed in Apache Tomcat JK Connector 1.2.41Fixed in Apache Tomcat JK Connector 1.2.27Fixed in Apache Tomcat JK Connector 1.2.23Fixed in Apache Tomcat JK
svn commit: r1917847 [8/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Apache Tomcat 4.x vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images /SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat. apache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentApache Tomcat 4.x vulnerabilities +Apache Tomcat - Apache Tomcat 4.x vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images /SupportApache-small.png" class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat. apache.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html; >Support Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Apache_Tomcat_4.x_vulnerabilities">Apache Tomcat 4.x >vulnerabilities This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 4.x. Each vulnerability is given a security impact rating by the Apache Modified:
svn commit: r1917847 [6/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2016.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/oldnews-2016.html (original) +++ tomcat/site/trunk/docs/oldnews-2016.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.c gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news +Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.c gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource code Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apache https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news Announcements from previous years can be found here: year 2024 Modified: tomcat/site/trunk/docs/oldnews-2017.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/oldnews-2017.html (original) +++ tomcat/site/trunk/docs/oldnews-2017.html Tue May 21
svn commit: r1917847 [7/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2023.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2023.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/oldnews-2023.html (original) +++ tomcat/site/trunk/docs/oldnews-2023.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.c gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>PrivacySupport Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news +Apache Tomcat - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.c gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource code Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apache https://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOlder news Announcements from previous years can be found here: year 2024 Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue May 21 08:23:45 2024 @@ -1,5
svn commit: r1917847 [1/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Author: markt Date: Tue May 21 08:23:45 2024 New Revision: 1917847 URL: http://svn.apache.org/viewvc?rev=1917847=rev Log: Remove links to Tomcat Native 1.2.x Removed: tomcat/site/trunk/native-1.2-xdocs/ Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-10.html tomcat/site/trunk/docs/download-11.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-migration.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-10.1.html tomcat/site/trunk/docs/migration-10.html tomcat/site/trunk/docs/migration-11.0.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2017.html tomcat/site/trunk/docs/oldnews-2018.html tomcat/site/trunk/docs/oldnews-2019.html tomcat/site/trunk/docs/oldnews-2020.html tomcat/site/trunk/docs/oldnews-2021.html tomcat/site/trunk/docs/oldnews-2022.html tomcat/site/trunk/docs/oldnews-2023.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-10.html tomcat/site/trunk/docs/security-11.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/source.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-10.0-eol.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tomcat-70-eol.html tomcat/site/trunk/docs/tomcat-80-eol.html tomcat/site/trunk/docs/tomcat-85-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/upgrading.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/stylesheets/project.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Reporting Bugshttps://www.apachecon.com/event-images/snippet.js"</a>;>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png " class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.c gi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDo
svn commit: r1917847 [3/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/heritage.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/heritage.html (original) +++ tomcat/site/trunk/docs/heritage.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Heritagehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://to mcat.apache.org/download-10.cgi">Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSourc e codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentThe Tomcat Story +Apache Tomcat - Heritagehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://to mcat.apache.org/download-10.cgi">Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponso rship.html">Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentThe Tomcat Story The Tomcat projects started at http://www.sun.com; rel="nofollow"> Sun Microsystems as the reference implementation of the Java Servlet and Java Server Pages Specifications. The Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1917847=1917846=1917847=diff
svn commit: r1917847 [2/11] - in /tomcat/site/trunk: docs/ native-1.2-xdocs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1917847=1917846=1917847=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Tue May 21 08:23:45 2024 @@ -1,5 +1,5 @@ -Apache Tomcat - Apache Tomcat 9 Software Downloadshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt=" Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat Connectorshref="./native-doc/index.html">Tomcat Native 2href="./native-1.3-doc/index.html">Tomcat Native 1.3href="./native-1.2-doc/index.html">Tomcat Native 1.2href="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug >DatabaseIRCGet >InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/c ontributing.html">Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTomcat 9 Software Downloads +Apache Tomcat - Apache Tomcat 9 Software Downloadshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt=" Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-11.cgi;>Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat Connectorshref="./native-doc/index.html">Tomcat Native 2href="./native-1.3-doc/index.html">Tomcat Native 1.3href="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug >DatabaseIRCGet >InvolvedOverviewhref="./source.html">Source codeBui ldbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support
(tomcat-native) 02/02: Remove references to JAVA_PLATFORM and very old Java versions
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit a863fa1b726fbb66a8069fbc5fcda9eb0c59701b Author: Mark Thomas AuthorDate: Tue May 21 08:59:29 2024 +0100 Remove references to JAVA_PLATFORM and very old Java versions --- native/build/tcnative.m4 | 4 ++-- native/configure.in | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4 index 5e663e36e..91fcf5189 100644 --- a/native/build/tcnative.m4 +++ b/native/build/tcnative.m4 @@ -65,8 +65,8 @@ AC_DEFUN(TCN_FIND_APR,[ dnl -- dnl TCN_JDK dnl -dnl Detection of JDK location and Java Platform (1.2, 1.3, 1.4, 1.5, 1.6) -dnl result goes in JAVA_HOME / JAVA_PLATFORM (2 -> 1.2 and higher) +dnl Detection of JDK location +dnl Result goes in JAVA_HOME dnl dnl -- AC_DEFUN([TCN_FIND_JAVA],[ diff --git a/native/configure.in b/native/configure.in index ee9ff2f93..7ae395818 100644 --- a/native/configure.in +++ b/native/configure.in @@ -128,7 +128,6 @@ if test "$NEED_JNI_MD" = "yes"; then fi AC_SUBST(JAVA_HOME) -AC_SUBST(JAVA_PLATFORM) AC_SUBST(JAVA_OS) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x updated (e77dcb05d -> a863fa1b7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from e77dcb05d Fix a crash on Windows in SSLContext.setCACertificate() new 8f892521a Remove reference to Tomcat 8.5.x new a863fa1b7 Remove references to JAVA_PLATFORM and very old Java versions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: native/build/tcnative.m4 | 4 ++-- native/configure.in | 1 - xdocs/index.xml | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/02: Remove reference to Tomcat 8.5.x
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 8f892521a79d6d3bbed9d51c1b9f506c9e224b74 Author: Mark Thomas AuthorDate: Tue May 21 08:52:25 2024 +0100 Remove reference to Tomcat 8.5.x --- xdocs/index.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index a01839f27..7726bb6ba 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -206,9 +206,8 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080 Refer to the tomcat documentation to configure the connectors (See http://tomcat.apache.org/tomcat-11.0-doc/apr.html;>Tomcat 11.0.x, -http://tomcat.apache.org/tomcat-10.1-doc/apr.html;>Tomcat 10.1.x, -http://tomcat.apache.org/tomcat-9.0-doc/apr.html;>Tomcat 9.0.x and -http://tomcat.apache.org/tomcat-8.5-doc/apr.html;>Tomcat 8.5.x) +http://tomcat.apache.org/tomcat-10.1-doc/apr.html;>Tomcat 10.1.x and +http://tomcat.apache.org/tomcat-9.0-doc/apr.html;>Tomcat 9.0.x) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 02/02: Remove references to JAVA_PLATFORM and very old Java versions
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-native.git commit 29bd1a1f30ed04bf22189e14f8ca785221ea39ef Author: Mark Thomas AuthorDate: Tue May 21 08:59:29 2024 +0100 Remove references to JAVA_PLATFORM and very old Java versions --- native/build/tcnative.m4 | 4 ++-- native/configure.ac | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4 index 11789e5b5..5425703d7 100644 --- a/native/build/tcnative.m4 +++ b/native/build/tcnative.m4 @@ -65,8 +65,8 @@ AC_DEFUN([TCN_FIND_APR],[ dnl -- dnl TCN_JDK dnl -dnl Detection of JDK location and Java Platform (1.2, 1.3, 1.4, 1.5, 1.6) -dnl result goes in JAVA_HOME / JAVA_PLATFORM (2 -> 1.2 and higher) +dnl Detection of JDK location +dnl Result goes in JAVA_HOME dnl dnl -- AC_DEFUN([TCN_FIND_JAVA],[ diff --git a/native/configure.ac b/native/configure.ac index 45b815073..64d221899 100644 --- a/native/configure.ac +++ b/native/configure.ac @@ -131,7 +131,6 @@ if test "$NEED_JNI_MD" = "yes"; then fi AC_SUBST(JAVA_HOME) -AC_SUBST(JAVA_PLATFORM) AC_SUBST(JAVA_OS) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/02: Remove reference to Tomcat 8.5.x
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-native.git commit 9cf57404807c94413f958d53ccde842b01870a0a Author: Mark Thomas AuthorDate: Tue May 21 08:52:25 2024 +0100 Remove reference to Tomcat 8.5.x --- xdocs/index.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index 46c0e12b3..6735177a7 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -177,9 +177,8 @@ export LD_LIBRARY_PATH Refer to the tomcat documentation to configure the connectors (See https://tomcat.apache.org/tomcat-11.0-doc/config/http.html;>Tomcat 11.0.x, -https://tomcat.apache.org/tomcat-10.1-doc/config/http.html;>Tomcat 10.1.x, -https://tomcat.apache.org/tomcat-9.0-doc/config/http.html;>Tomcat 9.0.x and -https://tomcat.apache.org/tomcat-8.5-doc/config/http.html;>Tomcat 8.5.x) +https://tomcat.apache.org/tomcat-10.1-doc/config/http.html;>Tomcat 10.1.x and +https://tomcat.apache.org/tomcat-9.0-doc/config/http.html;>Tomcat 9.0.x) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated (745455f12 -> 29bd1a1f3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from 745455f12 Fix a crash on Windows in SSLContext.setCACertificate() new 9cf574048 Remove reference to Tomcat 8.5.x new 29bd1a1f3 Remove references to JAVA_PLATFORM and very old Java versions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: native/build/tcnative.m4 | 4 ++-- native/configure.ac | 1 - xdocs/index.xml | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) - 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: Code clean-up - formatting. No functional change
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 69372a3149 Code clean-up - formatting. No functional change
69372a3149 is described below
commit 69372a3149258d16cd5a0734094d291d1d35bafe
Author: Mark Thomas
AuthorDate: Mon May 20 08:18:22 2024 +0100
Code clean-up - formatting. No functional change
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce rand
(tomcat) 01/02: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9ff474b753b497001d00abcd81324e6d06b9600d
Author: Mark Thomas
AuthorDate: Fri May 17 19:35:16 2024 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 66 +++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 451 insertions(+), 584 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
(tomcat) 02/02: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5f6f162f2764f3c710ba2c47b5b167fcb3e9d975
Author: Mark Thomas
AuthorDate: Mon May 20 08:17:30 2024 +0100
Code clean-up - formatting. No functional change.
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce random results
+ * @param useRandom if the map should produce random results
*/
public RandomizedTextRewriteMap(String txtFilePath, boolean useRandom) {
(tomcat) branch 10.1.x updated (6435647905 -> 5f6f162f27)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6435647905 OpenSSL might crash here when passing null on some platforms new 9ff474b753 Code clean-up - formatting. No functional change. new 5f6f162f27 Code clean-up - formatting. No functional change. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/util/CharsetMapper.java | 37 ++-- java/org/apache/catalina/util/ContextName.java | 32 ++- .../catalina/util/CustomObjectInputStream.java | 59 +++--- java/org/apache/catalina/util/DOMWriter.java | 5 +- .../org/apache/catalina/util/ErrorPageSupport.java | 10 +- java/org/apache/catalina/util/IOTools.java | 36 ++-- java/org/apache/catalina/util/Introspection.java | 66 +++--- java/org/apache/catalina/util/LifecycleBase.java | 85 +++- .../apache/catalina/util/LifecycleMBeanBase.java | 65 +++--- java/org/apache/catalina/util/ParameterMap.java| 33 ++- java/org/apache/catalina/util/RequestUtil.java | 9 +- java/org/apache/catalina/util/ResourceSet.java | 31 +-- java/org/apache/catalina/util/ServerInfo.java | 21 +- java/org/apache/catalina/util/SessionConfig.java | 14 +- .../catalina/util/SessionIdGeneratorBase.java | 97 - .../catalina/util/StandardSessionIdGenerator.java | 4 +- java/org/apache/catalina/util/Strftime.java| 232 ++--- java/org/apache/catalina/util/StringUtil.java | 10 +- java/org/apache/catalina/util/TLSUtil.java | 10 +- .../apache/catalina/util/TimeBucketCounter.java| 8 +- java/org/apache/catalina/util/ToStringUtil.java| 6 +- java/org/apache/catalina/util/TomcatCSS.java | 13 +- java/org/apache/catalina/util/URLEncoder.java | 30 ++- java/org/apache/catalina/util/XMLWriter.java | 122 ++- .../valves/rewrite/QuotedStringTokenizer.java | 48 +++-- .../valves/rewrite/RandomizedTextRewriteMap.java | 9 +- .../catalina/valves/rewrite/ResolverImpl.java | 39 ++-- .../catalina/valves/rewrite/RewriteCond.java | 39 ++-- .../apache/catalina/valves/rewrite/RewriteMap.java | 25 +-- .../catalina/valves/rewrite/RewriteRule.java | 209 ++- .../catalina/valves/rewrite/RewriteValve.java | 106 -- .../catalina/valves/rewrite/Substitution.java | 59 -- 32 files changed, 732 insertions(+), 837 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Code clean-up - formatting. No functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 95121453100b34d390efcfbe0d990d0ee180c277
Author: Mark Thomas
AuthorDate: Mon May 20 08:13:53 2024 +0100
Code clean-up - formatting. No functional change
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce random results
+ * @param useRandom if the map should produce random results
*/
public RandomizedTextRewriteMap(String txtFilePath, boolean useRandom) {
(tomcat) 01/02: Code clean-up - formatting. No functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c578fdafa64c4549bea7d26aa06ec70fa20dbd33
Author: Mark Thomas
AuthorDate: Fri May 17 19:27:47 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 56 ++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 445 insertions(+), 580 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
*
(tomcat) branch main updated (c8b460dd41 -> 9512145310)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from c8b460dd41 OpenSSL might crash here when passing null on some platforms new c578fdafa6 Code clean-up - formatting. No functional change new 9512145310 Code clean-up - formatting. No functional change The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/util/CharsetMapper.java | 37 ++-- java/org/apache/catalina/util/ContextName.java | 32 ++- .../catalina/util/CustomObjectInputStream.java | 59 +++--- java/org/apache/catalina/util/DOMWriter.java | 5 +- .../org/apache/catalina/util/ErrorPageSupport.java | 10 +- java/org/apache/catalina/util/IOTools.java | 36 ++-- java/org/apache/catalina/util/Introspection.java | 56 ++--- java/org/apache/catalina/util/LifecycleBase.java | 85 +++- .../apache/catalina/util/LifecycleMBeanBase.java | 65 +++--- java/org/apache/catalina/util/ParameterMap.java| 33 ++- java/org/apache/catalina/util/RequestUtil.java | 9 +- java/org/apache/catalina/util/ResourceSet.java | 31 +-- java/org/apache/catalina/util/ServerInfo.java | 21 +- java/org/apache/catalina/util/SessionConfig.java | 14 +- .../catalina/util/SessionIdGeneratorBase.java | 97 - .../catalina/util/StandardSessionIdGenerator.java | 4 +- java/org/apache/catalina/util/Strftime.java| 232 ++--- java/org/apache/catalina/util/StringUtil.java | 10 +- java/org/apache/catalina/util/TLSUtil.java | 10 +- .../apache/catalina/util/TimeBucketCounter.java| 8 +- java/org/apache/catalina/util/ToStringUtil.java| 6 +- java/org/apache/catalina/util/TomcatCSS.java | 13 +- java/org/apache/catalina/util/URLEncoder.java | 30 ++- java/org/apache/catalina/util/XMLWriter.java | 122 ++- .../valves/rewrite/QuotedStringTokenizer.java | 48 +++-- .../valves/rewrite/RandomizedTextRewriteMap.java | 9 +- .../catalina/valves/rewrite/ResolverImpl.java | 39 ++-- .../catalina/valves/rewrite/RewriteCond.java | 39 ++-- .../apache/catalina/valves/rewrite/RewriteMap.java | 25 +-- .../catalina/valves/rewrite/RewriteRule.java | 209 ++- .../catalina/valves/rewrite/RewriteValve.java | 106 -- .../catalina/valves/rewrite/Substitution.java | 59 -- 32 files changed, 726 insertions(+), 833 deletions(-) - 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: Code clean-up - formatting. No functional change.
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 2b0508581a Code clean-up - formatting. No functional change.
2b0508581a is described below
commit 2b0508581aaa6413a83dc1a334b3cc8a17661bca
Author: Mark Thomas
AuthorDate: Fri May 17 19:35:25 2024 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
.../apache/catalina/util/ConcurrentDateFormat.java | 11 +-
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/Extension.java | 72 +++
.../apache/catalina/util/ExtensionValidator.java | 147 +
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 66 +++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
.../org/apache/catalina/util/ManifestResource.java | 67 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
28 files changed, 568 insertions(+), 764 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set
svn commit: r69239 - in /release/tomcat: tomcat-11/v11.0.0-M19/ tomcat-9/v9.0.88/
Author: markt Date: Thu May 16 10:39:13 2024 New Revision: 69239 Log: Drop old versions from CDN Removed: release/tomcat/tomcat-11/v11.0.0-M19/ release/tomcat/tomcat-9/v9.0.88/ - 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: Add release date for 10.1.24
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 31d33fbfa7 Add release date for 10.1.24 31d33fbfa7 is described below commit 31d33fbfa74c6cf6a14a14fd269e694e6da28fb0 Author: Mark Thomas AuthorDate: Thu May 16 11:33:49 2024 +0100 Add release date for 10.1.24 --- 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 1fc87de59e..959d0824f4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,7 +122,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add release date for 11.0.0-M20
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 822c76b713 Add release date for 11.0.0-M20 822c76b713 is described below commit 822c76b7132e7bf06740779679f8721809c4fe7d Author: Mark Thomas AuthorDate: Thu May 16 11:32:47 2024 +0100 Add release date for 11.0.0-M20 --- 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 277c6b0c4e..9385c86de5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,7 +122,7 @@ - + - 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: Revert Derby to 10.16.1.1
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 df69cba029 Revert Derby to 10.16.1.1
df69cba029 is described below
commit df69cba02930234d2ce90a3ceb36a7a4fc2c38ca
Author: Mark Thomas
AuthorDate: Thu May 16 11:28:23 2024 +0100
Revert Derby to 10.16.1.1
---
build.properties.default | 9 +
webapps/docs/changelog.xml | 8
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3e0c6e8421..24ead36e9b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -324,16 +324,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c1e5a4948..956a1af8fc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+
+
+
-
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: Revert Derby to 10.16.1.1
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 ed50aed980 Revert Derby to 10.16.1.1
ed50aed980 is described below
commit ed50aed9807ddd1cc33f69d34e65f346b9c23349
Author: Mark Thomas
AuthorDate: Thu May 16 11:28:23 2024 +0100
Revert Derby to 10.16.1.1
---
build.properties.default | 9 +
webapps/docs/changelog.xml | 8
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8bb2fa9084..0955cbea0e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -332,16 +332,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 75f815fa42..1fc87de59e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
+
+
+
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Revert Derby to 10.16.1.1
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 147b9390a4 Revert Derby to 10.16.1.1
147b9390a4 is described below
commit 147b9390a40d5068b073ac2b46e7aebb5b6585fb
Author: Mark Thomas
AuthorDate: Thu May 16 11:28:23 2024 +0100
Revert Derby to 10.16.1.1
---
build.properties.default | 9 +
webapps/docs/changelog.xml | 8
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cafef9bff9..45a0e6d5d4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -311,16 +311,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 88926a59c7..277c6b0c4e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
+
+
+
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+
+
+
-
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: adds missing quotation mark making changelog.xml parsable again
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 25414d3f35 adds missing quotation mark making changelog.xml parsable again 25414d3f35 is described below commit 25414d3f35916acd2a0df4e6f19b411ee40df10e Author: pluralistix <1986279+pluralis...@users.noreply.github.com> AuthorDate: Tue May 14 22:16:14 2024 +0200 adds missing quotation mark making changelog.xml parsable again --- 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 f1c4b1a0b4..9a3e5f3b61 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 commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change
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 4c52586cf4 Code clean-up - formatting. No functional change
4c52586cf4 is described below
commit 4c52586cf4ad4347fa35a668bad8c04a921e0408
Author: Mark Thomas
AuthorDate: Tue May 14 11:02:12 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/users/AbstractGroup.java | 5 +-
java/org/apache/catalina/users/AbstractRole.java | 5 +-
java/org/apache/catalina/users/AbstractUser.java | 5 +-
java/org/apache/catalina/users/Constants.java | 2 +-
.../catalina/users/DataSourceUserDatabase.java | 49 +-
.../users/DataSourceUserDatabaseFactory.java | 48 +-
java/org/apache/catalina/users/GenericGroup.java | 17 ++--
java/org/apache/catalina/users/GenericRole.java| 15 ++-
java/org/apache/catalina/users/GenericUser.java| 16 ++--
java/org/apache/catalina/users/MemoryGroup.java| 22 +++--
java/org/apache/catalina/users/MemoryRole.java | 22 +++--
java/org/apache/catalina/users/MemoryUser.java | 30 +++---
.../apache/catalina/users/MemoryUserDatabase.java | 102 +
.../catalina/users/MemoryUserDatabaseFactory.java | 52 +--
14 files changed, 195 insertions(+), 195 deletions(-)
diff --git a/java/org/apache/catalina/users/AbstractGroup.java
b/java/org/apache/catalina/users/AbstractGroup.java
index 0430b65f33..8d4e4f74cd 100644
--- a/java/org/apache/catalina/users/AbstractGroup.java
+++ b/java/org/apache/catalina/users/AbstractGroup.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Group;
/**
- * Convenience base class for {@link Group} implementations.
+ *
+ * Convenience base class for {@link Group} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractGroup implements Group {
diff --git a/java/org/apache/catalina/users/AbstractRole.java
b/java/org/apache/catalina/users/AbstractRole.java
index 7de9d545aa..610aedde73 100644
--- a/java/org/apache/catalina/users/AbstractRole.java
+++ b/java/org/apache/catalina/users/AbstractRole.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Role;
/**
- * Convenience base class for {@link Role} implementations.
+ *
+ * Convenience base class for {@link Role} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractRole implements Role {
diff --git a/java/org/apache/catalina/users/AbstractUser.java
b/java/org/apache/catalina/users/AbstractUser.java
index 7ff6752f62..a00ead6c80 100644
--- a/java/org/apache/catalina/users/AbstractUser.java
+++ b/java/org/apache/catalina/users/AbstractUser.java
@@ -21,9 +21,12 @@ import org.apache.catalina.User;
/**
- * Convenience base class for {@link User} implementations.
+ *
+ * Convenience base class for {@link User} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractUser implements User {
diff --git a/java/org/apache/catalina/users/Constants.java
b/java/org/apache/catalina/users/Constants.java
index c79f517a7b..df7e150ca8 100644
--- a/java/org/apache/catalina/users/Constants.java
+++ b/java/org/apache/catalina/users/Constants.java
@@ -20,8 +20,8 @@ package org.apache.catalina.users;
/**
* Manifest constants for this Java package.
*
- *
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public final class Constants {
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 8ad9aa7a7f..99b4c2fe59 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -61,17 +61,17 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected final String id;
-protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modif
(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change
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 cea7ced1c6 Code clean-up - formatting. No functional change
cea7ced1c6 is described below
commit cea7ced1c670e93073a7e8c8b370147788bfb338
Author: Mark Thomas
AuthorDate: Tue May 14 11:00:40 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/users/AbstractGroup.java | 5 +-
java/org/apache/catalina/users/AbstractRole.java | 5 +-
java/org/apache/catalina/users/AbstractUser.java | 5 +-
java/org/apache/catalina/users/Constants.java | 2 +-
.../catalina/users/DataSourceUserDatabase.java | 49 +--
.../users/DataSourceUserDatabaseFactory.java | 48 ++-
java/org/apache/catalina/users/GenericGroup.java | 17 ++--
java/org/apache/catalina/users/GenericRole.java| 15 ++--
java/org/apache/catalina/users/GenericUser.java| 16 ++--
java/org/apache/catalina/users/MemoryGroup.java| 22 +++--
java/org/apache/catalina/users/MemoryRole.java | 22 +++--
java/org/apache/catalina/users/MemoryUser.java | 30 ---
.../apache/catalina/users/MemoryUserDatabase.java | 96 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 52 ++--
14 files changed, 193 insertions(+), 191 deletions(-)
diff --git a/java/org/apache/catalina/users/AbstractGroup.java
b/java/org/apache/catalina/users/AbstractGroup.java
index 0430b65f33..8d4e4f74cd 100644
--- a/java/org/apache/catalina/users/AbstractGroup.java
+++ b/java/org/apache/catalina/users/AbstractGroup.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Group;
/**
- * Convenience base class for {@link Group} implementations.
+ *
+ * Convenience base class for {@link Group} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractGroup implements Group {
diff --git a/java/org/apache/catalina/users/AbstractRole.java
b/java/org/apache/catalina/users/AbstractRole.java
index 7de9d545aa..610aedde73 100644
--- a/java/org/apache/catalina/users/AbstractRole.java
+++ b/java/org/apache/catalina/users/AbstractRole.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Role;
/**
- * Convenience base class for {@link Role} implementations.
+ *
+ * Convenience base class for {@link Role} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractRole implements Role {
diff --git a/java/org/apache/catalina/users/AbstractUser.java
b/java/org/apache/catalina/users/AbstractUser.java
index 7ff6752f62..a00ead6c80 100644
--- a/java/org/apache/catalina/users/AbstractUser.java
+++ b/java/org/apache/catalina/users/AbstractUser.java
@@ -21,9 +21,12 @@ import org.apache.catalina.User;
/**
- * Convenience base class for {@link User} implementations.
+ *
+ * Convenience base class for {@link User} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractUser implements User {
diff --git a/java/org/apache/catalina/users/Constants.java
b/java/org/apache/catalina/users/Constants.java
index c79f517a7b..df7e150ca8 100644
--- a/java/org/apache/catalina/users/Constants.java
+++ b/java/org/apache/catalina/users/Constants.java
@@ -20,8 +20,8 @@ package org.apache.catalina.users;
/**
* Manifest constants for this Java package.
*
- *
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public final class Constants {
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 8ad9aa7a7f..99b4c2fe59 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -61,17 +61,17 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected final String id;
-protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modif
(tomcat) branch main updated: Code clean-up - formatting. No functional change
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 58deafb727 Code clean-up - formatting. No functional change
58deafb727 is described below
commit 58deafb727e5a8b509732e13491266f0c0060e58
Author: Mark Thomas
AuthorDate: Tue May 14 10:59:32 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/users/AbstractGroup.java | 5 +-
java/org/apache/catalina/users/AbstractRole.java | 5 +-
java/org/apache/catalina/users/AbstractUser.java | 5 +-
java/org/apache/catalina/users/Constants.java | 2 +-
.../catalina/users/DataSourceUserDatabase.java | 49 +--
.../users/DataSourceUserDatabaseFactory.java | 48 ++-
java/org/apache/catalina/users/GenericGroup.java | 17 ++--
java/org/apache/catalina/users/GenericRole.java| 15 ++--
java/org/apache/catalina/users/GenericUser.java| 16 ++--
.../apache/catalina/users/MemoryUserDatabase.java | 96 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 52 ++--
11 files changed, 149 insertions(+), 161 deletions(-)
diff --git a/java/org/apache/catalina/users/AbstractGroup.java
b/java/org/apache/catalina/users/AbstractGroup.java
index 0430b65f33..8d4e4f74cd 100644
--- a/java/org/apache/catalina/users/AbstractGroup.java
+++ b/java/org/apache/catalina/users/AbstractGroup.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Group;
/**
- * Convenience base class for {@link Group} implementations.
+ *
+ * Convenience base class for {@link Group} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractGroup implements Group {
diff --git a/java/org/apache/catalina/users/AbstractRole.java
b/java/org/apache/catalina/users/AbstractRole.java
index 7de9d545aa..610aedde73 100644
--- a/java/org/apache/catalina/users/AbstractRole.java
+++ b/java/org/apache/catalina/users/AbstractRole.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Role;
/**
- * Convenience base class for {@link Role} implementations.
+ *
+ * Convenience base class for {@link Role} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractRole implements Role {
diff --git a/java/org/apache/catalina/users/AbstractUser.java
b/java/org/apache/catalina/users/AbstractUser.java
index 7ff6752f62..a00ead6c80 100644
--- a/java/org/apache/catalina/users/AbstractUser.java
+++ b/java/org/apache/catalina/users/AbstractUser.java
@@ -21,9 +21,12 @@ import org.apache.catalina.User;
/**
- * Convenience base class for {@link User} implementations.
+ *
+ * Convenience base class for {@link User} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractUser implements User {
diff --git a/java/org/apache/catalina/users/Constants.java
b/java/org/apache/catalina/users/Constants.java
index c79f517a7b..df7e150ca8 100644
--- a/java/org/apache/catalina/users/Constants.java
+++ b/java/org/apache/catalina/users/Constants.java
@@ -20,8 +20,8 @@ package org.apache.catalina.users;
/**
* Manifest constants for this Java package.
*
- *
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public final class Constants {
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 8ad9aa7a7f..99b4c2fe59 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -61,17 +61,17 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected final String id;
-protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdRoles = new
Con
(tomcat) branch 10.1.x updated: 'Jakarta Server Pages' -> 'Jakarta Pages'
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 55d6539973 'Jakarta Server Pages' -> 'Jakarta Pages'
55d6539973 is described below
commit 55d6539973a37f183c6021cdcc1ef44eb7530856
Author: Mark Thomas
AuthorDate: Tue May 14 10:44:21 2024 +0100
'Jakarta Server Pages' -> 'Jakarta Pages'
---
java/jakarta/servlet/jsp/el/ImportELResolver.java | 2 +-
java/jakarta/servlet/jsp/el/NotFoundELResolver.java | 2 +-
java/jakarta/servlet/jsp/tagext/package.html| 6 +++---
res/META-INF/jsp-api.jar.manifest | 2 +-
res/bnd/jsp-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 +-
webapps/docs/appdev/introduction.xml| 4 ++--
webapps/docs/index.xml | 2 +-
webapps/docs/jasper-howto.xml | 2 +-
webapps/examples/jsp/index.html | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/jakarta/servlet/jsp/el/ImportELResolver.java
b/java/jakarta/servlet/jsp/el/ImportELResolver.java
index 4e58509dba..5c91a4ae3f 100644
--- a/java/jakarta/servlet/jsp/el/ImportELResolver.java
+++ b/java/jakarta/servlet/jsp/el/ImportELResolver.java
@@ -27,7 +27,7 @@ import jakarta.el.ELResolver;
import jakarta.el.ImportHandler;
/**
- * Providers resolution of imports and static imports in the Jakarta Server
Pages ELResolver chain.
+ * Providers resolution of imports and static imports in the Jakarta Pages
ELResolver chain.
*
* @since JSP 3.1
*/
diff --git a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java
b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java
index cc865e90dd..00acbdc7aa 100644
--- a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java
+++ b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java
@@ -27,7 +27,7 @@ import jakarta.el.ELResolver;
import jakarta.el.PropertyNotFoundException;
/**
- * The final resolver of the Jakarta Server Pages ELResolver chain. It always
resolves the requested value, returning
+ * The final resolver of the Jakarta Pages ELResolver chain. It always
resolves the requested value, returning
* {@code null} when it does so.
*
* @since JSP 3.1
diff --git a/java/jakarta/servlet/jsp/tagext/package.html
b/java/jakarta/servlet/jsp/tagext/package.html
index 51bad0a164..5ee762888b 100644
--- a/java/jakarta/servlet/jsp/tagext/package.html
+++ b/java/jakarta/servlet/jsp/tagext/package.html
@@ -20,11 +20,11 @@
-Classes and interfaces for the definition of JavaServer Pages Tag Libraries.
+Classes and interfaces for the definition of Jakarta Pages Tag Libraries.
-The JavaServer Pages(tm) (JSP) 2.0 specification provides a portable
-mechanism for the description of tag libraries.
+The Jakarta Pages specification provides a portable mechanism for the
+description of tag libraries.
A JSP tag library contains
diff --git a/res/META-INF/jsp-api.jar.manifest
b/res/META-INF/jsp-api.jar.manifest
index da97c0687c..e62888437b 100644
--- a/res/META-INF/jsp-api.jar.manifest
+++ b/res/META-INF/jsp-api.jar.manifest
@@ -3,7 +3,7 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/servlet/jsp/
-Specification-Title: Jakarta Server Pages
+Specification-Title: Jakarta Pages
Specification-Version: @jsp.spec.version@
Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.servlet.jsp
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 8d7e5fc52a..e6d1152c91 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -27,7 +27,7 @@ Provide-Capability: \
uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
-namesection: jakarta/servlet/jsp*/;\
-Specification-Title=Jakarta Server Pages;\
+Specification-Title=Jakarta Pages;\
Specification-Version=${jsp.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.servlet.jsp;\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index ca0953ec17..195eafb30e 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -44,7 +44,7 @@ Provide-Capability: \
uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
-namesection: jakarta/servlet/jsp*/;\
-Specification-Title=Jakarta Server Pages;\
+Specification-Title=Jakarta Pages;\
Specification-Version=${jsp.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.servlet.jsp;\
diff --git a/webapps/docs/appdev/introduction.xml
b/webapps/docs/appdev/introduction.xml
index 74e4fe0e85..08458ee72e 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -63,9 +63,9 @@ infor
