date:20230816

svn commit: r1911716 [5/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Old news! - 2010http://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.c
 gi">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.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapa
 chetomcat">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/";>LicenseContentOther news
+Apache Tomcat® - Old news! - 2010https://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-sm
 all.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/downlo
 ad-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.5Tomcat 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.apac
 he.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";>Sponsor
 shiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentOther news
 Announcements from other years can be found here:
 
   year 2023

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/tr

svn commit: r1911716 [7/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Apache Tomcat 10 
vulnerabilitieshttp://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.o
 rg/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.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://tw
 itter.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 10.x 
vulnerabilities
+Apache Tomcat® - Apache Tomcat 10 
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.a
 pache.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.5Tomcat 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 codeBuildbotTranslationsToolsMediahttps://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/sponsorsh
 ip.html">Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentApache Tomcat 10.x 
vulnerabilities
 This page lists all security vulnerabilities fixed in released versions
of Apache Tomcat 10.x. Each vulnerability is given a
security impact rating by the Apache

Modified: tomcat/site/trunk/docs/security-11.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-11.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==

svn commit: r1911716 [3/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Welcome!http://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/Suppo
 rtApache-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/dow
 nload-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.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToo
 lsMediahttps://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";>Thanks<
 /a>http://www.apache.org/licenses/";>LicenseContentApache Tomcat
+Apache Tomcat® - Welcome!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.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.0
 Tomcat 8.5Tomcat 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 c
 odeBuildbothttps://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 Apa
 chehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentApache Tomcat
 
 The Apache Tomcat® software is an open source implementation
 of the

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Wed Aug 16 08:11:27 2023
@@

svn commit: r1911716 [1/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Author: markt
Date: Wed Aug 16 08:11:27 2023
New Revision: 1911716

URL: http://svn.apache.org/viewvc?rev=1911716&view=rev
Log:
Restore the ASF conference link

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/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Reporting Bugshttp://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";>Tom
 cat 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.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
Involv

svn commit: r1911716 [10/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Which Version Do I 
Want?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.a
 pache.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.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.
 html">Thankshttp://www.apache.org/licenses/";>LicenseContentApache Tomcat Versions
+Apache Tomcat® - Which Version Do I 
Want?https://www.apachecon.com/event-images/snippet.js";>http://tomcat.apache.org/";>Apache 
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 
PluginDownload<
 a href="./whichversion.html">Which version?https://tomcat.apache.org/download-11.cgi";>Tomcat 11 
(alpha)https://tomcat.apache.org/download-10.cgi";>Tomcat 
10https://tomcat.apache.org/download-90.cgi";>Tomcat 
9https://tomcat.apache.org/download-80.cgi";>Tomcat 
8https://tomcat.apache.org/download-migration.cgi";>Tomcat 
Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 
8.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html
 ">Support Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentApache Tomcat Versions
 Apache Tomcat® is an open source software implementation of a
 subset of the Jakarta EE (formally Java EE) technologies. Different versions of
 Apache Tomcat are available for different versions of the specifications. The

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/sit

svn commit: r1911716 [9/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Apache Taglibshttp://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.a
 pache.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.5Tomcat 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/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapach
 etomcat">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 Taglibsclass="text">
+Apache Tomcat® - Apache Taglibshttps://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-smal
 l.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.5Tomcat 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/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";>Sponsorsh
 iphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentApache Taglibs
   Apache Taglibs provides open source implementations of Tag Libraries 
for use with
 Java Server Pages (JSPs). In particular, it hosts the Apache Standard 
Taglib, an
 open source implementation of the

Modified: tomcat/site/trunk/docs/tomcat-10.0-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-eol.html?rev=1911716&r1=1911715&r2=1911716&vi

svn commit: r1911716 [8/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Apache Tomcat 9 
vulnerabilitieshttp://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.or
 g/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.5Tomcat ConnectorsTomcat Native 2Tomcat 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">Buildbothref="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations href="./tools.html">ToolsMediahref="https://twi
 tter.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/";>Licensestyle="display: none;">Contentid="Apache_Tomcat_9.x_vulnerabilities">Apache Tomcat 9.x 
 >vulnerabilities
+Apache Tomcat® - Apache Tomcat 9 
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.5Tomcat 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

svn commit: r1911716 [6/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/oldnews-2018.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2018.html (original)
+++ tomcat/site/trunk/docs/oldnews-2018.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Old news!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";>Tom
 cat 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.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2WikiMigration 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/theapachetomc
 at">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/";>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.5Tomcat 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/
 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";>Sponsorshiphref="http://www.apache.org/foundation/thanks.html";>Thankshref="http://www.apache.org/licenses/";>License id="mainRight">Contentid="Older_news">Older news
 Announcements from previous years can be found here:
 
   year 2023

Modified: tomcat/site/trunk/docs/oldnews-2019.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2019.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2019.html (original)
+++ tomcat/site/trunk/docs/oldnews-2019

svn commit: r1911716 [2/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Apache Tomcat 9 Software 
Downloadshttp://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" clas
 s="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.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confl
 uence/display/TOMCAT">WikiMigration 
GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentid="Tomcat_9_Software_Downloads">Tomcat 9 Software Downloadsclass="text">
+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.5Tomcat Connector
 sTomcat 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/confluence/x/vIPzBQ";>Transl
 ationsToolsMediahttps://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";>SponsorshipThankshttp://www.apache.org/licenses/";>LicenseContentTomcat 9 Software Downloads
 Welcome to the Apache Tomcat® 9.x software download 
page. This page
 provides download links for obtaining the latest version of Tomcat 9.0.x
 software, as well as links to the archives of older releases.

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomca

svn commit: r1911716 [4/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-08-16 Thread markt

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1911716&r1=1911715&r2=1911716&view=diff
==
--- tomcat/site/trunk/docs/migration-11.0.html (original)
+++ tomcat/site/trunk/docs/migration-11.0.html Wed Aug 16 08:11:27 2023
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Migration Guide - Tomcat 
11.0.xhttp://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.or
 g/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.5Tomcat ConnectorsTomcat Native 2Tomcat 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">Buildbothref="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations href="./tools.html">ToolsMediahref="https://twi
 tter.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/";>Licensestyle="display: none;">ContentTable of 
 >Contents
+Apache Tomcat® - Migration Guide - Tomcat 
11.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.5Tomcat 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.htm

[tomcat] branch main updated: Remove unnecessary code

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new ba57105edb Remove unnecessary code
ba57105edb is described below

commit ba57105edb6c9dfc23427b4b6d7e27ab3dee372d
Author: Mark Thomas 
AuthorDate: Wed Aug 16 10:45:59 2023 +0100

Remove unnecessary code
---
 test/org/apache/catalina/connector/TestRequest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index d3c4c72168..4c166d3201 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -86,8 +86,6 @@ public class TestRequest extends TomcatBaseTest {
 client.doRequest(1, false); // 1 byte - too small should fail
 Assert.assertTrue(client.isResponse413());
 
-client.reset();
-
 // Edge cases around actual content length
 client.reset();
 client.doRequest(6, false); // Too small should fail


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

[tomcat] branch 10.1.x updated: Remove unnecessary code

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 54d0ee85ab Remove unnecessary code
54d0ee85ab is described below

commit 54d0ee85abb8cfe877ef1190d9cba40a07c1fa63
Author: Mark Thomas 
AuthorDate: Wed Aug 16 10:45:59 2023 +0100

Remove unnecessary code
---
 test/org/apache/catalina/connector/TestRequest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 54112be123..48bfdde507 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -85,8 +85,6 @@ public class TestRequest extends TomcatBaseTest {
 client.doRequest(1, false); // 1 byte - too small should fail
 Assert.assertTrue(client.isResponse413());
 
-client.reset();
-
 // Edge cases around actual content length
 client.reset();
 client.doRequest(6, false); // Too small should fail


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

[tomcat] branch 9.0.x updated: Remove unnecessary code

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 658a7c8c07 Remove unnecessary code
658a7c8c07 is described below

commit 658a7c8c07a9c52313a8bf75c9e53d321cb6f801
Author: Mark Thomas 
AuthorDate: Wed Aug 16 10:45:59 2023 +0100

Remove unnecessary code
---
 test/org/apache/catalina/connector/TestRequest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 2bf2d801d0..e9c3b7cba0 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -85,8 +85,6 @@ public class TestRequest extends TomcatBaseTest {
 client.doRequest(1, false); // 1 byte - too small should fail
 Assert.assertTrue(client.isResponse413());
 
-client.reset();
-
 // Edge cases around actual content length
 client.reset();
 client.doRequest(6, false); // Too small should 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: Remove unnecessary code

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 3391639c97 Remove unnecessary code
3391639c97 is described below

commit 3391639c97a98d023f05eb8de759c3933cf9d6a4
Author: Mark Thomas 
AuthorDate: Wed Aug 16 10:45:59 2023 +0100

Remove unnecessary code
---
 test/org/apache/catalina/connector/TestRequest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 877480a9f0..617cce9058 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -82,8 +82,6 @@ public class TestRequest extends TomcatBaseTest {
 client.doRequest(1, false); // 1 byte - too small should fail
 Assert.assertTrue(client.isResponse413());
 
-client.reset();
-
 // Edge cases around actual content length
 client.reset();
 client.doRequest(6, false); // Too small should fail


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

[tomcat] branch 10.1.x updated: Add release date for 10.1.12

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new d22082c843 Add release date for 10.1.12
d22082c843 is described below

commit d22082c843a98d75d342f8f6e0bb4ec45d25512e
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:27:14 2023 +0100

Add release date for 10.1.12
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5de9e9642d..69f1e9e66f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   
@@ -216,7 +216,7 @@
 
   
 
-
+
   
 
   


-
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: Add release date for 8.5.92

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 384aa5a96c Add release date for 8.5.92
384aa5a96c is described below

commit 384aa5a96cbb9810c15d557c21fe1a7d962f20d5
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:28:35 2023 +0100

Add release date for 8.5.92
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e18e763bc5..99479d5486 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   
@@ -206,7 +206,7 @@
 
   
 
-
+
   
 
   


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

[tomcat] branch main updated: Remove unnecessary uses of {@inheritDoc}

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 55537f9672 Remove unnecessary uses of {@inheritDoc}
55537f9672 is described below

commit 55537f9672038f7391bf13f2931e8546b81be081
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:39:47 2023 +0100

Remove unnecessary uses of {@inheritDoc}
---
 java/org/apache/catalina/connector/Request.java|  15 -
 .../apache/catalina/ha/session/DeltaSession.java   |   3 -
 .../catalina/loader/WebappClassLoaderBase.java |   3 -
 .../apache/catalina/session/StandardSession.java   |   3 -
 .../catalina/tribes/membership/McastService.java   |   6 -
 .../tribes/membership/MembershipServiceBase.java   |   6 -
 java/org/apache/catalina/util/LifecycleBase.java   |  21 --
 .../catalina/valves/AbstractAccessLogValve.java|   3 -
 .../apache/catalina/valves/JDBCAccessLogValve.java |   3 -
 java/org/apache/catalina/valves/RemoteIpValve.java |   3 -
 .../catalina/valves/StuckThreadDetectionValve.java |   3 -
 java/org/apache/jasper/JspC.java   |  60 
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|   6 -
 .../dbcp/pool2/impl/LinkedBlockingDeque.java   |  42 ---
 .../dbcp/pool2/impl/PooledSoftReference.java   |   3 -
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |   3 -
 .../http/fileupload/util/FileItemHeadersImpl.java  |   9 -
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   | 318 
 .../apache/tomcat/jdbc/pool/FairBlockingQueue.java |  33 ---
 .../jdbc/pool/MultiLockFairBlockingQueue.java  |  33 ---
 .../apache/tomcat/jdbc/pool/PoolProperties.java| 321 -
 .../AbstractCreateStatementInterceptor.java|   3 -
 .../jdbc/pool/interceptor/SlowQueryReport.java |   6 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java   |  84 --
 24 files changed, 990 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index f43d8c835d..a12fdb4226 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2612,9 +2612,6 @@ public class Request implements HttpServletRequest {
 }
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public boolean authenticate(HttpServletResponse response) throws 
IOException, ServletException {
 if (response.isCommitted()) {
@@ -2624,9 +2621,6 @@ public class Request implements HttpServletRequest {
 return getContext().getAuthenticator().authenticate(this, response);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void login(String username, String password) throws 
ServletException {
 if (getAuthType() != null || getRemoteUser() != null || 
getUserPrincipal() != null) {
@@ -2636,17 +2630,11 @@ public class Request implements HttpServletRequest {
 getContext().getAuthenticator().login(username, password, this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void logout() throws ServletException {
 getContext().getAuthenticator().logout(this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Collection getParts() throws IOException, 
IllegalStateException, ServletException {
 
@@ -2811,9 +2799,6 @@ public class Request implements HttpServletRequest {
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Part getPart(String name) throws IOException, 
IllegalStateException, ServletException {
 for (Part part : getParts()) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 8f5ab1b32e..8283a7fc0a 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -315,9 +315,6 @@ public class DeltaSession extends StandardSession 
implements Externalizable, Clu
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void setId(String id, boolean notify) {
 super.setId(id, notify);
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index d522f61618..0bb6bbdfbc 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1375,9 +1375,6 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public String getStateName() {
 return getState().toString();
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 9e71e20f6c..6f4c25ce83 100644
--- a/java/org/apache/catalina/session/S

[tomcat] branch 10.1.x updated: Remove unnecessary uses of {@inheritDoc}

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 0d07cb180a Remove unnecessary uses of {@inheritDoc}
0d07cb180a is described below

commit 0d07cb180a9fd96a48796b8a735bc43e07d63e35
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:41:53 2023 +0100

Remove unnecessary uses of {@inheritDoc}
---
 java/org/apache/catalina/connector/Request.java|  15 -
 .../apache/catalina/ha/session/DeltaSession.java   |   3 -
 .../catalina/loader/WebappClassLoaderBase.java |   3 -
 .../apache/catalina/session/StandardSession.java   |   3 -
 .../catalina/tribes/membership/McastService.java   |   6 -
 .../tribes/membership/MembershipServiceBase.java   |   6 -
 java/org/apache/catalina/util/LifecycleBase.java   |  21 --
 .../catalina/valves/AbstractAccessLogValve.java|   3 -
 .../apache/catalina/valves/JDBCAccessLogValve.java |   3 -
 java/org/apache/catalina/valves/RemoteIpValve.java |   3 -
 .../catalina/valves/StuckThreadDetectionValve.java |   3 -
 java/org/apache/jasper/JspC.java   |  60 
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|   6 -
 .../dbcp/pool2/impl/LinkedBlockingDeque.java   |  42 ---
 .../dbcp/pool2/impl/PooledSoftReference.java   |   3 -
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |   3 -
 .../http/fileupload/util/FileItemHeadersImpl.java  |   9 -
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   | 318 
 .../apache/tomcat/jdbc/pool/FairBlockingQueue.java |  33 ---
 .../jdbc/pool/MultiLockFairBlockingQueue.java  |  33 ---
 .../apache/tomcat/jdbc/pool/PoolProperties.java| 321 -
 .../AbstractCreateStatementInterceptor.java|   3 -
 .../jdbc/pool/interceptor/SlowQueryReport.java |   6 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java   |  84 --
 24 files changed, 990 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 6954351c92..a0748b1774 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2660,9 +2660,6 @@ public class Request implements HttpServletRequest {
 }
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public boolean authenticate(HttpServletResponse response) throws 
IOException, ServletException {
 if (response.isCommitted()) {
@@ -2672,9 +2669,6 @@ public class Request implements HttpServletRequest {
 return getContext().getAuthenticator().authenticate(this, response);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void login(String username, String password) throws 
ServletException {
 if (getAuthType() != null || getRemoteUser() != null || 
getUserPrincipal() != null) {
@@ -2684,17 +2678,11 @@ public class Request implements HttpServletRequest {
 getContext().getAuthenticator().login(username, password, this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void logout() throws ServletException {
 getContext().getAuthenticator().logout(this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Collection getParts() throws IOException, 
IllegalStateException, ServletException {
 
@@ -2859,9 +2847,6 @@ public class Request implements HttpServletRequest {
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Part getPart(String name) throws IOException, 
IllegalStateException, ServletException {
 for (Part part : getParts()) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 8f5ab1b32e..8283a7fc0a 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -315,9 +315,6 @@ public class DeltaSession extends StandardSession 
implements Externalizable, Clu
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void setId(String id, boolean notify) {
 super.setId(id, notify);
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index f6740c3fdb..36b4610466 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1568,9 +1568,6 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public String getStateName() {
 return getState().toString();
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 820d7743e8..7c5966ac4b 100644
--- a/java/org/apache/catalina/sessi

[tomcat] branch 9.0.x updated: Remove unnecessary uses of {@inheritDoc}

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new aaa841be18 Remove unnecessary uses of {@inheritDoc}
aaa841be18 is described below

commit aaa841be183617a88e306702a6b1fdf63a08abd9
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:43:29 2023 +0100

Remove unnecessary uses of {@inheritDoc}
---
 java/org/apache/catalina/connector/Request.java|  15 -
 .../apache/catalina/ha/session/DeltaSession.java   |   3 -
 .../catalina/loader/WebappClassLoaderBase.java |   3 -
 .../apache/catalina/session/StandardSession.java   |   3 -
 .../catalina/tribes/membership/McastService.java   |   6 -
 .../tribes/membership/MembershipServiceBase.java   |   6 -
 java/org/apache/catalina/util/LifecycleBase.java   |  21 --
 .../catalina/valves/AbstractAccessLogValve.java|   3 -
 .../apache/catalina/valves/JDBCAccessLogValve.java |   3 -
 java/org/apache/catalina/valves/RemoteIpValve.java |   3 -
 .../catalina/valves/StuckThreadDetectionValve.java |   3 -
 java/org/apache/jasper/JspC.java   |  60 
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|   6 -
 .../dbcp/pool2/impl/LinkedBlockingDeque.java   |  42 ---
 .../dbcp/pool2/impl/PooledSoftReference.java   |   3 -
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |   3 -
 .../http/fileupload/util/FileItemHeadersImpl.java  |   9 -
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   | 318 
 .../apache/tomcat/jdbc/pool/FairBlockingQueue.java |  33 ---
 .../jdbc/pool/MultiLockFairBlockingQueue.java  |  33 ---
 .../apache/tomcat/jdbc/pool/PoolProperties.java| 321 -
 .../AbstractCreateStatementInterceptor.java|   3 -
 .../jdbc/pool/interceptor/SlowQueryReport.java |   6 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java   |  84 --
 24 files changed, 990 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 2ed59f22a0..619dfc34fd 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2710,9 +2710,6 @@ public class Request implements HttpServletRequest {
 }
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public boolean authenticate(HttpServletResponse response) throws 
IOException, ServletException {
 if (response.isCommitted()) {
@@ -2722,9 +2719,6 @@ public class Request implements HttpServletRequest {
 return getContext().getAuthenticator().authenticate(this, response);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void login(String username, String password) throws 
ServletException {
 if (getAuthType() != null || getRemoteUser() != null || 
getUserPrincipal() != null) {
@@ -2734,17 +2728,11 @@ public class Request implements HttpServletRequest {
 getContext().getAuthenticator().login(username, password, this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void logout() throws ServletException {
 getContext().getAuthenticator().logout(this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Collection getParts() throws IOException, 
IllegalStateException, ServletException {
 
@@ -2909,9 +2897,6 @@ public class Request implements HttpServletRequest {
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Part getPart(String name) throws IOException, 
IllegalStateException, ServletException {
 for (Part part : getParts()) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index d890a64c28..720b194479 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -315,9 +315,6 @@ public class DeltaSession extends StandardSession 
implements Externalizable, Clu
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void setId(String id, boolean notify) {
 super.setId(id, notify);
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 2e2b619619..3d816a3c51 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1543,9 +1543,6 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public String getStateName() {
 return getState().toString();
diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index 5e1f463da8..59fadae807 100644
--- a/java/org/apache/catalina/session

[tomcat] branch 8.5.x updated: Remove unnecessary uses of {@inheritDoc}

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 87c291f7a6 Remove unnecessary uses of {@inheritDoc}
87c291f7a6 is described below

commit 87c291f7a6b23a85cf1c0f4d6809d2831d706d92
Author: Mark Thomas 
AuthorDate: Wed Aug 16 13:46:11 2023 +0100

Remove unnecessary uses of {@inheritDoc}
---
 java/org/apache/catalina/connector/Request.java|  15 -
 java/org/apache/catalina/core/StandardWrapper.java |   6 -
 .../apache/catalina/ha/session/DeltaSession.java   |   3 -
 .../catalina/loader/WebappClassLoaderBase.java |   3 -
 .../apache/catalina/session/StandardSession.java   |   3 -
 .../catalina/tribes/membership/McastService.java   |   9 -
 java/org/apache/catalina/util/LifecycleBase.java   |  21 --
 .../catalina/valves/AbstractAccessLogValve.java|   3 -
 .../apache/catalina/valves/JDBCAccessLogValve.java |   3 -
 java/org/apache/catalina/valves/RemoteIpValve.java |   3 -
 .../catalina/valves/StuckThreadDetectionValve.java |   3 -
 java/org/apache/jasper/JspC.java   |  63 
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|   6 -
 .../dbcp/pool2/impl/LinkedBlockingDeque.java   |  42 ---
 .../dbcp/pool2/impl/PooledSoftReference.java   |   3 -
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |   3 -
 .../http/fileupload/util/FileItemHeadersImpl.java  |   9 -
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   | 318 
 .../apache/tomcat/jdbc/pool/FairBlockingQueue.java |  33 ---
 .../jdbc/pool/MultiLockFairBlockingQueue.java  |  33 ---
 .../apache/tomcat/jdbc/pool/PoolProperties.java| 321 -
 .../AbstractCreateStatementInterceptor.java|   3 -
 .../jdbc/pool/interceptor/SlowQueryReport.java |   6 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java   |  84 --
 24 files changed, 996 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 41f8573f1f..cebd50640c 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2725,9 +2725,6 @@ public class Request implements HttpServletRequest {
 }
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public boolean authenticate(HttpServletResponse response) throws 
IOException, ServletException {
 if (response.isCommitted()) {
@@ -2737,9 +2734,6 @@ public class Request implements HttpServletRequest {
 return getContext().getAuthenticator().authenticate(this, response);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void login(String username, String password) throws 
ServletException {
 if (getAuthType() != null || getRemoteUser() != null || 
getUserPrincipal() != null) {
@@ -2749,17 +2743,11 @@ public class Request implements HttpServletRequest {
 getContext().getAuthenticator().login(username, password, this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void logout() throws ServletException {
 getContext().getAuthenticator().logout(this);
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Collection getParts() throws IOException, 
IllegalStateException, ServletException {
 
@@ -2924,9 +2912,6 @@ public class Request implements HttpServletRequest {
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public Part getPart(String name) throws IOException, 
IllegalStateException, ServletException {
 for (Part part : getParts()) {
diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index cb3dbcd596..8d7b342aca 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -587,9 +587,6 @@ public class StandardWrapper extends ContainerBase 
implements ServletConfig, Wra
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void setServletSecurityAnnotationScanRequired(boolean b) {
 // NO-OP
@@ -1082,9 +1079,6 @@ public class StandardWrapper extends ContainerBase 
implements ServletConfig, Wra
 
 }
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void servletSecurityAnnotationScan() throws ServletException {
 // NO-OP
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index d890a64c28..720b194479 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -315,9 +315,6 @@ public class DeltaSession extends StandardSession 
implements Externalizable, Clu
 }
 
 
-/**
- * {@inheritDoc}
- */
 @Override
 public void setId(Stri

Buildbot failure in on tomcat-11.0.x

2023-08-16 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/540
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] 55537f9672038f7391bf13f2931e8546b81be081


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Buildbot failure in on tomcat-10.1.x

2023-08-16 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/908
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] 0d07cb180a9fd96a48796b8a735bc43e07d63e35


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[tomcat] 02/03: Update certificate for user1

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 0e1eb40162399a3e77bc10320b6550e97cb98a1a
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:40:42 2023 +0100

Update certificate for user1
---
 test/org/apache/tomcat/util/net/user1.jks | Bin 2668 -> 4386 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/user1.jks 
b/test/org/apache/tomcat/util/net/user1.jks
index efbade83df..1643506742 100644
Binary files a/test/org/apache/tomcat/util/net/user1.jks and 
b/test/org/apache/tomcat/util/net/user1.jks differ


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

[tomcat] branch main updated (55537f9672 -> 0a3e97983f)

2023-08-16 Thread markt

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 55537f9672 Remove unnecessary uses of {@inheritDoc}
 new a50d10bbc7 Refactor into individual tests
 new 0e1eb40162 Update certificate for user1
 new 0a3e97983f Use application provided status code for error page if 
present

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:
 .../apache/catalina/core/StandardHostValve.java|  13 ++--
 .../catalina/core/TestStandardHostValve.java   |  72 +++--
 test/org/apache/tomcat/util/net/user1.jks  | Bin 2668 -> 4386 bytes
 webapps/docs/changelog.xml |  10 +++
 4 files changed, 72 insertions(+), 23 deletions(-)


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

[tomcat] 01/03: Refactor into individual tests

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit a50d10bbc7b50fb460170862e10552c9f52301c6
Author: Mark Thomas 
AuthorDate: Wed Aug 16 14:23:01 2023 +0100

Refactor into individual tests
---
 .../catalina/core/TestStandardHostValve.java   | 41 --
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 9e6927c3b8..4fc629d2e9 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -40,7 +40,20 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 public class TestStandardHostValve extends TomcatBaseTest {
 
 @Test
-public void testErrorPageHandling() throws Exception {
+public void testErrorPageHandling500() throws Exception {
+doTestErrorPageHandling(500, "/500");
+}
+
+
+@Test
+public void testErrorPageHandlingDefault() throws Exception {
+doTestErrorPageHandling(501, "/default");
+}
+
+
+private void doTestErrorPageHandling(int error, String report)
+throws Exception {
+
 // Set up a container
 Tomcat tomcat = getTomcatInstance();
 
@@ -68,8 +81,13 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 tomcat.start();
 
-doTestErrorPageHandling(500, "/500");
-doTestErrorPageHandling(501, "/default");
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/error?errorCode=" + error, bc, null);
+
+Assert.assertEquals(error, rc);
+Assert.assertEquals(report, bc.toString());
 }
 
 
@@ -131,19 +149,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
-throws Exception {
-
-// Request a page that triggers an error
-ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
-
-Assert.assertEquals(error, rc);
-Assert.assertEquals(report, bc.toString());
-}
-
-
 @Test
 public void testIncompleteResponse() throws Exception {
 // Set up a container
@@ -160,13 +165,13 @@ public class TestStandardHostValve extends TomcatBaseTest 
{
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
-// And the handling for 500 responses
+// Add the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
 errorPage500.setLocation("/report/500");
 ctx.addErrorPage(errorPage500);
 
-// And the default error handling
+// Add the default error handling
 ErrorPage errorPageDefault = new ErrorPage();
 errorPageDefault.setLocation("/report/default");
 ctx.addErrorPage(errorPageDefault);


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

[tomcat] 03/03: Use application provided status code for error page if present

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 0a3e97983f867dc43ee97e02a2a018ea90be3454
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:57:31 2023 +0100

Use application provided status code for error page if present
---
 .../apache/catalina/core/StandardHostValve.java| 13 ---
 .../catalina/core/TestStandardHostValve.java   | 41 +++---
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardHostValve.java 
b/java/org/apache/catalina/core/StandardHostValve.java
index 9814a3cc28..7b5dacbd72 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -295,11 +295,14 @@ final class StandardHostValve extends ValveBase {
 }
 }
 } else {
-// A custom error-page has not been defined for the exception
-// that was thrown during request processing. Check if an
-// error-page for error code 500 was specified and if so,
-// send that page back as the response.
-response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+/*
+ *  A custom error-page has not been defined for the exception 
that was thrown during request processing.
+ *  Set the status to 500 if an error status has not already been 
set and check for custom error-page for
+ *  the status.
+ */
+if (response.getStatus() < HttpServletResponse.SC_BAD_REQUEST) {
+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+}
 // The response is an error
 response.setError();
 
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 4fc629d2e9..db4b7ccc09 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequestEvent;
 import jakarta.servlet.ServletRequestListener;
@@ -39,19 +40,31 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 
 public class TestStandardHostValve extends TomcatBaseTest {
 
+@Test
+public void testErrorPageHandling400() throws Exception {
+doTestErrorPageHandling(400, "", "/400");
+}
+
+
+@Test
+public void testErrorPageHandling400WithException() throws Exception {
+doTestErrorPageHandling(400, "java.lang.IllegalStateException", 
"/400");
+}
+
+
 @Test
 public void testErrorPageHandling500() throws Exception {
-doTestErrorPageHandling(500, "/500");
+doTestErrorPageHandling(500, "", "/500");
 }
 
 
 @Test
 public void testErrorPageHandlingDefault() throws Exception {
-doTestErrorPageHandling(501, "/default");
+doTestErrorPageHandling(501, "", "/default");
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
+private void doTestErrorPageHandling(int error, String exception, String 
report)
 throws Exception {
 
 // Set up a container
@@ -68,6 +81,12 @@ public class TestStandardHostValve extends TomcatBaseTest {
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
+// Add the handling for 400 responses
+ErrorPage errorPage400 = new ErrorPage();
+errorPage400.setErrorCode(Response.SC_BAD_REQUEST);
+errorPage400.setLocation("/report/400");
+ctx.addErrorPage(errorPage400);
+
 // And the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
@@ -83,8 +102,8 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 // Request a page that triggers an error
 ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
+int rc = getUrl("http://localhost:"; + getPort() + "/error?errorCode=" 
+ error + "&exception=" + exception,
+bc, null);
 
 Assert.assertEquals(error, rc);
 Assert.assertEquals(report, bc.toString());
@@ -200,6 +219,18 @@ public class TestStandardHostValve extends TomcatBaseTest {
 throws ServletException, IOException {
 int error = Integer.parseInt(req.getParameter("errorCode"));
 resp.sendError(error);
+
+Throwable t = null;
+

[tomcat] 01/03: Refactor into individual tests

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit d80c60f196461a5e6fc7000c580b599e4cf2623d
Author: Mark Thomas 
AuthorDate: Wed Aug 16 14:23:01 2023 +0100

Refactor into individual tests
---
 .../catalina/core/TestStandardHostValve.java   | 41 --
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 9e6927c3b8..4fc629d2e9 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -40,7 +40,20 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 public class TestStandardHostValve extends TomcatBaseTest {
 
 @Test
-public void testErrorPageHandling() throws Exception {
+public void testErrorPageHandling500() throws Exception {
+doTestErrorPageHandling(500, "/500");
+}
+
+
+@Test
+public void testErrorPageHandlingDefault() throws Exception {
+doTestErrorPageHandling(501, "/default");
+}
+
+
+private void doTestErrorPageHandling(int error, String report)
+throws Exception {
+
 // Set up a container
 Tomcat tomcat = getTomcatInstance();
 
@@ -68,8 +81,13 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 tomcat.start();
 
-doTestErrorPageHandling(500, "/500");
-doTestErrorPageHandling(501, "/default");
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/error?errorCode=" + error, bc, null);
+
+Assert.assertEquals(error, rc);
+Assert.assertEquals(report, bc.toString());
 }
 
 
@@ -131,19 +149,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
-throws Exception {
-
-// Request a page that triggers an error
-ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
-
-Assert.assertEquals(error, rc);
-Assert.assertEquals(report, bc.toString());
-}
-
-
 @Test
 public void testIncompleteResponse() throws Exception {
 // Set up a container
@@ -160,13 +165,13 @@ public class TestStandardHostValve extends TomcatBaseTest 
{
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
-// And the handling for 500 responses
+// Add the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
 errorPage500.setLocation("/report/500");
 ctx.addErrorPage(errorPage500);
 
-// And the default error handling
+// Add the default error handling
 ErrorPage errorPageDefault = new ErrorPage();
 errorPageDefault.setLocation("/report/default");
 ctx.addErrorPage(errorPageDefault);


-
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 (0d07cb180a -> ff38fd5e7f)

2023-08-16 Thread markt

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 0d07cb180a Remove unnecessary uses of {@inheritDoc}
 new d80c60f196 Refactor into individual tests
 new 50a034da2d Update certificate for user1
 new ff38fd5e7f Use application provided status code for error page if 
present

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:
 .../apache/catalina/core/StandardHostValve.java|  13 ++--
 .../catalina/core/TestStandardHostValve.java   |  72 +++--
 test/org/apache/tomcat/util/net/user1.jks  | Bin 2668 -> 4386 bytes
 webapps/docs/changelog.xml |  10 +++
 4 files changed, 72 insertions(+), 23 deletions(-)


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

[tomcat] 03/03: Use application provided status code for error page if present

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit ff38fd5e7fe1c71e050382d25aaf9eab942985b8
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:57:31 2023 +0100

Use application provided status code for error page if present
---
 .../apache/catalina/core/StandardHostValve.java| 13 ---
 .../catalina/core/TestStandardHostValve.java   | 41 +++---
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardHostValve.java 
b/java/org/apache/catalina/core/StandardHostValve.java
index 3b3b316dae..a186dc2a53 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -294,11 +294,14 @@ final class StandardHostValve extends ValveBase {
 }
 }
 } else {
-// A custom error-page has not been defined for the exception
-// that was thrown during request processing. Check if an
-// error-page for error code 500 was specified and if so,
-// send that page back as the response.
-response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+/*
+ *  A custom error-page has not been defined for the exception 
that was thrown during request processing.
+ *  Set the status to 500 if an error status has not already been 
set and check for custom error-page for
+ *  the status.
+ */
+if (response.getStatus() < HttpServletResponse.SC_BAD_REQUEST) {
+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+}
 // The response is an error
 response.setError();
 
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 4fc629d2e9..db4b7ccc09 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequestEvent;
 import jakarta.servlet.ServletRequestListener;
@@ -39,19 +40,31 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 
 public class TestStandardHostValve extends TomcatBaseTest {
 
+@Test
+public void testErrorPageHandling400() throws Exception {
+doTestErrorPageHandling(400, "", "/400");
+}
+
+
+@Test
+public void testErrorPageHandling400WithException() throws Exception {
+doTestErrorPageHandling(400, "java.lang.IllegalStateException", 
"/400");
+}
+
+
 @Test
 public void testErrorPageHandling500() throws Exception {
-doTestErrorPageHandling(500, "/500");
+doTestErrorPageHandling(500, "", "/500");
 }
 
 
 @Test
 public void testErrorPageHandlingDefault() throws Exception {
-doTestErrorPageHandling(501, "/default");
+doTestErrorPageHandling(501, "", "/default");
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
+private void doTestErrorPageHandling(int error, String exception, String 
report)
 throws Exception {
 
 // Set up a container
@@ -68,6 +81,12 @@ public class TestStandardHostValve extends TomcatBaseTest {
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
+// Add the handling for 400 responses
+ErrorPage errorPage400 = new ErrorPage();
+errorPage400.setErrorCode(Response.SC_BAD_REQUEST);
+errorPage400.setLocation("/report/400");
+ctx.addErrorPage(errorPage400);
+
 // And the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
@@ -83,8 +102,8 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 // Request a page that triggers an error
 ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
+int rc = getUrl("http://localhost:"; + getPort() + "/error?errorCode=" 
+ error + "&exception=" + exception,
+bc, null);
 
 Assert.assertEquals(error, rc);
 Assert.assertEquals(report, bc.toString());
@@ -200,6 +219,18 @@ public class TestStandardHostValve extends TomcatBaseTest {
 throws ServletException, IOException {
 int error = Integer.parseInt(req.getParameter("errorCode"));
 resp.sendError(error);
+
+Throwable t = null;
+

[tomcat] 02/03: Update certificate for user1

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 50a034da2db130be2b48253914c6523e99a752dd
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:40:42 2023 +0100

Update certificate for user1
---
 test/org/apache/tomcat/util/net/user1.jks | Bin 2668 -> 4386 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/user1.jks 
b/test/org/apache/tomcat/util/net/user1.jks
index efbade83df..1643506742 100644
Binary files a/test/org/apache/tomcat/util/net/user1.jks and 
b/test/org/apache/tomcat/util/net/user1.jks differ


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

[tomcat] 01/03: Refactor into individual tests

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 52c07637fff851108b416adcaf15d29275fed728
Author: Mark Thomas 
AuthorDate: Wed Aug 16 14:23:01 2023 +0100

Refactor into individual tests
---
 .../catalina/core/TestStandardHostValve.java   | 41 --
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index b706f41b53..99d82f3331 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -40,7 +40,20 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 public class TestStandardHostValve extends TomcatBaseTest {
 
 @Test
-public void testErrorPageHandling() throws Exception {
+public void testErrorPageHandling500() throws Exception {
+doTestErrorPageHandling(500, "/500");
+}
+
+
+@Test
+public void testErrorPageHandlingDefault() throws Exception {
+doTestErrorPageHandling(501, "/default");
+}
+
+
+private void doTestErrorPageHandling(int error, String report)
+throws Exception {
+
 // Set up a container
 Tomcat tomcat = getTomcatInstance();
 
@@ -68,8 +81,13 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 tomcat.start();
 
-doTestErrorPageHandling(500, "/500");
-doTestErrorPageHandling(501, "/default");
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/error?errorCode=" + error, bc, null);
+
+Assert.assertEquals(error, rc);
+Assert.assertEquals(report, bc.toString());
 }
 
 
@@ -131,19 +149,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
-throws Exception {
-
-// Request a page that triggers an error
-ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
-
-Assert.assertEquals(error, rc);
-Assert.assertEquals(report, bc.toString());
-}
-
-
 @Test
 public void testIncompleteResponse() throws Exception {
 // Set up a container
@@ -160,13 +165,13 @@ public class TestStandardHostValve extends TomcatBaseTest 
{
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
-// And the handling for 500 responses
+// Add the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
 errorPage500.setLocation("/report/500");
 ctx.addErrorPage(errorPage500);
 
-// And the default error handling
+// Add the default error handling
 ErrorPage errorPageDefault = new ErrorPage();
 errorPageDefault.setLocation("/report/default");
 ctx.addErrorPage(errorPageDefault);


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

[tomcat] 03/03: Use application provided status code for error page if present

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 8559a0caba7768c9c55c9c6b07d5906a487f8ffc
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:57:31 2023 +0100

Use application provided status code for error page if present
---
 .../apache/catalina/core/StandardHostValve.java| 13 ---
 .../catalina/core/TestStandardHostValve.java   | 41 +++---
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardHostValve.java 
b/java/org/apache/catalina/core/StandardHostValve.java
index b7aaad0dd1..7d5b890ce2 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -309,11 +309,14 @@ final class StandardHostValve extends ValveBase {
 }
 }
 } else {
-// A custom error-page has not been defined for the exception
-// that was thrown during request processing. Check if an
-// error-page for error code 500 was specified and if so,
-// send that page back as the response.
-response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+/*
+ *  A custom error-page has not been defined for the exception 
that was thrown during request processing.
+ *  Set the status to 500 if an error status has not already been 
set and check for custom error-page for
+ *  the status.
+ */
+if (response.getStatus() < HttpServletResponse.SC_BAD_REQUEST) {
+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+}
 // The response is an error
 response.setError();
 
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 99d82f3331..efd3a4a1d9 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;
@@ -39,19 +40,31 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 
 public class TestStandardHostValve extends TomcatBaseTest {
 
+@Test
+public void testErrorPageHandling400() throws Exception {
+doTestErrorPageHandling(400, "", "/400");
+}
+
+
+@Test
+public void testErrorPageHandling400WithException() throws Exception {
+doTestErrorPageHandling(400, "java.lang.IllegalStateException", 
"/400");
+}
+
+
 @Test
 public void testErrorPageHandling500() throws Exception {
-doTestErrorPageHandling(500, "/500");
+doTestErrorPageHandling(500, "", "/500");
 }
 
 
 @Test
 public void testErrorPageHandlingDefault() throws Exception {
-doTestErrorPageHandling(501, "/default");
+doTestErrorPageHandling(501, "", "/default");
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
+private void doTestErrorPageHandling(int error, String exception, String 
report)
 throws Exception {
 
 // Set up a container
@@ -68,6 +81,12 @@ public class TestStandardHostValve extends TomcatBaseTest {
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
+// Add the handling for 400 responses
+ErrorPage errorPage400 = new ErrorPage();
+errorPage400.setErrorCode(Response.SC_BAD_REQUEST);
+errorPage400.setLocation("/report/400");
+ctx.addErrorPage(errorPage400);
+
 // And the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
@@ -83,8 +102,8 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 // Request a page that triggers an error
 ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
+int rc = getUrl("http://localhost:"; + getPort() + "/error?errorCode=" 
+ error + "&exception=" + exception,
+bc, null);
 
 Assert.assertEquals(error, rc);
 Assert.assertEquals(report, bc.toString());
@@ -200,6 +219,18 @@ public class TestStandardHostValve extends TomcatBaseTest {
 throws ServletException, IOException {
 int error = Integer.parseInt(req.getParameter("errorCode"));
 resp.sendError(error);
+
+Throwable t = null;
+String

[tomcat] 02/03: Update certificate for user1

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 9d157bee41d57094971a585bf7eeaba7a2c63cdf
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:40:42 2023 +0100

Update certificate for user1
---
 test/org/apache/tomcat/util/net/user1.jks | Bin 2668 -> 4386 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/user1.jks 
b/test/org/apache/tomcat/util/net/user1.jks
index efbade83df..1643506742 100644
Binary files a/test/org/apache/tomcat/util/net/user1.jks and 
b/test/org/apache/tomcat/util/net/user1.jks differ


-
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 (aaa841be18 -> 8559a0caba)

2023-08-16 Thread markt

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 aaa841be18 Remove unnecessary uses of {@inheritDoc}
 new 52c07637ff Refactor into individual tests
 new 9d157bee41 Update certificate for user1
 new 8559a0caba Use application provided status code for error page if 
present

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:
 .../apache/catalina/core/StandardHostValve.java|  13 ++--
 .../catalina/core/TestStandardHostValve.java   |  72 +++--
 test/org/apache/tomcat/util/net/user1.jks  | Bin 2668 -> 4386 bytes
 webapps/docs/changelog.xml |  10 +++
 4 files changed, 72 insertions(+), 23 deletions(-)


-
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 (87c291f7a6 -> f7bf4083fc)

2023-08-16 Thread markt

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 87c291f7a6 Remove unnecessary uses of {@inheritDoc}
 new 36114bc3c2 Refactor into individual tests
 new b4be016ee0 Update certificate for user1
 new f7bf4083fc Use application provided status code for error page if 
present

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:
 .../apache/catalina/core/StandardHostValve.java|  13 ++--
 .../catalina/core/TestStandardHostValve.java   |  72 +++--
 test/org/apache/tomcat/util/net/user1.jks  | Bin 2668 -> 4386 bytes
 webapps/docs/changelog.xml |  10 +++
 4 files changed, 72 insertions(+), 23 deletions(-)


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

[tomcat] 01/03: Refactor into individual tests

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 36114bc3c2e78aa77bbcf3af9ff9e678d52ebb8c
Author: Mark Thomas 
AuthorDate: Wed Aug 16 14:23:01 2023 +0100

Refactor into individual tests
---
 .../catalina/core/TestStandardHostValve.java   | 41 --
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index b706f41b53..99d82f3331 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -40,7 +40,20 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 public class TestStandardHostValve extends TomcatBaseTest {
 
 @Test
-public void testErrorPageHandling() throws Exception {
+public void testErrorPageHandling500() throws Exception {
+doTestErrorPageHandling(500, "/500");
+}
+
+
+@Test
+public void testErrorPageHandlingDefault() throws Exception {
+doTestErrorPageHandling(501, "/default");
+}
+
+
+private void doTestErrorPageHandling(int error, String report)
+throws Exception {
+
 // Set up a container
 Tomcat tomcat = getTomcatInstance();
 
@@ -68,8 +81,13 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 tomcat.start();
 
-doTestErrorPageHandling(500, "/500");
-doTestErrorPageHandling(501, "/default");
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/error?errorCode=" + error, bc, null);
+
+Assert.assertEquals(error, rc);
+Assert.assertEquals(report, bc.toString());
 }
 
 
@@ -131,19 +149,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
-throws Exception {
-
-// Request a page that triggers an error
-ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
-
-Assert.assertEquals(error, rc);
-Assert.assertEquals(report, bc.toString());
-}
-
-
 @Test
 public void testIncompleteResponse() throws Exception {
 // Set up a container
@@ -160,13 +165,13 @@ public class TestStandardHostValve extends TomcatBaseTest 
{
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
-// And the handling for 500 responses
+// Add the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
 errorPage500.setLocation("/report/500");
 ctx.addErrorPage(errorPage500);
 
-// And the default error handling
+// Add the default error handling
 ErrorPage errorPageDefault = new ErrorPage();
 errorPageDefault.setLocation("/report/default");
 ctx.addErrorPage(errorPageDefault);


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

[tomcat] 02/03: Update certificate for user1

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit b4be016ee0fd5aaae92b4234330ab2f1637caf73
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:40:42 2023 +0100

Update certificate for user1
---
 test/org/apache/tomcat/util/net/user1.jks | Bin 2668 -> 4386 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/user1.jks 
b/test/org/apache/tomcat/util/net/user1.jks
index efbade83df..1643506742 100644
Binary files a/test/org/apache/tomcat/util/net/user1.jks and 
b/test/org/apache/tomcat/util/net/user1.jks differ


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

[tomcat] 03/03: Use application provided status code for error page if present

2023-08-16 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit f7bf4083fca9ea48a61006c396a09997b76ef728
Author: Mark Thomas 
AuthorDate: Wed Aug 16 15:57:31 2023 +0100

Use application provided status code for error page if present
---
 .../apache/catalina/core/StandardHostValve.java| 13 ---
 .../catalina/core/TestStandardHostValve.java   | 41 +++---
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardHostValve.java 
b/java/org/apache/catalina/core/StandardHostValve.java
index 3b50dfefee..584f59abcd 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -308,11 +308,14 @@ final class StandardHostValve extends ValveBase {
 }
 }
 } else {
-// A custom error-page has not been defined for the exception
-// that was thrown during request processing. Check if an
-// error-page for error code 500 was specified and if so,
-// send that page back as the response.
-response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+/*
+ *  A custom error-page has not been defined for the exception 
that was thrown during request processing.
+ *  Set the status to 500 if an error status has not already been 
set and check for custom error-page for
+ *  the status.
+ */
+if (response.getStatus() < HttpServletResponse.SC_BAD_REQUEST) {
+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+}
 // The response is an error
 response.setError();
 
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java 
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 99d82f3331..efd3a4a1d9 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;
@@ -39,19 +40,31 @@ import org.apache.tomcat.util.descriptor.web.ErrorPage;
 
 public class TestStandardHostValve extends TomcatBaseTest {
 
+@Test
+public void testErrorPageHandling400() throws Exception {
+doTestErrorPageHandling(400, "", "/400");
+}
+
+
+@Test
+public void testErrorPageHandling400WithException() throws Exception {
+doTestErrorPageHandling(400, "java.lang.IllegalStateException", 
"/400");
+}
+
+
 @Test
 public void testErrorPageHandling500() throws Exception {
-doTestErrorPageHandling(500, "/500");
+doTestErrorPageHandling(500, "", "/500");
 }
 
 
 @Test
 public void testErrorPageHandlingDefault() throws Exception {
-doTestErrorPageHandling(501, "/default");
+doTestErrorPageHandling(501, "", "/default");
 }
 
 
-private void doTestErrorPageHandling(int error, String report)
+private void doTestErrorPageHandling(int error, String exception, String 
report)
 throws Exception {
 
 // Set up a container
@@ -68,6 +81,12 @@ public class TestStandardHostValve extends TomcatBaseTest {
 Tomcat.addServlet(ctx, "report", new ReportServlet());
 ctx.addServletMappingDecoded("/report/*", "report");
 
+// Add the handling for 400 responses
+ErrorPage errorPage400 = new ErrorPage();
+errorPage400.setErrorCode(Response.SC_BAD_REQUEST);
+errorPage400.setLocation("/report/400");
+ctx.addErrorPage(errorPage400);
+
 // And the handling for 500 responses
 ErrorPage errorPage500 = new ErrorPage();
 errorPage500.setErrorCode(Response.SC_INTERNAL_SERVER_ERROR);
@@ -83,8 +102,8 @@ public class TestStandardHostValve extends TomcatBaseTest {
 
 // Request a page that triggers an error
 ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:"; + getPort() +
-"/error?errorCode=" + error, bc, null);
+int rc = getUrl("http://localhost:"; + getPort() + "/error?errorCode=" 
+ error + "&exception=" + exception,
+bc, null);
 
 Assert.assertEquals(error, rc);
 Assert.assertEquals(report, bc.toString());
@@ -200,6 +219,18 @@ public class TestStandardHostValve extends TomcatBaseTest {
 throws ServletException, IOException {
 int error = Integer.parseInt(req.getParameter("errorCode"));
 resp.sendError(error);
+
+Throwable t = null;
+String

Buildbot failure in on tomcat-9.0.x

2023-08-16 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/654
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] aaa841be183617a88e306702a6b1fdf63a08abd9


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Buildbot success in on tomcat-11.0.x

2023-08-16 Thread buildbot

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/541
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] 0a3e97983f867dc43ee97e02a2a018ea90be3454


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Buildbot success in on tomcat-10.1.x

2023-08-16 Thread buildbot

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/909
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 10.1.x] ff38fd5e7fe1c71e050382d25aaf9eab942985b8


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Buildbot success in on tomcat-9.0.x

2023-08-16 Thread buildbot

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/655
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 9.0.x] 8559a0caba7768c9c55c9c6b07d5906a487f8ffc


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

42 matches

Mail list logo