[Bug 68348] Support for Partitioned cookie attribute
https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas --- Look at the version numbers. The fixed versions haven't been released yet. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915755 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Tue Feb 13 08:16:27 2024 New Revision: 1915755 URL: http://svn.apache.org/viewvc?rev=1915755&view=rev Log: Update Native download page. Add 1.3.x. Allow for different OpenSSL versions per release. 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=1915755&r1=1915754&r2=1915755&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Tue Feb 13 08:16:27 2024 @@ -11,11 +11,15 @@ Quick Navigation [define v]2.0.7[end] -[define w]1.2.39[end] -[define y]3.0.11[end] +[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 @@ -79,27 +83,27 @@ Each archive contains tcnative-2.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 [y]. +These binaries were built with OpenSSL [vo]. Standard -zip +zip - recommended -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-win32-bin.zip.sha512";>SHA512) +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[vo]-win32-bin.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[vo]-win32-bin.zip.sha512";>SHA512) OCSP enabled -zip -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[y]-ocsp-win32-bin.zip.sha512";>SHA512) +zip +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[vo]-ocsp-win32-bin.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/binaries/tomcat-native-[v]-openssl-[vo]-ocsp-win32-bin.zip.sha512";>SHA512) [w] - For more information concerning Tomcat Native 1.2.x, see the - http://tomcat.apache.org/native-1.2-doc/"; class="name">Tomcat + For more information concerning Tomcat Native 1.3.x, see the + http://tomcat.apache.org/native-1.3-doc/"; class="name">Tomcat Native site. Source Distributions @@ -130,20 +134,71 @@ 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 [y]. +These binaries were built with OpenSSL [wo]. + + +Standard +zip +- recommended +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[wo]-win32-bin.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[wo]-win32-bin.zip.sha512";>SHA512) + + +OCSP enabled +zip +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[wo]-ocsp-win32-bin.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/binaries/tomcat-native-[w]-openssl-[wo]-ocsp-win32-bin.zip.sha512";>SHA512) + + + + +[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) + +
svn commit: r1915756 - /tomcat/site/trunk/README.txt
Author: markt Date: Tue Feb 13 08:18:13 2024 New Revision: 1915756 URL: http://svn.apache.org/viewvc?rev=1915756&view=rev Log: Remove reference to building Native 1.1.x docs Modified: tomcat/site/trunk/README.txt Modified: tomcat/site/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1915756&r1=1915755&r2=1915756&view=diff == --- tomcat/site/trunk/README.txt (original) +++ tomcat/site/trunk/README.txt Tue Feb 13 08:18:13 2024 @@ -143,7 +143,6 @@ relevant Tomcat components are fully pre svn up --set-depth infinity docs/connectors-doc svn up --set-depth infinity docs/native-doc svn up --set-depth infinity docs/native-1.2-doc - svn up --set-depth infinity docs/native-1.1-doc One way to update documentation is to: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915757 - /tomcat/site/trunk/native-1.1-xdocs/
Author: markt Date: Tue Feb 13 08:18:48 2024 New Revision: 1915757 URL: http://svn.apache.org/viewvc?rev=1915757&view=rev Log: Remove Native 1.1.x source docs as they are no longer required. Removed: tomcat/site/trunk/native-1.1-xdocs/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915758 - in /tomcat/site/trunk: build.xml native-1.3-xdocs/
Author: markt Date: Tue Feb 13 08:22:52 2024 New Revision: 1915758 URL: http://svn.apache.org/viewvc?rev=1915758&view=rev Log: Prepare for building Native 1.3.x docs Added: tomcat/site/trunk/native-1.3-xdocs/ - copied from r1915754, tomcat/site/trunk/native-1.2-xdocs/ Modified: tomcat/site/trunk/build.xml Modified: tomcat/site/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1915758&r1=1915757&r2=1915758&view=diff == --- tomcat/site/trunk/build.xml (original) +++ tomcat/site/trunk/build.xml Tue Feb 13 08:22:52 2024 @@ -193,6 +193,20 @@ + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add entry for the debug strings
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 4320e1a20f Add entry for the debug strings 4320e1a20f is described below commit 4320e1a20fa9f215ac7271c3762ff29c9285d262 Author: remm AuthorDate: Tue Feb 13 09:23:30 2024 +0100 Add entry for the debug strings --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index dca3b91032..377e08e7a3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -251,6 +251,9 @@ Update Tomcat Native to 2.0.7. (markt) + +Add strings for debug level messages. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add entry for the debug strings
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new d886d645a3 Add entry for the debug strings d886d645a3 is described below commit d886d645a3ece331f7fc0019ed2a549ff4272c9c Author: remm AuthorDate: Tue Feb 13 09:23:30 2024 +0100 Add entry for the debug strings --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ef6129d957..4a852bfd0f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -236,6 +236,9 @@ Update Tomcat Native to 2.0.7. (markt) + +Add strings for debug level messages. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Add entry for the debug strings
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 8d1dfb74b5 Add entry for the debug strings 8d1dfb74b5 is described below commit 8d1dfb74b525bfef04ddcd3fb0ba24ca78aef5dd Author: remm AuthorDate: Tue Feb 13 09:23:30 2024 +0100 Add entry for the debug strings --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 877ff40204..75683c55d9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -223,6 +223,9 @@ Update JSign to 6.0. (markt) + +Add strings for debug level messages. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915759 - in /tomcat/site/trunk/docs/native-1.3-doc: ./ images/ miscellaneous/ news/
Author: markt Date: Tue Feb 13 08:29:17 2024 New Revision: 1915759 URL: http://svn.apache.org/viewvc?rev=1915759&view=rev Log: Add Tomcat Native 1.3.0 docs Added: tomcat/site/trunk/docs/native-1.3-doc/ tomcat/site/trunk/docs/native-1.3-doc/images/ tomcat/site/trunk/docs/native-1.3-doc/images/add.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/asf-logo.svg tomcat/site/trunk/docs/native-1.3-doc/images/code.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/design.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/docs-stylesheet.css tomcat/site/trunk/docs/native-1.3-doc/images/docs.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/fix.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/printer.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/style.css tomcat/site/trunk/docs/native-1.3-doc/images/tomcat.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/tomcat.png (with props) tomcat/site/trunk/docs/native-1.3-doc/images/update.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/images/void.gif (with props) tomcat/site/trunk/docs/native-1.3-doc/index.html tomcat/site/trunk/docs/native-1.3-doc/miscellaneous/ tomcat/site/trunk/docs/native-1.3-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-1.3-doc/miscellaneous/tls-renegotiation.html tomcat/site/trunk/docs/native-1.3-doc/news/ tomcat/site/trunk/docs/native-1.3-doc/news/2024.html Added: tomcat/site/trunk/docs/native-1.3-doc/images/add.gif URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.3-doc/images/add.gif?rev=1915759&view=auto == Binary file - no diff available. Propchange: tomcat/site/trunk/docs/native-1.3-doc/images/add.gif -- svn:mime-type = application/octet-stream Added: tomcat/site/trunk/docs/native-1.3-doc/images/asf-logo.svg URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.3-doc/images/asf-logo.svg?rev=1915759&view=auto == --- tomcat/site/trunk/docs/native-1.3-doc/images/asf-logo.svg (added) +++ tomcat/site/trunk/docs/native-1.3-doc/images/asf-logo.svg Tue Feb 13 08:29:17 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"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: tomcat/site/trunk/docs/native-1.3-doc/images/code.gif URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.3-doc/images/code.gif?rev=1915759&view=auto == Binary file - no diff available. Propchange: tomcat/site/trunk/docs/native-1.3-doc/images/code.gif -- svn:mime-type = application/octet-stream Added: tomcat/site/trunk/docs/native-1.3-doc/images/design.gif URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.3-doc/images/design.gif?rev=1915759&view=auto == Binary file - no diff available. Propchange: tomcat/site/trunk/docs/native-1.3-doc/images/design.gif -- svn:mime-type = application/octet-stream Added: tomcat/site/trunk/docs/native-1.3-doc/images/docs-stylesheet.css URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.3-doc/images/docs-stylesheet.css?rev=1915759&view=auto == --- tomcat/site/trunk/docs/native-1.3-doc/images/docs-stylesheet.css (added) +++ tomcat/site/trunk/docs/native-1.3-doc/images/docs-stylesheet.css Tue Feb 13 08:29:17 2024 @@ -0,0 +1,297 @@ +@charset "utf-8"; +/* + 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 com
(tomcat) branch 8.5.x updated: Add entry for the debug strings
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new a206601da3 Add entry for the debug strings a206601da3 is described below commit a206601da3127af781296fa2c6b097ee99dfd718 Author: remm AuthorDate: Tue Feb 13 09:23:30 2024 +0100 Add entry for the debug strings --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 26a7cbd71b..dd4d2b2d74 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -217,6 +217,9 @@ Update JSign to 6.0. (markt) + +Add strings for debug level messages. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915761 [1/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: markt Date: Tue Feb 13 08:33:54 2024 New Revision: 1915761 URL: http://svn.apache.org/viewvc?rev=1915761&view=rev Log: Add Tomcat Native 1.3 to navigation menu 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.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/stylesheets/project.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Reporting Bugshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.2https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence
svn commit: r1915761 [7/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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 codeBuildb othttps://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.apach e.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 Tomcat®https://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 Announcements from previous years can be found here: year 2023 Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/s
svn commit: r1915761 [3/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/heritage.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/heritage.html (original) +++ tomcat/site/trunk/docs/heritage.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Heritagehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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/conf luence/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 Tomcat®https://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 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=1915761&r1=1915760&r2=1
svn commit: r1915761 [9/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/security-native.html (original) +++ tomcat/site/trunk/docs/security-native.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Apache Tomcat APR/native Connector vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.5Upgradinghref="./connectors-doc/">Tomcat Connectorshref="./native-doc/">Tomcat Native 2href="./native-1.2-doc/">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 >InvolvedOverviewhref="./source.html">Source co deBuildbothttps://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 Apac hehttps://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 APR/native Connector vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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 >Involv edOverviewSource 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.apa
svn commit: r1915761 [2/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Apache Tomcat 9 Software Downloadshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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/">Tomcat Native 2href="./native-1.2-doc/">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 >InvolvedOverviewhref="./source.html">Source codehref="./ci.html">BuildbotTranslationsToolsMediahttps://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/sponsorshi p.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 Tomcat®https://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 Apacheht
svn commit: r1915761 [6/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews-2016.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/oldnews-2016.html (original) +++ tomcat/site/trunk/docs/oldnews-2016.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Old news!https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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 codeBuildb othttps://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.apach e.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 Tomcat®https://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 Announcements from previous years can be found here: year 2023 Modified: tomcat/site/trunk/docs/oldnews-2017.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/oldnews-2017.html (origi
svn commit: r1915761 [10/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/tomcat-60-eol.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/tomcat-60-eol.html (original) +++ tomcat/site/trunk/docs/tomcat-60-eol.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - End of life for Apache Tomcat 6.0.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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 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/";>LicenseContent2015-06-03 End of life for Apache Tomcat 6.0.x +Apache Tomcat® - End of life for Apache Tomcat 6.0.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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/";>LicenseContent2015-06-03 End of life for Apache Tomcat 6.0.x The Apache Tomcat® team announces that support for Apache Tomcat 6.0.x will end on 31 December 2016. Modified: tomcat/site/trunk/docs/tomcat-70-eol.html URL: http://svn.apac
svn commit: r1915761 [8/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Apache Tomcat 5 vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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/">Tomcat Connectorshref="./native-doc/">Tomcat Native 2href="./native-1.2-doc/">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 >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 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 5.x vulnerabilities +Apache Tomcat® - Apache Tomcat 5 vulnerabilitieshttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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";>P
svn commit: r1915761 [11/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Who We Arehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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)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.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/co nfluence/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";>Sponsorship< /li>http://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentWho We Are +Apache Tomcat® - Who We Arehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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)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 InvolvedOverviewSou rce 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";>Suppor t Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentWho We Are The Apache Tomcat® project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1915761&r1=1915760&r2=1915761&view=diff == --- t
svn commit: r1915761 [4/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-10.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/migration-10.html (original) +++ tomcat/site/trunk/docs/migration-10.html Tue Feb 13 08:33:54 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 Tomcat®https://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/">Tomcat Connectorshref="./native-doc/">Tomcat Native 2href="./native-1.2-doc/">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 >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 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/";>LicenseContentTable of Contents +Apache Tomcat® - Migration Guide - Tomcat 10.0.xhttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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";>Privacyhtt
svn commit: r1915761 [5/11] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1915761&r1=1915760&r2=1915761&view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Tue Feb 13 08:33:54 2024 @@ -1,5 +1,5 @@ -Apache Tomcat® - Migration Guidehttps://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache Tomcat®https://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.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 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 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 Tomcat®https://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 When updating from one major Apache Tomcat® version a newer one, please make sure that the JVM that is installed on your system supports at least the Modified: tomcat/site/trunk/docs/oldnews-2010.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1915761&r1=1915760&r2=1915761&view=diff
(tomcat-native) 02/02: Update to actual release date
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 8530151cfba02eb825f82c616c9a8b9a488b6f88 Author: Mark Thomas AuthorDate: Tue Feb 13 08:27:58 2024 + Update to actual release date --- xdocs/index.xml | 2 +- xdocs/news/2024.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index 0a5d77003..a01839f27 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -60,7 +60,7 @@ -8 February 2024 - TC-Native-1.3.0 +12 February 2024 - TC-Native-1.3.0 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.3.0 Stable. diff --git a/xdocs/news/2024.xml b/xdocs/news/2024.xml index 26fd9aba2..a958a7f23 100644 --- a/xdocs/news/2024.xml +++ b/xdocs/news/2024.xml @@ -30,7 +30,7 @@ - + The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.3.0. - 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 (ef40b6d00 -> 8530151cf)
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 ef40b6d00 Update minimum APR version in a few more places new ba1454e15 Fix link new 8530151cf Update to actual release date 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: xdocs/index.xml| 2 +- xdocs/news/2024.xml| 2 +- xdocs/news/project.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/02: Fix link
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 ba1454e15619a44fe66d86f59c766c0cc25323eb Author: Mark Thomas AuthorDate: Tue Feb 13 08:27:43 2024 + Fix link --- xdocs/news/project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index 52b885e24..8978c6f50 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -35,7 +35,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915763 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Tue Feb 13 08:41:43 2024 New Revision: 1915763 URL: http://svn.apache.org/viewvc?rev=1915763&view=rev Log: Add release announcement for Tomcat Native 1.3.0 Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1915763&r1=1915762&r2=1915763&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Feb 13 08:41:43 2024 @@ -34,6 +34,20 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2024-02-12 Tomcat Native 1.3.0 Released + +The Apache Tomcat Project is proud to announce the release of version 1.3.0 of +Tomcat Native. This is the first release of the 1.3.x branch. The notable +changes compared to 1.2.x include: + + +The minimum supported OpenSSL version is 1.1.1 +The minimum supported APR version in 1.6.3 + + +https://tomcat.apache.org/download-native.cgi";>Download | +Change log for 1.3.0 + 2024-02-08 Tomcat Native 2.0.7 Released The Apache Tomcat Project is proud to announce the release of version 2.0.7 of Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1915763&r1=1915762&r2=1915763&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Feb 13 08:41:43 2024 @@ -55,6 +55,22 @@ project logo are trademarks of the Apach + + +The Apache Tomcat Project is proud to announce the release of version 1.3.0 of +Tomcat Native. This is the first release of the 1.3.x branch. The notable +changes compared to 1.2.x include: + + +The minimum supported OpenSSL version is 1.1.1 +The minimum supported APR version in 1.6.3 + + +Download | +Change log for 1.3.0 + + + The Apache Tomcat Project is proud to announce the release of version 2.0.7 of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915764 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Tue Feb 13 08:42:24 2024 New Revision: 1915764 URL: http://svn.apache.org/viewvc?rev=1915764&view=rev Log: Update announcement Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1915764&r1=1915763&r2=1915764&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Feb 13 08:42:24 2024 @@ -43,6 +43,8 @@ changes compared to 1.2.x include: The minimum supported OpenSSL version is 1.1.1 The minimum supported APR version in 1.6.3 +The windows binaries in this release have been built with OpenSSL +3.0.13 https://tomcat.apache.org/download-native.cgi";>Download | Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1915764&r1=1915763&r2=1915764&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Feb 13 08:42:24 2024 @@ -64,6 +64,8 @@ changes compared to 1.2.x include: The minimum supported OpenSSL version is 1.1.1 The minimum supported APR version in 1.6.3 +The windows binaries in this release have been built with OpenSSL +3.0.13 Download | - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 2.0.7 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 2.0.7 stable. The key features of this release are: - Align default pass phrase prompt with httpd on Windows - The windows binaries in this release have been built with OpenSSL 3.0.13 The 2.0.x branch is primarily intended for use with Tomcat 10.1.x or later but can be used with earlier versions as long as the APR/native connector is not used. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library 2.0.x provides an API for using OpenSSL for SSL networking with Apache Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 1.3.0 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.3.0 stable. The key features of this release are: - The minimum supported OpenSSL version is 1.1.1 - The minimum supported APR version in 1.6.3 - The windows binaries in this release have been built with OpenSSL 3.0.13 Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library 1.3.x provides portable API for features not found in contemporary JDK's. It uses Apache Portable Runtime as operating system abstraction layer and OpenSSL for SSL networking and allows optimal performance in production environments. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Avoid useless add operation
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3a9dbd17f5 Avoid useless add operation
3a9dbd17f5 is described below
commit 3a9dbd17f558f8651fcbc3683772c14bcb0694d9
Author: remm
AuthorDate: Tue Feb 13 09:49:20 2024 +0100
Avoid useless add operation
---
.../apache/coyote/http11/upgrade/UpgradeGroupInfo.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
index dc44062461..638d0d23d2 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
@@ -61,7 +61,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesReceived(long bytesReceived) {
deadBytesReceived.reset();
-deadBytesReceived.add(bytesReceived);
+if (bytesReceived != 0) {
+deadBytesReceived.add(bytesReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesReceived(bytesReceived);
}
@@ -77,7 +79,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesSent(long bytesSent) {
deadBytesSent.reset();
-deadBytesSent.add(bytesSent);
+if (bytesSent != 0) {
+deadBytesSent.add(bytesSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesSent(bytesSent);
}
@@ -93,7 +97,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsReceived(long msgsReceived) {
deadMsgsReceived.reset();
-deadMsgsReceived.add(msgsReceived);
+if (msgsReceived != 0) {
+deadMsgsReceived.add(msgsReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsReceived(msgsReceived);
}
@@ -109,7 +115,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsSent(long msgsSent) {
deadMsgsSent.reset();
-deadMsgsSent.add(msgsSent);
+if (msgsSent != 0) {
+deadMsgsSent.add(msgsSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsSent(msgsSent);
}
-
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: Avoid useless add operation
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9aedadc2ab Avoid useless add operation
9aedadc2ab is described below
commit 9aedadc2ab50ebe9e954ff8ee34e5bb8e0ac1112
Author: remm
AuthorDate: Tue Feb 13 09:49:20 2024 +0100
Avoid useless add operation
---
.../apache/coyote/http11/upgrade/UpgradeGroupInfo.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
index dc44062461..638d0d23d2 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
@@ -61,7 +61,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesReceived(long bytesReceived) {
deadBytesReceived.reset();
-deadBytesReceived.add(bytesReceived);
+if (bytesReceived != 0) {
+deadBytesReceived.add(bytesReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesReceived(bytesReceived);
}
@@ -77,7 +79,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesSent(long bytesSent) {
deadBytesSent.reset();
-deadBytesSent.add(bytesSent);
+if (bytesSent != 0) {
+deadBytesSent.add(bytesSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesSent(bytesSent);
}
@@ -93,7 +97,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsReceived(long msgsReceived) {
deadMsgsReceived.reset();
-deadMsgsReceived.add(msgsReceived);
+if (msgsReceived != 0) {
+deadMsgsReceived.add(msgsReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsReceived(msgsReceived);
}
@@ -109,7 +115,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsSent(long msgsSent) {
deadMsgsSent.reset();
-deadMsgsSent.add(msgsSent);
+if (msgsSent != 0) {
+deadMsgsSent.add(msgsSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsSent(msgsSent);
}
-
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: Avoid useless add operation
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b6c5c8529a Avoid useless add operation
b6c5c8529a is described below
commit b6c5c8529ac36c3730d0b9124c4d238252e5793f
Author: remm
AuthorDate: Tue Feb 13 09:49:20 2024 +0100
Avoid useless add operation
---
.../apache/coyote/http11/upgrade/UpgradeGroupInfo.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
index dc44062461..638d0d23d2 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeGroupInfo.java
@@ -61,7 +61,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesReceived(long bytesReceived) {
deadBytesReceived.reset();
-deadBytesReceived.add(bytesReceived);
+if (bytesReceived != 0) {
+deadBytesReceived.add(bytesReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesReceived(bytesReceived);
}
@@ -77,7 +79,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setBytesSent(long bytesSent) {
deadBytesSent.reset();
-deadBytesSent.add(bytesSent);
+if (bytesSent != 0) {
+deadBytesSent.add(bytesSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setBytesSent(bytesSent);
}
@@ -93,7 +97,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsReceived(long msgsReceived) {
deadMsgsReceived.reset();
-deadMsgsReceived.add(msgsReceived);
+if (msgsReceived != 0) {
+deadMsgsReceived.add(msgsReceived);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsReceived(msgsReceived);
}
@@ -109,7 +115,9 @@ public class UpgradeGroupInfo extends BaseModelMBean {
}
public void setMsgsSent(long msgsSent) {
deadMsgsSent.reset();
-deadMsgsSent.add(msgsSent);
+if (msgsSent != 0) {
+deadMsgsSent.add(msgsSent);
+}
for (UpgradeInfo ui : upgradeInfos) {
ui.setMsgsSent(msgsSent);
}
-
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 Tomcat Native to 1.3.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 5b6fe1505c Update Tomcat Native to 1.3.x
5b6fe1505c is described below
commit 5b6fe1505c5c4f3a9c2b7bad21acb25b842b4f69
Author: Mark Thomas
AuthorDate: Tue Feb 13 08:55:41 2024 +
Update Tomcat Native to 1.3.x
---
build.properties.default | 8
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2ec1dbfb16..9aae7ee7da 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -162,14 +162,14 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.39
-tomcat-native-openssl.version=3.0.11
+tomcat-native.version=1.3.0
+tomcat-native-openssl.version=3.0.13
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7
+tomcat-native.src.checksum.value=5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=196bbf095f853f38466c18c9c6f9b574df0a27dd18d48719f56d341773234f4a0d964aab6097d75b714be89dcf1ac9d3495511f7d6334661759cac45b8780cd6
+tomcat-native.win.checksum.value=799e7233e23af9d80dc3ced590430139495f64440a5ea6170f34ed4200f13ae8fea5a20ed149fdce89aa023c6afd6471057f4dac194558405cfcea6022af5dac
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 75683c55d9..52ade80bb5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
Add strings for debug level messages. (remm)
+
+Update Tomcat Native to 1.3.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/929 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 4320e1a20fa9f215ac7271c3762ff29c9285d262 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (3a9dbd17f5 -> 2339792d48)
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 3a9dbd17f5 Avoid useless add operation
new 2070b43e11 Rename prior to extending with additional tests
new b0e3b1bd78 Refactor WebSocket close for suspend/resume
new c4789c84ac Rename in preparation for adding server session expiration
test
new 2339792d48 Add a server equivalent of the session expiration test
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 ++--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 113 +++--
...cketContainerSessionExpiryContainerClient.java} | 6 +-
...cketContainerSessionExpiryContainerServer.java} | 30 --
webapps/docs/changelog.xml | 5 +
webapps/docs/web-socket-howto.xml | 7 ++
9 files changed, 220 insertions(+), 25 deletions(-)
copy
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
rename
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerServer.java} (74%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Rename in preparation for adding server session expiration test
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 c4789c84ac057c0a25d96fe4f7991f0846570332
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:31 2024 +
Rename in preparation for adding server session expiration test
---
...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index 3267269361..2f101f3473 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocketC
int count = 0;
boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
count++;
-Thread.sleep(1000);
+Thread.sleep(100);
isOpen = false;
for (Session session : setA) {
if (session.isOpen()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Add a server equivalent of the session expiration test
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 2339792d483281689464a4789e1234dad06ee7e1
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:43 2024 +
Add a server equivalent of the session expiration test
---
...ocketContainerSessionExpiryContainerServer.java | 107 +
1 file changed, 107 insertions(+)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..16fbf4135e
--- /dev/null
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,107 @@
+/*
+ * 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.websocket;
+
+import java.util.Set;
+
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() +
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer)
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Process timeouts on every run of the background thread
+container.setProcessPeriod(0);
+
(tomcat) 01/04: Rename prior to extending with additional tests
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 2070b43e114a3a585d5fc6be2767a2560cb414f2
Author: Mark Thomas
AuthorDate: Wed Jan 17 15:20:59 2024 +
Rename prior to extending with additional tests
---
.../tomcat/websocket/TestWsSessionSuspendResume.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 0a853d83c7..cb54821662 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -44,11 +44,11 @@ import
org.apache.tomcat.websocket.server.TesterEndpointConfig;
public class TestWsSessionSuspendResume extends WebSocketBaseTest {
@Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
Tomcat tomcat = getTomcatInstance();
Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
@@ -59,7 +59,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() +
SuspendResumeConfig.PATH));
CountDownLatch latch = new CountDownLatch(2);
wsSession.addMessageHandler(String.class, message -> {
@@ -77,7 +77,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig
{
private static final String PATH = "/echo";
@Override
@@ -96,7 +96,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
@Override
public void onOpen(Session session, EndpointConfig epc) {
-MessageProcessor processor = new MessageProcessor(session, 3);
+SuspendResumeMessageProcessor processor = new
SuspendResumeMessageProcessor(session, 3);
session.addMessageHandler(String.class, message ->
processor.addMessage(message));
}
@@ -116,12 +116,12 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
private final Session session;
private final int count;
private final List messages = new ArrayList<>();
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
this.session = session;
this.count = count;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Refactor WebSocket close for suspend/resume
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 b0e3b1bd78de270d53e319d7cb79eb282aa53cb9
Author: Mark Thomas
AuthorDate: Thu Jan 18 11:32:43 2024 +
Refactor WebSocket close for suspend/resume
Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 +--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 99 ++
webapps/docs/changelog.xml | 5 ++
webapps/docs/web-socket-howto.xml | 7 ++
7 files changed, 187 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 7ec14131bd..f619c59642 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import jakarta.websocket.Extension;
@@ -94,6 +95,11 @@ public class Constants {
// Milliseconds so this is 20 seconds
public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY =
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT =
TimeUnit.SECONDS.toMillis(30);
+
// Configuration for read idle timeout on WebSocket session
public static final String READ_IDLE_TIMEOUT_MS =
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index f85c9c21ac..be16756bf4 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -115,6 +116,7 @@ public class WsSession implements Session {
private volatile long lastActiveRead = System.currentTimeMillis();
private volatile long lastActiveWrite = System.currentTimeMillis();
private Map futures = new
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
/**
@@ -593,7 +595,14 @@ public class WsSession implements Session {
*/
state.set(State.CLOSED);
// ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() +
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
}
// Fail any uncompleted messages.
@@ -632,7 +641,7 @@ public class WsSession implements Session {
state.set(State.CLOSED);
// Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
} else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
/*
* The local endpoint sent a close message the the same time as
the remote endpoint. The local close is
@@ -644,12 +653,55 @@ public class WsSession implements Session {
* The local endpoint sent the first close message. The remote
endpoint has now responded with its own close
* message so mark the session as fully closed and close the
network connection.
*/
-wsRemoteEndpoint.close();
+closeConnection();
}
// CLOSING and CLOSED are NO-OPs
}
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+webSocketContainer.unregisterSession(getSessionMapK
(tomcat) branch 10.1.x updated (9aedadc2ab -> ca1c4309ef)
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 9aedadc2ab Avoid useless add operation
new 60594b4708 Rename prior to extending with additional tests
new 0052b37468 Refactor WebSocket close for suspend/resume
new f93d11b186 Rename in preparation for adding server session expiration
test
new ca1c4309ef Add a server equivalent of the session expiration test
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 ++--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 113 +++--
...cketContainerSessionExpiryContainerClient.java} | 6 +-
...cketContainerSessionExpiryContainerServer.java} | 30 --
webapps/docs/changelog.xml | 5 +
webapps/docs/web-socket-howto.xml | 7 ++
9 files changed, 220 insertions(+), 25 deletions(-)
copy
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
rename
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerServer.java} (74%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Rename in preparation for adding server session expiration test
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 f93d11b18622cd1127e3570456d40654f11541eb
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:31 2024 +
Rename in preparation for adding server session expiration test
---
...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index 3267269361..2f101f3473 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocketC
int count = 0;
boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
count++;
-Thread.sleep(1000);
+Thread.sleep(100);
isOpen = false;
for (Session session : setA) {
if (session.isOpen()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Add a server equivalent of the session expiration test
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 ca1c4309efa565e1d4faca549d69f1b72a43c1cf
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:43 2024 +
Add a server equivalent of the session expiration test
---
...ocketContainerSessionExpiryContainerServer.java | 107 +
1 file changed, 107 insertions(+)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..16fbf4135e
--- /dev/null
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,107 @@
+/*
+ * 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.websocket;
+
+import java.util.Set;
+
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() +
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer)
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Process timeouts on every run of the background thread
+container.setProcessPeriod(0);
+
(tomcat) 01/04: Rename prior to extending with additional tests
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 60594b47083687b0d6af8d4188a8676b76e1ad00
Author: Mark Thomas
AuthorDate: Wed Jan 17 15:20:59 2024 +
Rename prior to extending with additional tests
---
.../tomcat/websocket/TestWsSessionSuspendResume.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 0a853d83c7..cb54821662 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -44,11 +44,11 @@ import
org.apache.tomcat.websocket.server.TesterEndpointConfig;
public class TestWsSessionSuspendResume extends WebSocketBaseTest {
@Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
Tomcat tomcat = getTomcatInstance();
Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
@@ -59,7 +59,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() +
SuspendResumeConfig.PATH));
CountDownLatch latch = new CountDownLatch(2);
wsSession.addMessageHandler(String.class, message -> {
@@ -77,7 +77,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig
{
private static final String PATH = "/echo";
@Override
@@ -96,7 +96,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
@Override
public void onOpen(Session session, EndpointConfig epc) {
-MessageProcessor processor = new MessageProcessor(session, 3);
+SuspendResumeMessageProcessor processor = new
SuspendResumeMessageProcessor(session, 3);
session.addMessageHandler(String.class, message ->
processor.addMessage(message));
}
@@ -116,12 +116,12 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
private final Session session;
private final int count;
private final List messages = new ArrayList<>();
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
this.session = session;
this.count = count;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Refactor WebSocket close for suspend/resume
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 0052b374684b613b0c849899b325ebe334ac6501
Author: Mark Thomas
AuthorDate: Thu Jan 18 11:32:43 2024 +
Refactor WebSocket close for suspend/resume
Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 +--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 99 ++
webapps/docs/changelog.xml | 5 ++
webapps/docs/web-socket-howto.xml | 7 ++
7 files changed, 187 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 85a6d1149c..16f3f8184f 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.Extension;
@@ -117,6 +118,11 @@ public class Constants {
// Milliseconds so this is 20 seconds
public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY =
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT =
TimeUnit.SECONDS.toMillis(30);
+
// Configuration for read idle timeout on WebSocket session
public static final String READ_IDLE_TIMEOUT_MS =
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 309b086118..0c1b2d18dd 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -115,6 +116,7 @@ public class WsSession implements Session {
private volatile long lastActiveRead = System.currentTimeMillis();
private volatile long lastActiveWrite = System.currentTimeMillis();
private Map futures = new
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
/**
@@ -593,7 +595,14 @@ public class WsSession implements Session {
*/
state.set(State.CLOSED);
// ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() +
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
}
// Fail any uncompleted messages.
@@ -632,7 +641,7 @@ public class WsSession implements Session {
state.set(State.CLOSED);
// Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
} else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
/*
* The local endpoint sent a close message the the same time as
the remote endpoint. The local close is
@@ -644,12 +653,55 @@ public class WsSession implements Session {
* The local endpoint sent the first close message. The remote
endpoint has now responded with its own close
* message so mark the session as fully closed and close the
network connection.
*/
-wsRemoteEndpoint.close();
+closeConnection();
}
// CLOSING and CLOSED are NO-OPs
}
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+w
(tomcat) 01/04: Rename prior to extending with additional tests
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 23b88103e5116064f52259e45b13c0f9c758e2fb
Author: Mark Thomas
AuthorDate: Wed Jan 17 15:20:59 2024 +
Rename prior to extending with additional tests
---
.../tomcat/websocket/TestWsSessionSuspendResume.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 26eff6645e..170222ad38 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -44,11 +44,11 @@ import
org.apache.tomcat.websocket.server.TesterEndpointConfig;
public class TestWsSessionSuspendResume extends WebSocketBaseTest {
@Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
Tomcat tomcat = getTomcatInstance();
Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
@@ -59,7 +59,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() +
SuspendResumeConfig.PATH));
CountDownLatch latch = new CountDownLatch(2);
wsSession.addMessageHandler(String.class, message -> {
@@ -77,7 +77,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig
{
private static final String PATH = "/echo";
@Override
@@ -96,7 +96,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
@Override
public void onOpen(Session session, EndpointConfig epc) {
-MessageProcessor processor = new MessageProcessor(session, 3);
+SuspendResumeMessageProcessor processor = new
SuspendResumeMessageProcessor(session, 3);
session.addMessageHandler(String.class, message ->
processor.addMessage(message));
}
@@ -116,12 +116,12 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
private final Session session;
private final int count;
private final List messages = new ArrayList<>();
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
this.session = session;
this.count = count;
}
-
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 (5b6fe1505c -> cffbd7fc16)
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 5b6fe1505c Update Tomcat Native to 1.3.x
new 23b88103e5 Rename prior to extending with additional tests
new 52d6650e06 Refactor WebSocket close for suspend/resume
new b42d224ca2 Rename in preparation for adding server session expiration
test
new cffbd7fc16 Add a server equivalent of the session expiration test
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 ++--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 113 +++--
...cketContainerSessionExpiryContainerClient.java} | 6 +-
...cketContainerSessionExpiryContainerServer.java} | 30 --
webapps/docs/changelog.xml | 5 +
webapps/docs/web-socket-howto.xml | 7 ++
9 files changed, 220 insertions(+), 25 deletions(-)
copy
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
rename
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerServer.java} (75%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Rename in preparation for adding server session expiration test
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 b42d224ca2c8758b7257406de0e2efe1068aa71a
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:31 2024 +
Rename in preparation for adding server session expiration test
---
...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index ee5b232ee2..aad99b46f7 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocketC
int count = 0;
boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
count++;
-Thread.sleep(1000);
+Thread.sleep(100);
isOpen = false;
for (Session session : setA) {
if (session.isOpen()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Add a server equivalent of the session expiration test
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 cffbd7fc16bf394b4ac7b652a62dbbb60ef9a0f7
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:43 2024 +
Add a server equivalent of the session expiration test
---
...ocketContainerSessionExpiryContainerServer.java | 107 +
1 file changed, 107 insertions(+)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..c9651ed46b
--- /dev/null
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,107 @@
+/*
+ * 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.websocket;
+
+import java.util.Set;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() +
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer)
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Process timeouts on every run of the background thread
+container.setProcessPeriod(0);
+
(tomcat) 02/04: Refactor WebSocket close for suspend/resume
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 52d6650e062d880704898d7d8c1b2b7a3efe8068
Author: Mark Thomas
AuthorDate: Thu Jan 18 11:32:43 2024 +
Refactor WebSocket close for suspend/resume
Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 +--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 99 ++
webapps/docs/changelog.xml | 5 ++
webapps/docs/web-socket-howto.xml | 7 ++
7 files changed, 187 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index d0a96e706d..d03e21abc8 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.websocket.Extension;
@@ -107,6 +108,11 @@ public class Constants {
// Milliseconds so this is 20 seconds
public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY =
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT =
TimeUnit.SECONDS.toMillis(30);
+
// Configuration for read idle timeout on WebSocket session
public static final String READ_IDLE_TIMEOUT_MS =
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 907f93abc9..e71b719e27 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -114,6 +115,7 @@ public class WsSession implements Session {
private volatile long lastActiveRead = System.currentTimeMillis();
private volatile long lastActiveWrite = System.currentTimeMillis();
private Map futures = new
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
/**
@@ -676,7 +678,14 @@ public class WsSession implements Session {
*/
state.set(State.CLOSED);
// ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() +
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
}
// Fail any uncompleted messages.
@@ -715,7 +724,7 @@ public class WsSession implements Session {
state.set(State.CLOSED);
// Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
} else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
/*
* The local endpoint sent a close message the the same time as
the remote endpoint. The local close is
@@ -727,12 +736,55 @@ public class WsSession implements Session {
* The local endpoint sent the first close message. The remote
endpoint has now responded with its own close
* message so mark the session as fully closed and close the
network connection.
*/
-wsRemoteEndpoint.close();
+closeConnection();
}
// CLOSING and CLOSED are NO-OPs
}
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+webSocketContainer.unregisterSession(getSessionMap
(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 5fb35e2f13 Fix typo
5fb35e2f13 is described below
commit 5fb35e2f135693a402d76f78651458e61491416c
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:24:21 2024 +
Fix typo
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index cfb5a81d3b..9ebcf43adb 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -259,7 +259,7 @@ standardHost.nullName=Le nom d'hôte est requis
standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
standardHost.problematicLegacyAppBase=L''utilisation d''une chaîne vide pour
legacyAppBase de l''hôte [{0}] le fixera à CATALINA_BASE, ce qui n''est pas
judicieux
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 46197b2f35..abf26cabb6 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -259,7 +259,7 @@ standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
standardHost.problematicLegacyAppBase=ホスト [{0}]
のlegacyAppBaseに空の文字列を使用すると、CATALINA_BASEに設定されます。これは悪い考えです
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
standardPipeline.basic.start=新しい基本 Valve を開始できません。
standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index a2a79cccec..b4c94b9697 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -244,7 +244,7 @@ standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
standardHost.problematicLegacyAppBase=호스트 [{0}]에 legacyAppBase로 빈 문자열이 설정되어
있는데, 이는 CATALINA_BASE로 재설정 할 것입니다만, 이는 좋지 않은 설정 방법입니다.
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 5cd9cab237..673d88d976 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -249,7 +249,7 @@ standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为CATALINA_BASE，这是个坏主意
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-
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 cd4b32ff34 Fix typo
cd4b32ff34 is described below
commit cd4b32ff34c2f0e3cb2cb74acd43c1d5d9399601
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:24:21 2024 +
Fix typo
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index a3d557cba7..79b33d46b7 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -259,7 +259,7 @@ standardHost.nullName=Le nom d'hôte est requis
standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
standardHost.problematicLegacyAppBase=L''utilisation d''une chaîne vide pour
legacyAppBase de l''hôte [{0}] le fixera à CATALINA_BASE, ce qui n''est pas
judicieux
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 675f70f1f9..f02937daf7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -259,7 +259,7 @@ standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
standardHost.problematicLegacyAppBase=ホスト [{0}]
のlegacyAppBaseに空の文字列を使用すると、CATALINA_BASEに設定されます。これは悪い考えです
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
standardPipeline.basic.start=新しい基本 Valve を開始できません。
standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 1ff351337a..3a8d4d82d8 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -249,7 +249,7 @@ standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
standardHost.problematicLegacyAppBase=호스트 [{0}]에 legacyAppBase로 빈 문자열이 설정되어
있는데, 이는 CATALINA_BASE로 재설정 할 것입니다만, 이는 좋지 않은 설정 방법입니다.
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index eb47d6ab2f..a92755704c 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -254,7 +254,7 @@ standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为CATALINA_BASE，这是个坏主意
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/05: Rename prior to extending with additional tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7b8d5cd4dc665d51bb5462ad99a57669d9cdaff7
Author: Mark Thomas
AuthorDate: Wed Jan 17 15:20:59 2024 +
Rename prior to extending with additional tests
---
.../tomcat/websocket/TestWsSessionSuspendResume.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 0ad56bd7a6..313411bd23 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -45,11 +45,11 @@ import
org.apache.tomcat.websocket.server.TesterEndpointConfig;
public class TestWsSessionSuspendResume extends WebSocketBaseTest {
@Test
-public void test() throws Exception {
+public void testSuspendResume() throws Exception {
Tomcat tomcat = getTomcatInstance();
Context ctx = getProgrammaticRootContext();
-ctx.addApplicationListener(Config.class.getName());
+ctx.addApplicationListener(SuspendResumeConfig.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
@@ -60,7 +60,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
-new URI("ws://localhost:" + getPort() + Config.PATH));
+new URI("ws://localhost:" + getPort() +
SuspendResumeConfig.PATH));
final CountDownLatch latch = new CountDownLatch(2);
wsSession.addMessageHandler(new MessageHandler.Whole() {
@@ -82,7 +82,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-public static final class Config extends TesterEndpointConfig {
+public static final class SuspendResumeConfig extends TesterEndpointConfig
{
private static final String PATH = "/echo";
@Override
@@ -101,7 +101,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
@Override
public void onOpen(Session session, EndpointConfig epc) {
-final MessageProcessor processor = new MessageProcessor(session,
3);
+final SuspendResumeMessageProcessor processor = new
SuspendResumeMessageProcessor(session, 3);
session.addMessageHandler(new MessageHandler.Whole() {
@Override
@@ -127,12 +127,12 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
}
-private static final class MessageProcessor {
+private static final class SuspendResumeMessageProcessor {
private final Session session;
private final int count;
private final List messages = new ArrayList<>();
-MessageProcessor(Session session, int count) {
+SuspendResumeMessageProcessor(Session session, int count) {
this.session = session;
this.count = count;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/05: Add a server equivalent of the session expiration test
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 54797e4d3459c84271ff7130c70218dc48f01066
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:43 2024 +
Add a server equivalent of the session expiration test
---
...ocketContainerSessionExpiryContainerServer.java | 112 +
1 file changed, 112 insertions(+)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
new file mode 100644
index 00..11a1985bb5
--- /dev/null
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerServer.java
@@ -0,0 +1,112 @@
+/*
+ * 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.websocket;
+
+import java.util.Set;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
+import org.apache.tomcat.websocket.server.Constants;
+import org.apache.tomcat.websocket.server.WsServerContainer;
+
+/*
+ * Moved to separate test class to improve test concurrency. These tests are
+ * some of the last tests to start and having them all in a single class
+ * significantly extends the length of a test run when using multiple test
+ * threads.
+ */
+public class TestWsWebSocketContainerSessionExpiryContainerServer extends
WsWebSocketContainerBaseTest {
+
+@Test
+public void testSessionExpiryContainer() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = getProgrammaticRootContext();
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+
ctx.addApplicationListener(WebSocketServerTimeoutConfig.class.getName());
+
+tomcat.start();
+
+// Need access to implementation methods for configuring unit tests
+WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
+
+EndpointA endpointA = new EndpointA();
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+
+// Check all three sessions are open
+Set setA = s3a.getOpenSessions();
+Assert.assertEquals(3, setA.size());
+
+int count = 0;
+boolean isOpen = true;
+while (isOpen && count < 100) {
+count++;
+Thread.sleep(100);
+isOpen = false;
+for (Session session : setA) {
+if (session.isOpen()) {
+isOpen = true;
+break;
+}
+}
+}
+
+if (isOpen) {
+for (Session session : setA) {
+if (session.isOpen()) {
+System.err.println("Session with ID [" + session.getId() +
"] is open");
+}
+}
+Assert.fail("There were open sessions");
+}
+}
+
+
+public static class WebSocketServerTimeoutConfig implements
ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+WsServerContainer container = (WsServerContainer)
sce.getServletContext().getAttribute(
+Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+// Process timeouts on every run of the background thread
+container.setProcessPeriod(0);
+
(tomcat) 02/05: Refactor WebSocket close for suspend/resume
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3631adb1342d8bbd8598802a12b63ad02c37d591
Author: Mark Thomas
AuthorDate: Thu Jan 18 11:32:43 2024 +
Refactor WebSocket close for suspend/resume
Ensure that WebSocket connection closure completes if the connection is
closed when the server side has used the proprietary suspend/resume
feature to suspend the connection.
---
java/org/apache/tomcat/websocket/Constants.java| 6 ++
java/org/apache/tomcat/websocket/WsSession.java| 67 +++--
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 107 +
webapps/docs/changelog.xml | 5 +
webapps/docs/web-socket-howto.xml | 7 ++
7 files changed, 195 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 23bb378c3f..a912b0a5ab 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.websocket.Extension;
@@ -107,6 +108,11 @@ public class Constants {
// Milliseconds so this is 20 seconds
public static final long DEFAULT_BLOCKING_SEND_TIMEOUT = 20 * 1000;
+// Configuration for session close timeout
+public static final String SESSION_CLOSE_TIMEOUT_PROPERTY =
"org.apache.tomcat.websocket.SESSION_CLOSE_TIMEOUT";
+// Default is 30 seconds - setting is in milliseconds
+public static final long DEFAULT_SESSION_CLOSE_TIMEOUT =
TimeUnit.SECONDS.toMillis(30);
+
// Configuration for read idle timeout on WebSocket session
public static final String READ_IDLE_TIMEOUT_MS =
"org.apache.tomcat.websocket.READ_IDLE_TIMEOUT_MS";
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 907f93abc9..e71b719e27 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -114,6 +115,7 @@ public class WsSession implements Session {
private volatile long lastActiveRead = System.currentTimeMillis();
private volatile long lastActiveWrite = System.currentTimeMillis();
private Map futures = new
ConcurrentHashMap<>();
+private volatile Long sessionCloseTimeoutExpiry;
/**
@@ -676,7 +678,14 @@ public class WsSession implements Session {
*/
state.set(State.CLOSED);
// ... and close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
+} else {
+/*
+ * Set close timeout. If the client fails to send a close message
response within the timeout, the session
+ * and the connection will be closed when the timeout expires.
+ */
+sessionCloseTimeoutExpiry =
+Long.valueOf(System.nanoTime() +
TimeUnit.MILLISECONDS.toNanos(getSessionCloseTimeout()));
}
// Fail any uncompleted messages.
@@ -715,7 +724,7 @@ public class WsSession implements Session {
state.set(State.CLOSED);
// Close the network connection.
-wsRemoteEndpoint.close();
+closeConnection();
} else if (state.compareAndSet(State.OUTPUT_CLOSING, State.CLOSING)) {
/*
* The local endpoint sent a close message the the same time as
the remote endpoint. The local close is
@@ -727,12 +736,55 @@ public class WsSession implements Session {
* The local endpoint sent the first close message. The remote
endpoint has now responded with its own close
* message so mark the session as fully closed and close the
network connection.
*/
-wsRemoteEndpoint.close();
+closeConnection();
}
// CLOSING and CLOSED are NO-OPs
}
+private void closeConnection() {
+/*
+ * Close the network connection.
+ */
+wsRemoteEndpoint.close();
+/*
+ * Don't unregister the session until the connection is fully closed
since webSocketContainer is responsible for
+ * tracking the session close timeout.
+ */
+webSocketContainer.unregisterSession(getSession
(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 1a410a8c78 Fix typo
1a410a8c78 is described below
commit 1a410a8c780480052be5b622edc98ef8e44cff31
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:24:21 2024 +
Fix typo
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 19248e1b73..42d794692b 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Le fils d'un hôte (child of a Host)
doit être un conte
standardHost.nullName=Le nom d'hôte est requis
standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 77abb407b8..92588f7fb3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Host の子供はContextでなければいけません
standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
standardPipeline.basic.start=新しい基本 Valve を開始できません。
standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index ef6f975b83..a7f0494553 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -256,7 +256,7 @@ standardHost.notContext=호스트의 자식은 반드시 컨텍스트이어야
standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 857e4d8db9..ca67190cb1 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -261,7 +261,7 @@ standardHost.notContext=主机的子节点必须有上下文
standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 05/05: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ad1a93f2dc3c63bd5394e0074a7bad22cdfe7a1b
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:24:21 2024 +
Fix typo
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index c3c63b60fa..97df1c63d8 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -268,7 +268,7 @@ standardHost.notContext=Le fils d'un hôte (child of a Host)
doit être un conte
standardHost.nullName=Le nom d'hôte est requis
standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9057f78537..3b8845b830 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -268,7 +268,7 @@ standardHost.notContext=Host の子供はContextでなければいけません
standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
standardPipeline.basic.start=新しい基本 Valve を開始できません。
standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index d0e3884015..caa8803a4b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -258,7 +258,7 @@ standardHost.notContext=호스트의 자식은 반드시 컨텍스트이어야
standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 29702fd15c..e419e5ff7b 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -262,7 +262,7 @@ standardHost.notContext=主机的子节点必须有上下文
standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/05: Rename in preparation for adding server session expiration test
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 810af66c15dd5635128346e442799c21c68f621c
Author: Mark Thomas
AuthorDate: Thu Jan 18 15:59:31 2024 +
Rename in preparation for adding server session expiration test
---
...va => TestWsWebSocketContainerSessionExpiryContainerClient.java} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
similarity index 94%
rename from
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
rename to
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
index ee5b232ee2..aad99b46f7 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainerClient.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainerClient extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpiryContainer() throws Exception {
@@ -67,9 +67,9 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocketC
int count = 0;
boolean isOpen = true;
-while (isOpen && count < 8) {
+while (isOpen && count < 100) {
count++;
-Thread.sleep(1000);
+Thread.sleep(100);
isOpen = false;
for (Session session : setA) {
if (session.isOpen()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated (a206601da3 -> ad1a93f2dc)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from a206601da3 Add entry for the debug strings
new 7b8d5cd4dc Rename prior to extending with additional tests
new 3631adb134 Refactor WebSocket close for suspend/resume
new 810af66c15 Rename in preparation for adding server session expiration
test
new 54797e4d34 Add a server equivalent of the session expiration test
new ad1a93f2dc Fix typo
The 5 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:
.../catalina/core/LocalStrings_fr.properties | 2 +-
.../catalina/core/LocalStrings_ja.properties | 2 +-
.../catalina/core/LocalStrings_ko.properties | 2 +-
.../catalina/core/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/websocket/Constants.java| 6 +
java/org/apache/tomcat/websocket/WsSession.java| 67 +++-
.../tomcat/websocket/WsWebSocketContainer.java | 9 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +-
.../websocket/TestWsSessionSuspendResume.java | 121 +++--
...cketContainerSessionExpiryContainerClient.java} | 6 +-
...cketContainerSessionExpiryContainerServer.java} | 35 --
webapps/docs/changelog.xml | 5 +
webapps/docs/web-socket-howto.xml | 7 ++
13 files changed, 237 insertions(+), 29 deletions(-)
copy
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerClient.java} (94%)
rename
test/org/apache/tomcat/websocket/{TestWsWebSocketContainerSessionExpiryContainer.java
=> TestWsWebSocketContainerSessionExpiryContainerServer.java} (73%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (5fb35e2f13 -> 10e3731f34)
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 5fb35e2f13 Fix typo new 07c09f6dde Improvements to French translations. (remm) new c7ec4be26c Improvements to Japanese translations by tak7iji new 10e3731f34 Reove unused translation The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../authenticator/LocalStrings_ja.properties | 6 ++--- .../jaspic/LocalStrings_ja.properties | 4 ++-- .../catalina/core/LocalStrings_ja.properties | 4 ++-- .../catalina/loader/LocalStrings_ja.properties | 2 +- .../catalina/servlets/LocalStrings_ja.properties | 2 +- .../catalina/startup/LocalStrings_ja.properties| 6 ++--- .../tribes/tipis/LocalStrings_fr.properties| 1 - .../tribes/tipis/LocalStrings_ja.properties| 1 - .../tribes/tipis/LocalStrings_ko.properties| 1 - .../tribes/tipis/LocalStrings_zh_CN.properties | 1 - .../catalina/util/LocalStrings_ja.properties | 2 +- .../catalina/valves/LocalStrings_ja.properties | 4 ++-- .../http11/upgrade/LocalStrings_ja.properties | 2 +- .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++--- .../jasper/resources/LocalStrings_ja.properties| 7 +++--- .../util/net/openssl/LocalStrings_ja.properties| 4 ++-- .../net/openssl/panama/LocalStrings_fr.properties | 2 ++ .../net/openssl/panama/LocalStrings_ja.properties | 8 --- .../tomcat/util/threads/LocalStrings_fr.properties | 2 ++ .../tomcat/util/threads/LocalStrings_ja.properties | 2 ++ .../websocket/pojo/LocalStrings_ja.properties | 22 +- webapps/docs/changelog.xml | 6 + 22 files changed, 64 insertions(+), 52 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Reove unused translation
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 10e3731f344cd0d018d4be2ee767c105d2832283
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:49:49 2024 +
Reove unused translation
---
java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다:
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새
노드로 다시 위치시킬 것입니다.
abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만,
아직 가용하지 않습니다.
abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간
초과되었습니다.
abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에
완료되었습니다.
diff --git
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Improvements to French translations. (remm)
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 07c09f6ddef388fac9f9332b9a8fede325086b41
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:46:18 2024 +
Improvements to French translations. (remm)
---
java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
.../apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a
été dépassé po
abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore
disponible
abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée
a été ajouté : [{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les
entrées correspondantes seront déplacées sur le nouveau nœud
abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est
transféré mais il n''est pas encore disponible
abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée
[{1}] a fait un timeout lors du traitement d''un ping
abstractReplicatedMap.relocate.complete=La relocation des entrées de la
structure répliquée a été finie en [{0}] ms
diff --git
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
index 17685fa584..3d40e40d20 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_fr.properties
@@ -51,6 +51,8 @@ openssl.errMakeConf=Impossible de créer le contexte de
OpenSSLConf
openssl.errorAddingCertificate=Erreur lors de l''ajout du certificat à la
chaîne: [{0}]
openssl.errorConfiguringLocations=Erreur lors de la configuration des
emplacements des certificats CA: [{0}]
openssl.errorLoadingCertificate=Erreur lors du chargement du certificat: [{0}]
+openssl.errorLoadingCertificateRevocationListWithError=Erreur de chargement de
la révocation des certificats [{0}] avec l''erreur [{1}]
+openssl.errorLoadingCertificateWithError=Erreur de chargement du certificat
[{0}] avec l''erreur [{1}]
openssl.errorLoadingPassword=Erreur lors du chargment du fichier mot de passe:
[{0}]
openssl.errorLoadingPrivateKey=Erreur lors du chargment de la clé privée: [{0}]
openssl.errorPrivateKeyCheck=La clé privée ne correspond pas à la clé publique
du certificat: [{0}]
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux
doivent avoir un temp
threadPoolExecutor.queueFull=La file d'attente est pleine
threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}]
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 227c4cb3dc..83df531853 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -259,6 +259,9 @@
Add strings for debug level messages. (remm)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Improvements to Japanese translations by tak7iji
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c7ec4be26cf9179378e6bed14199d7b944480bb9
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:48:25 2024 +
Improvements to Japanese translations by tak7iji
---
.../authenticator/LocalStrings_ja.properties | 6 ++---
.../jaspic/LocalStrings_ja.properties | 4 ++--
.../catalina/core/LocalStrings_ja.properties | 4 ++--
.../catalina/loader/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties| 6 ++---
.../tribes/tipis/LocalStrings_ja.properties| 1 -
.../catalina/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 4 ++--
.../http11/upgrade/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
.../jasper/resources/LocalStrings_ja.properties| 7 +++---
.../util/net/openssl/LocalStrings_ja.properties| 4 ++--
.../net/openssl/panama/LocalStrings_ja.properties | 8 ---
.../tomcat/util/threads/LocalStrings_ja.properties | 2 ++
.../websocket/pojo/LocalStrings_ja.properties | 22 +-
webapps/docs/changelog.xml | 3 +++
17 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 74c200a3ab..2ae45738bd 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -18,8 +18,8 @@ authConfigFactoryImpl.nullContext=提供されたコンテキストオブジェ
authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス
[{0}] を登録します。
authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}]
とアプリケーションコンテキスト [{2}] に登録しています
authConfigFactoryImpl.unsupportedContextType=この実装は、jakarta.servlet.ServletContext型のコンテキストのみをサポートしますが、提供されたコンテキストは[{0}]型でした
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}]
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/Local
(tomcat) branch 10.1.x updated (cd4b32ff34 -> c72ec5de07)
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 cd4b32ff34 Fix typo new d7f6a3f7fd Alphabetical order and correct grouping - no funcitonal change new 4bd3fbc8e0 Improvements to French translations. (remm) new d1cdb8879e Improvements to Japanese translations by tak7iji new c72ec5de07 Remove unused translation The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/authenticator/LocalStrings.properties | 2 +- .../authenticator/LocalStrings_ja.properties | 6 ++--- .../jaspic/LocalStrings_ja.properties | 4 ++-- .../catalina/core/LocalStrings_ja.properties | 4 ++-- .../catalina/loader/LocalStrings_ja.properties | 2 +- .../catalina/servlets/LocalStrings_ja.properties | 2 +- .../catalina/startup/LocalStrings_ja.properties| 6 ++--- .../tribes/tipis/LocalStrings_fr.properties| 1 - .../tribes/tipis/LocalStrings_ja.properties| 1 - .../tribes/tipis/LocalStrings_ko.properties| 1 - .../tribes/tipis/LocalStrings_zh_CN.properties | 1 - .../catalina/util/LocalStrings_ja.properties | 2 +- .../apache/catalina/valves/LocalStrings.properties | 2 +- .../catalina/valves/LocalStrings_ja.properties | 4 ++-- .../http11/upgrade/LocalStrings_ja.properties | 2 +- .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++--- .../jasper/resources/LocalStrings_ja.properties| 5 ++-- .../util/codec/binary/LocalStrings.properties | 1 - .../util/net/openssl/LocalStrings_ja.properties| 4 ++-- .../tomcat/util/threads/LocalStrings_fr.properties | 2 ++ .../tomcat/util/threads/LocalStrings_ja.properties | 2 ++ .../websocket/pojo/LocalStrings_ja.properties | 22 +- webapps/docs/changelog.xml | 6 + 23 files changed, 58 insertions(+), 51 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Remove unused translation
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 c72ec5de07a486388bd9cdda549cc07b8e9cefa2
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:59:21 2024 +
Remove unused translation
---
java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다:
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새
노드로 다시 위치시킬 것입니다.
abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만,
아직 가용하지 않습니다.
abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간
초과되었습니다.
abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에
완료되었습니다.
diff --git
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4bd3fbc8e0322f48f9218a038459f232d4fcd2b1
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:57:56 2024 +
Improvements to French translations. (remm)
---
java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a
été dépassé po
abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore
disponible
abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée
a été ajouté : [{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les
entrées correspondantes seront déplacées sur le nouveau nœud
abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est
transféré mais il n''est pas encore disponible
abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée
[{1}] a fait un timeout lors du traitement d''un ping
abstractReplicatedMap.relocate.complete=La relocation des entrées de la
structure répliquée a été finie en [{0}] ms
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux
doivent avoir un temp
threadPoolExecutor.queueFull=La file d'attente est pleine
threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}]
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eeb1bbba8e..c3124c7e29 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,9 @@
Add strings for debug level messages. (remm)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Improvements to Japanese translations by tak7iji
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 d1cdb8879ea6253e1d75a2621e7fe236c4cacbd9
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:59:00 2024 +
Improvements to Japanese translations by tak7iji
---
.../authenticator/LocalStrings_ja.properties | 6 ++---
.../jaspic/LocalStrings_ja.properties | 4 ++--
.../catalina/core/LocalStrings_ja.properties | 4 ++--
.../catalina/loader/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties| 6 ++---
.../tribes/tipis/LocalStrings_ja.properties| 1 -
.../catalina/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 4 ++--
.../http11/upgrade/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
.../jasper/resources/LocalStrings_ja.properties| 5 ++--
.../util/net/openssl/LocalStrings_ja.properties| 4 ++--
.../tomcat/util/threads/LocalStrings_ja.properties | 2 ++
.../websocket/pojo/LocalStrings_ja.properties | 22 +-
webapps/docs/changelog.xml | 3 +++
16 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 74c200a3ab..2ae45738bd 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -18,8 +18,8 @@ authConfigFactoryImpl.nullContext=提供されたコンテキストオブジェ
authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス
[{0}] を登録します。
authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}]
とアプリケーションコンテキスト [{2}] に登録しています
authConfigFactoryImpl.unsupportedContextType=この実装は、jakarta.servlet.ServletContext型のコンテキストのみをサポートしますが、提供されたコンテキストは[{0}]型でした
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}]
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index f02937daf7..f122d334eb 100644
--- a/j
(tomcat) 01/04: Alphabetical order and correct grouping - no funcitonal 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 d7f6a3f7fdad7a39e49921af4b4f7e7e4734aadf
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:56:14 2024 +
Alphabetical order and correct grouping - no funcitonal change
---
java/org/apache/catalina/authenticator/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization
header sent by the clien
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied
ticket
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of
HTTP/2.
sslAuthenticatorValve.noCertificates=No certificates are included with this
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
+errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}]
due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.message=Message
errorReportValve.noDescription=No description available
errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
base64.inputTooLarge=Input array too large, the output array would be bigger
[{0}] than the specified maximum size of [{1}]
base64.lineSeparator=Line separator must not contain base64 characters [{0}]
base64.nullEncodeParameter=Cannot encode integer with null parameter
-
base64.outOfMemory=Unable to allocate array size [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated (1a410a8c78 -> 084671ca88)
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 1a410a8c78 Fix typo new 201ef0f9ae Fix ordering and grouping - no functional change new 4324a6f682 Improvements to French translations. (remm) new b33b8796ac Improvements to Japanese translations by tak7iji new 084671ca88 Remove unused translation The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/authenticator/LocalStrings.properties | 2 +- .../authenticator/LocalStrings_ja.properties | 6 ++--- .../jaspic/LocalStrings_ja.properties | 4 ++-- .../catalina/core/LocalStrings_ja.properties | 4 ++-- .../catalina/loader/LocalStrings_ja.properties | 2 +- .../catalina/servlets/LocalStrings_ja.properties | 2 +- .../catalina/startup/LocalStrings_ja.properties| 6 ++--- .../tribes/tipis/LocalStrings_fr.properties| 1 - .../tribes/tipis/LocalStrings_ja.properties| 1 - .../tribes/tipis/LocalStrings_ko.properties| 1 - .../tribes/tipis/LocalStrings_zh_CN.properties | 1 - .../catalina/util/LocalStrings_ja.properties | 2 +- .../apache/catalina/valves/LocalStrings.properties | 2 +- .../catalina/valves/LocalStrings_ja.properties | 4 ++-- .../http11/upgrade/LocalStrings_ja.properties | 2 +- .../apache/coyote/http2/LocalStrings_ja.properties | 27 +++--- .../jasper/resources/LocalStrings_ja.properties| 3 ++- .../util/codec/binary/LocalStrings.properties | 1 - .../util/net/openssl/LocalStrings_ja.properties| 4 ++-- .../tomcat/util/threads/LocalStrings_fr.properties | 2 ++ .../tomcat/util/threads/LocalStrings_ja.properties | 2 ++ .../websocket/pojo/LocalStrings_ja.properties | 22 +- webapps/docs/changelog.xml | 6 + 23 files changed, 57 insertions(+), 50 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Fix ordering and grouping - 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
commit 201ef0f9ae74233438c35252633696b6198e8947
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:02:20 2024 +
Fix ordering and grouping - no functional change
---
java/org/apache/catalina/authenticator/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization
header sent by the clien
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied
ticket
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of
HTTP/2.
sslAuthenticatorValve.noCertificates=No certificates are included with this
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
+errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}]
due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.message=Message
errorReportValve.noDescription=No description available
errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
base64.inputTooLarge=Input array too large, the output array would be bigger
[{0}] than the specified maximum size of [{1}]
base64.lineSeparator=Line separator must not contain base64 characters [{0}]
base64.nullEncodeParameter=Cannot encode integer with null parameter
-
base64.outOfMemory=Unable to allocate array size [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Remove unused translation
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 084671ca8876c888b6c2d0d8aa546edd05d83218
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:03:22 2024 +
Remove unused translation
---
java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다:
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새
노드로 다시 위치시킬 것입니다.
abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만,
아직 가용하지 않습니다.
abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간
초과되었습니다.
abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에
완료되었습니다.
diff --git
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Improvements to Japanese translations by tak7iji
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 b33b8796ac8a5a9f850dcd743c6c54fd518aff98
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:03:11 2024 +
Improvements to Japanese translations by tak7iji
---
.../authenticator/LocalStrings_ja.properties | 6 ++---
.../jaspic/LocalStrings_ja.properties | 4 ++--
.../catalina/core/LocalStrings_ja.properties | 4 ++--
.../catalina/loader/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties| 6 ++---
.../tribes/tipis/LocalStrings_ja.properties| 1 -
.../catalina/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 4 ++--
.../http11/upgrade/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 27 +++---
.../jasper/resources/LocalStrings_ja.properties| 3 ++-
.../util/net/openssl/LocalStrings_ja.properties| 4 ++--
.../tomcat/util/threads/LocalStrings_ja.properties | 2 ++
.../websocket/pojo/LocalStrings_ja.properties | 22 +-
webapps/docs/changelog.xml | 3 +++
16 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 76b9155735..b85800063a 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -16,8 +16,8 @@
authConfigFactoryImpl.load=[{0}]から永続化プロバイダの登録を読み込みます。
authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス
[{0}] を登録します。
authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}]
とアプリケーションコンテキスト [{2}] に登録しています
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}]
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 92588f7fb3..12cdd3556f 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@
(tomcat) 02/04: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4324a6f6820403c9bc3c840eca21b2f020847b0c
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:02:44 2024 +
Improvements to French translations. (remm)
---
java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a
été dépassé po
abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore
disponible
abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée
a été ajouté : [{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les
entrées correspondantes seront déplacées sur le nouveau nœud
abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est
transféré mais il n''est pas encore disponible
abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée
[{1}] a fait un timeout lors du traitement d''un ping
abstractReplicatedMap.relocate.complete=La relocation des entrées de la
structure répliquée a été finie en [{0}] ms
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux
doivent avoir un temp
threadPoolExecutor.queueFull=La file d'attente est pleine
threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}]
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 27781eb925..20189409e1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,9 @@
Update Tomcat Native to 1.3.0. (markt)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/05: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ef289696ae0a7e82b4615eee55f675b612c4c732
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:05:45 2024 +
Improvements to French translations. (remm)
---
java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties | 1 -
.../apache/catalina/tribes/transport/nio/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/threads/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
index dbbec8bbdb..e8a4dc7bbf 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=Le délai d''attente a
été dépassé po
abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore
disponible
abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure répliquée
a été ajouté : [{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=Notifié que le membre n''est
pas disponible dans le registre de membres : [{0}]
-abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les
entrées correspondantes seront déplacées sur le nouveau nœud
abstractReplicatedMap.ping.stateTransferredMember=L''état du membre [{0}] est
transféré mais il n''est pas encore disponible
abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte répliquée
[{1}] a fait un timeout lors du traitement d''un ping
abstractReplicatedMap.relocate.complete=La relocation des entrées de la
structure répliquée a été finie en [{0}] ms
diff --git
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
index 432de41eae..e577c471b9 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties
@@ -16,6 +16,7 @@
nioReceiver.alreadyStarted=ServerSocketChannel est déjà démarré
nioReceiver.cleanup.fail=Impossible de nettoyer lors de la fermeture du
sélecteur
nioReceiver.clientDisconnect=Le client de réplication est déconnecté, erreur
lors du "polling" de clé. Le client est ignoré.
+nioReceiver.eventsError=Erreur lors du traitement des évènements
nioReceiver.requestError=Impossible de traiter la requête dans NioReceiver
nioReceiver.run.fail=Impossible d'exécuter l'écouteur de réplication
nioReceiver.start.fail=Incapable de démarrer le récepteur de cluster
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 77e0529823..4cb10a86a7 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -19,3 +19,5 @@ threadPoolExecutor.invalidKeepAlive=Les threads principaux
doivent avoir un temp
threadPoolExecutor.queueFull=La file d'attente est pleine
threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}]
pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
+
+virtualThreadExecutor.taskRejected=La tâche [{0}] a été rejetée de [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f02398080..8e1bef4bb7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,6 +225,9 @@
Add strings for debug level messages. (remm)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/05: Fix order/grouping. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6eb411c784a0c8a3df0323c34570ee40908d68c5
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:05:07 2024 +
Fix order/grouping. No functional change.
---
java/org/apache/catalina/authenticator/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/codec/binary/LocalStrings.properties | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 4909ee1967..62825a2578 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -88,7 +88,7 @@ spnegoAuthenticator.authHeaderNotNego=The authorization
header sent by the clien
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied
ticket
+sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.http2=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
HTTP/2. Use of CLIENT-CERT authentication is not compatible with the use of
HTTP/2.
sslAuthenticatorValve.noCertificates=No certificates are included with this
request
-sslAuthenticatorValve.authFailed=Authentication with the provided certificates
failed
sslAuthenticatorValve.tls13=The context [{0}] in virtual host [{1}] is
configured to use CLIENT-CERT authentication and [{2}] is configured to support
TLS 1.3 using JSSE. Use of CLIENT-CERT authentication is not compatible with
the use of TLS 1.3 and JSSE.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 13466d2f12..c91f3c7269 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,12 +26,12 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
+errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}]
due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.message=Message
errorReportValve.noDescription=No description available
errorReportValve.note=Note
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
index 6b17260a15..794f26c05b 100644
--- a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
@@ -17,5 +17,4 @@ base64.impossibleModulus=Impossible modulus [{0}]
base64.inputTooLarge=Input array too large, the output array would be bigger
[{0}] than the specified maximum size of [{1}]
base64.lineSeparator=Line separator must not contain base64 characters [{0}]
base64.nullEncodeParameter=Cannot encode integer with null parameter
-
base64.outOfMemory=Unable to allocate array size [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated (ad1a93f2dc -> 41197ccd64)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from ad1a93f2dc Fix typo new 6eb411c784 Fix order/grouping. No functional change. new ef289696ae Improvements to French translations. (remm) new 18a1bc15ca Improvements to Japanese translations by tak7iji new 68b01be503 Remove unused translations new 41197ccd64 Back-port addditional translations The 5 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: .../catalina/authenticator/LocalStrings.properties | 2 +- .../authenticator/LocalStrings_ja.properties | 6 +++--- .../jaspic/LocalStrings_ja.properties | 4 ++-- .../catalina/core/LocalStrings_ja.properties | 4 ++-- .../catalina/loader/LocalStrings_ja.properties | 2 +- .../catalina/servlets/LocalStrings_ja.properties | 2 +- .../catalina/startup/LocalStrings_ja.properties| 6 +++--- .../tribes/tipis/LocalStrings_fr.properties| 1 - .../tribes/tipis/LocalStrings_ja.properties| 1 - .../tribes/tipis/LocalStrings_ko.properties| 1 - .../tribes/tipis/LocalStrings_zh_CN.properties | 1 - .../transport/nio/LocalStrings_fr.properties | 1 + .../transport/nio/LocalStrings_ja.properties | 1 + .../transport/nio/LocalStrings_ko.properties | 1 + .../transport/nio/LocalStrings_zh_CN.properties| 1 + .../catalina/util/LocalStrings_ja.properties | 2 +- .../apache/catalina/valves/LocalStrings.properties | 2 +- .../catalina/valves/LocalStrings_ja.properties | 4 ++-- .../http11/upgrade/LocalStrings_ja.properties | 2 +- .../apache/coyote/http2/LocalStrings_ja.properties | 25 +++--- .../jasper/resources/LocalStrings_ja.properties| 3 ++- .../util/codec/binary/LocalStrings.properties | 1 - .../util/net/openssl/LocalStrings_ja.properties| 4 ++-- .../tomcat/util/threads/LocalStrings_fr.properties | 2 ++ .../tomcat/util/threads/LocalStrings_ja.properties | 2 ++ .../websocket/pojo/LocalStrings_ja.properties | 22 +-- webapps/docs/changelog.xml | 6 ++ 27 files changed, 60 insertions(+), 49 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/05: Improvements to Japanese translations by tak7iji
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 18a1bc15cac216513f6817eb72334a15f7c30654
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:06:11 2024 +
Improvements to Japanese translations by tak7iji
---
.../authenticator/LocalStrings_ja.properties | 6 +++---
.../jaspic/LocalStrings_ja.properties | 4 ++--
.../catalina/core/LocalStrings_ja.properties | 4 ++--
.../catalina/loader/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties| 6 +++---
.../tribes/tipis/LocalStrings_ja.properties| 1 -
.../transport/nio/LocalStrings_ja.properties | 1 +
.../catalina/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 4 ++--
.../http11/upgrade/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 25 +++---
.../jasper/resources/LocalStrings_ja.properties| 3 ++-
.../util/net/openssl/LocalStrings_ja.properties| 4 ++--
.../tomcat/util/threads/LocalStrings_ja.properties | 2 ++
.../websocket/pojo/LocalStrings_ja.properties | 22 +--
webapps/docs/changelog.xml | 3 +++
17 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 10f1fa3c7e..0bc7790bbe 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
+authenticator.jaspicCleanSubjectFail=JASPIC Subject のクリーンアップに失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
@@ -51,7 +51,7 @@ formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] です
singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
+singleSignOn.debug.cookieCheck=SSOはSSO Cookieをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
@@ -67,7 +67,7 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
+singleSignOn.sessionExpire.engineNull=Engine が null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index 76b9155735..b85800063a 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
@@ -16,8 +16,8 @@
authConfigFactoryImpl.load=[{0}]から永続化プロバイダの登録を読み込みます。
authConfigFactoryImpl.registerClass=アプリケーションコンテキスト [{2}] のレイヤー [{1}] にクラス
[{0}] を登録します。
authConfigFactoryImpl.registerInstance=認証構成プロバイダ [{0}] のインスタンスを、レイヤ [{1}]
とアプリケーションコンテキスト [{2}] に登録しています
-authConfigFactoryImpl.zeroLengthAppContext=文字列長が 0 のアプリケーションコンテキスト名は無効です。
-authConfigFactoryImpl.zeroLengthMessageLayer=長さゼロのメッセージレイヤ名は無効です
+authConfigFactoryImpl.zeroLengthAppContext=長さ 0 のアプリケーションコンテキスト名は無効です
+authConfigFactoryImpl.zeroLengthMessageLayer=長さ 0 のメッセージレイヤ名は無効です
callbackHandlerImpl.containerMissing=無視されたタイプ [{0}] のJASPICコールバックのコンテナーがありません
callbackHandlerImpl.jaspicCallbackMissing=受信したタイプ [{0}]
のサポートされていないJASPICコールバックが無視されました
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 3b8845b830..95c193ef52 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++
(tomcat) 04/05: Remove unused translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 68b01be50337b900cf33708dce91abff9c0b93c3
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:06:33 2024 +
Remove unused translations
---
java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties| 1 -
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
index 8144318ca8..f4301207c7 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING 메시지가 제한 시간을 초과
abstractReplicatedMap.mapMember.unavailable=멤버 [{0}]은(는) 아직 가용하지 않습니다.
abstractReplicatedMap.mapMemberAdded.added=Map 멤버가 추가되었습니다:[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=통지된 멤버는 멤버십에 등록되어 있지 않습니다:
[{0}]
-abstractReplicatedMap.member.disappeared=멤버 [{0}]이(가) 사라졌습니다. 관련 Map 엔트리들은 새
노드로 다시 위치시킬 것입니다.
abstractReplicatedMap.ping.stateTransferredMember=멤버 [{0}]이(가), 상태가 이전된 상태이지만,
아직 가용하지 않습니다.
abstractReplicatedMap.ping.timeout=Map [{1}] 내의 멤버 [{0}]은(는) ping 처리 중에 제한 시간
초과되었습니다.
abstractReplicatedMap.relocate.complete=Map 엔트리들을 재위치시키는 작업이 [{0}] 밀리초에
완료되었습니다.
diff --git
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 6d2631b652..575ff86e11 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -22,7 +22,6 @@ abstractReplicatedMap.leftOver.pingMsg=PING消息已超过超时时间。映射
abstractReplicatedMap.mapMember.unavailable=Member[{0}]还不可用
abstractReplicatedMap.mapMemberAdded.added=已添加映射成员：[{0}]
abstractReplicatedMap.mapMemberAdded.nullMember=通知的成员未注册：[{0}]
-abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.ping.stateTransferredMember=成员[{0}]已状态转移，但尚不可用。
abstractReplicatedMap.ping.timeout=映射[{1}]中的成员[{0}]在ping处理中超时。
abstractReplicatedMap.relocate.complete=已在[{0}]ms内完成映射项的重新定位。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 05/05: Back-port addditional translations
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 41197ccd64c0c1e92b72dca4c781d25fd9a9d7d3 Author: Mark Thomas AuthorDate: Tue Feb 13 11:06:47 2024 + Back-port addditional translations --- java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties | 1 + .../apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties index 070cd1c666..1268e356fa 100644 --- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties +++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties @@ -16,6 +16,7 @@ nioReceiver.alreadyStarted=ServerSocketChannel이 이미 시작되었습니다. nioReceiver.cleanup.fail=selector close 시에 cleanup을 할 수 없습니다. nioReceiver.clientDisconnect=복제 클라이언트가 연결이 끊겼습니다. 키를 poll할 때, 오류가 발생했습니다. 해당 클라이언트는 무시됩니다. +nioReceiver.eventsError=이벤트들을 처리하는 중 오류 발생 nioReceiver.requestError=NioReceiver에서 요청을 처리할 수 없습니다. nioReceiver.run.fail=복제 리스너를 실행할 수 없습니다. nioReceiver.start.fail=클러스터 receiver를 시작 할 수 없습니다. diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties index 5baf3e8da4..b2f297453c 100644 --- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties @@ -16,6 +16,7 @@ nioReceiver.alreadyStarted=ServerSocketChannel已经被启动 nioReceiver.cleanup.fail=无法清除关闭的选择器 nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。 +nioReceiver.eventsError=处理事件时出错 nioReceiver.requestError=NioReceiver无法处理请求 nioReceiver.run.fail=不能允许复制监听器 nioReceiver.start.fail=无法启动集群接收器 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Re-enable tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 838f0b6b40 Re-enable tests
838f0b6b40 is described below
commit 838f0b6b4014a7459d84814ab59f0849232fa34b
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:12:02 2024 +
Re-enable tests
Recent improvements to APR stability appear to have fixed the issues
with these tests.
---
test/org/apache/tomcat/websocket/server/TestClose.java | 9 -
1 file changed, 9 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java
b/test/org/apache/tomcat/websocket/server/TestClose.java
index 97535709f3..052af7e9f7 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -34,7 +34,6 @@ import javax.websocket.Session;
import javax.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -115,10 +114,6 @@ public class TestClose extends WebSocketBaseTest {
@Test
public void testTcpClose() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
startServer(TestEndpointConfig.class);
TesterWsClient client = new TesterWsClient("localhost", getPort());
@@ -178,10 +173,6 @@ public class TestClose extends WebSocketBaseTest {
@Test
public void testTcpCloseInOnMessage() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
startServer(TestEndpointConfig.class);
TesterWsClient client = new TesterWsClient("localhost", getPort());
-
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: Re-enable tests
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 bb80f82210 Re-enable tests
bb80f82210 is described below
commit bb80f8221030e476f57fc10c0ed4b6f80628285a
Author: Mark Thomas
AuthorDate: Tue Feb 13 11:12:02 2024 +
Re-enable tests
Recent improvements to APR stability appear to have fixed the issues
with these tests.
---
test/org/apache/tomcat/websocket/server/TestClose.java | 9 -
1 file changed, 9 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java
b/test/org/apache/tomcat/websocket/server/TestClose.java
index 97535709f3..052af7e9f7 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -34,7 +34,6 @@ import javax.websocket.Session;
import javax.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -115,10 +114,6 @@ public class TestClose extends WebSocketBaseTest {
@Test
public void testTcpClose() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
startServer(TestEndpointConfig.class);
TesterWsClient client = new TesterWsClient("localhost", getPort());
@@ -178,10 +173,6 @@ public class TestClose extends WebSocketBaseTest {
@Test
public void testTcpCloseInOnMessage() throws Exception {
-// TODO
-Assume.assumeFalse("This test currently fails for APR",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Apr"));
-
startServer(TestEndpointConfig.class);
TesterWsClient client = new TesterWsClient("localhost", getPort());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/858 Blamelist: Mark Thomas , remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 1a410a8c780480052be5b622edc98ef8e44cff31 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
February release tagging
Hi all, Just a quick status update. I was hopping to have tagged 11.0.x by now but I have found a couple of issues. 1. FFM on MacOS is broken. This might be related to me updating OpenSSL (via homebrew) from 3.2.0 to 3.2.1 2. I'm seeing a couple of HTTP/2 test failures on Windows. I'm currently investigating. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
On Tue, Feb 13, 2024 at 2:12 PM Mark Thomas wrote: > > Hi all, > > Just a quick status update. > > I was hopping to have tagged 11.0.x by now but I have found a couple of > issues. > > 1. FFM on MacOS is broken. This might be related to me updating OpenSSL > (via homebrew) from 3.2.0 to 3.2.1 TBH everyone is probably still on 3.1, so it does not matter. The build will be replaced next month, so no need to rush with a fix ... > 2. I'm seeing a couple of HTTP/2 test failures on Windows. > > I'm currently investigating. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-8.5.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/755 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 8.5.x] 838f0b6b4014a7459d84814ab59f0849232fa34b Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
On Tue, Feb 13, 2024 at 2:12 PM Mark Thomas wrote: > > Hi all, > > Just a quick status update. > > I was hopping to have tagged 11.0.x by now but I have found a couple of > issues. > > 1. FFM on MacOS is broken. This might be related to me updating OpenSSL > (via homebrew) from 3.2.0 to 3.2.1 I tested a fresh build of trunk (3.3 dev) and it seems to work fine for me on Linux. What is the error ? > 2. I'm seeing a couple of HTTP/2 test failures on Windows. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68348] Support for Partitioned cookie attribute
https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 --- Comment #6 from Christopher Schultz --- (In reply to Mark Thomas from comment #5) > Look at the version numbers. The fixed versions haven't been released yet. ?? All versions mentioned in comment #3 have been released. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
Mark, On 2/13/24 08:11, Mark Thomas wrote: Hi all, Just a quick status update. I was hopping to have tagged 11.0.x by now but I have found a couple of issues. 1. FFM on MacOS is broken. This might be related to me updating OpenSSL (via homebrew) from 3.2.0 to 3.2.1 I still have OpenSSL 3.2.0 on MacOS, both x86-64 and M2 available. How do I specifically test FFM? Just run the unit tests as usual on main HEAD? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
On Tue, Feb 13, 2024 at 3:28 PM Christopher Schultz wrote: > > Mark, > > On 2/13/24 08:11, Mark Thomas wrote: > > Hi all, > > > > Just a quick status update. > > > > I was hopping to have tagged 11.0.x by now but I have found a couple of > > issues. > > > > 1. FFM on MacOS is broken. This might be related to me updating OpenSSL > > (via homebrew) from 3.2.0 to 3.2.1 > > I still have OpenSSL 3.2.0 on MacOS, both x86-64 and M2 available. > > How do I specifically test FFM? Just run the unit tests as usual on main > HEAD? On CI, it is using 1.1.1 ;) OpenSSLLibrary.init OpenSSL successfully initialized using FFM [OpenSSL 1.1.1f 31 Mar 2020] So you can run whatever OpenSSL but only using the latest Java. Rémy > -chris > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/859 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] bb80f8221030e476f57fc10c0ed4b6f80628285a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
Rémy, On 2/13/24 09:34, Rémy Maucherat wrote: On Tue, Feb 13, 2024 at 3:28 PM Christopher Schultz wrote: Mark, On 2/13/24 08:11, Mark Thomas wrote: Hi all, Just a quick status update. I was hopping to have tagged 11.0.x by now but I have found a couple of issues. 1. FFM on MacOS is broken. This might be related to me updating OpenSSL (via homebrew) from 3.2.0 to 3.2.1 I still have OpenSSL 3.2.0 on MacOS, both x86-64 and M2 available. How do I specifically test FFM? Just run the unit tests as usual on main HEAD? On CI, it is using 1.1.1 ;) OpenSSLLibrary.init OpenSSL successfully initialized using FFM [OpenSSL 1.1.1f 31 Mar 2020] So you can run whatever OpenSSL but only using the latest Java. I've just run all the unit tests on main-HEAD on aarch64 MacOS with Java 21 and OpenSSL 3.2.0, and only a singe test failed: org.apache.tomcaat.util.net.TestSsl.NIO The error is "SSLHandshakeException: Remote host terminated the handshake" caused by "EOLException: SSL peer shut down incorrectly". The failure appears to be in the client, reporting that the server shut-down the connection incorrectly. In the same test report, there are some "SKIPPED" items, inclluding "expected true, got false" for a number of them. Are those ... expected? Copy/paste isn't convenient from my M2 Mac into this email, but I can provide the full report if that would be helpful. There are about 10 unit-tests with skipped tests for both NIO and NIO2. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: February release tagging
On 13/02/2024 14:14, Rémy Maucherat wrote: On Tue, Feb 13, 2024 at 2:12 PM Mark Thomas wrote: Hi all, Just a quick status update. I was hopping to have tagged 11.0.x by now but I have found a couple of issues. 1. FFM on MacOS is broken. This might be related to me updating OpenSSL (via homebrew) from 3.2.0 to 3.2.1 I tested a fresh build of trunk (3.3 dev) and it seems to work fine for me on Linux. What is the error ? This isn't OpenSSL or Java EA version related. There error is: "WARNING: is loading libcrypto in an unsafe way" and then the JVM exits. It is caused by this commit: https://github.com/apache/tomcat/commit/830771823edbb79d2884eb1c6f5122e81df4df78 I found this GitHub issue comment https://github.com/cl-plus-ssl/cl-plus-ssl/issues/114#issuecomment-770370592 that suggests that what is happening is Tomcat is trying to load "/usr/lib/libcrypto.dylib" which is a stub which is intended to trigger the crash. 2. I'm seeing a couple of HTTP/2 test failures on Windows. I'm looking at these now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68348] Support for Partitioned cookie attribute
https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 --- Comment #7 from Mark Thomas --- Sorry, you're right. I thought partitioned support was going to be in the Feb releases. The OP needs to follow this up on the users list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68558] Redundant calls to ByteChunk.toString()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68558 --- Comment #9 from John Engebretson --- Regarding #1: apologies, I was able to track down an invokeinterface that confused our primary tool. Specifically, a class calling HttpServletRequest.getMethod() on an instance of HttpServletRequestWrapper that could wrap: a) an instance of org.apache.catalina.connector.Request, b) another HttpServletRequestWrapper, or c) one of multiple custom subclasses. I agree that the value of Request.getMethod() is cached on MessageBytes and I'll fix the issue for our application by implementing local caching on a custom subclass. Regarding #3: I suspect the same problem as #1, and am certain that the same custom class can be modified to solve this problem. No Tomcat issues beyond what you've already fixed. Sorry for the noise! -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68558] Redundant calls to ByteChunk.toString()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68558 John Engebretson changed: What|Removed |Added Status|NEEDINFO|NEW -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68558] Redundant calls to ByteChunk.toString()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68558 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #10 from Mark Thomas --- Thanks for the update. Marking this as fixed based on that update. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68603] Request Context path and Query param gets replaced
https://bz.apache.org/bugzilla/show_bug.cgi?id=68603 Naresh changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #5 from Naresh --- (In reply to Christopher Schultz from comment #4) > (In reply to Naresh from comment #2) > > Take for example before login request URI is "/bill/login" with request body > > of "leacsrf=c8b01130-3e28-4f29-b9e6-f9f54f3f2501". > > Is this a query string in the URL, or is this the request body? > > > Scenario is after authentication the current request URI(/bill/login) is > > changed with "srf=c8b01130-3e28" and the request query param is changed to > > "4f29-b9e6-f9f54f3f2501" > > What is consuming the response? Just Tomcat via a call to > request.getParameter*? Is this a query string in the URL, or is this the request body? Request body What is consuming the response? Just Tomcat via a call to request.getParameter*? yes -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68603] Request Context path and Query param gets replaced
https://bz.apache.org/bugzilla/show_bug.cgi?id=68603 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #6 from Mark Thomas --- Again, please provide the simplest possible test case that demonstrates this issue (including source) and we will investigate. Without the requested information this issue will get resolved as WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix test failures on Windows
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 985157dcd1 Fix test failures on Windows
985157dcd1 is described below
commit 985157dcd1d46d6d5d80ba9a58f3112e5ecf75a1
Author: Mark Thomas
AuthorDate: Tue Feb 13 17:46:57 2024 +
Fix test failures on Windows
---
test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 7b891fbfff..b184270dc3 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -281,9 +281,17 @@ public class TestHttp2Limits extends Http2TestBase {
}
case STREAM_RESET_THEN_CONNECTION_RESET: {
// Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP
connection close
+// will be processed before the client gets a chance to read
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
}
//$FALL-THROUGH$
case CONNECTION_RESET: {
-
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 test failures on Windows
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 be906e2fe8 Fix test failures on Windows
be906e2fe8 is described below
commit be906e2fe8fcd2be2ef7bbeba0c7883824aaa6a4
Author: Mark Thomas
AuthorDate: Tue Feb 13 17:46:57 2024 +
Fix test failures on Windows
---
test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 7b891fbfff..b184270dc3 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -281,9 +281,17 @@ public class TestHttp2Limits extends Http2TestBase {
}
case STREAM_RESET_THEN_CONNECTION_RESET: {
// Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP
connection close
+// will be processed before the client gets a chance to read
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
}
//$FALL-THROUGH$
case CONNECTION_RESET: {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix test failures on Windows
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c861392b8f Fix test failures on Windows
c861392b8f is described below
commit c861392b8f1698527d9fc4461ee92f4bcce5b6f0
Author: Mark Thomas
AuthorDate: Tue Feb 13 17:46:57 2024 +
Fix test failures on Windows
---
test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 5e916528f7..7bb6d19043 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -280,9 +280,17 @@ public class TestHttp2Limits extends Http2TestBase {
}
case STREAM_RESET_THEN_CONNECTION_RESET: {
// Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP
connection close
+// will be processed before the client gets a chance to read
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
}
//$FALL-THROUGH$
case CONNECTION_RESET: {
-
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 test failures on Windows
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 9b3e7c0568 Fix test failures on Windows
9b3e7c0568 is described below
commit 9b3e7c0568bce0f69670ff09a6a98ccf0ae38fb9
Author: Mark Thomas
AuthorDate: Tue Feb 13 17:46:57 2024 +
Fix test failures on Windows
---
test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 5e916528f7..7bb6d19043 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -280,9 +280,17 @@ public class TestHttp2Limits extends Http2TestBase {
}
case STREAM_RESET_THEN_CONNECTION_RESET: {
// Expect a stream reset
-parser.readFrame();
-Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-output.clearTrace();
+// On some platform / Connector combinations the TCP
connection close
+// will be processed before the client gets a chance to read
the
+// connection close frame which will trigger an
+// IOException when we try to read the frame.
+try {
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+} catch (IOException ioe) {
+// Expected on some platforms
+}
}
//$FALL-THROUGH$
case CONNECTION_RESET: {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
