[Bug 69140] REGRESSION in change from Base64 from apache commons to java class

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69140

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #4 from Remy Maucherat  ---
No details here, but most likely a duplicate.

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

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 69066] SPNEGOAuthenticator not working afte switching to java.util.Base64

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69066

Remy Maucherat  changed:

   What|Removed |Added

 CC||mircea.butma...@radcom.ro

--- Comment #4 from Remy Maucherat  ---
*** Bug 69140 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE][RESULT] Release Apache Tomcat 9.0.90

2024-06-19 Thread Rémy Maucherat
The following votes were cast:

Binding:
+1: markt, isapir, remm

Non-binding
+1: Dimitris Soumis

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Rémy

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



svn commit: r69857 - /dev/tomcat/tomcat-9/v9.0.90/ /release/tomcat/tomcat-9/v9.0.90/

2024-06-19 Thread remm
Author: remm
Date: Wed Jun 19 08:14:43 2024
New Revision: 69857

Log:
Release Apache Tomcat 9.0.90

Added:
release/tomcat/tomcat-9/v9.0.90/
  - copied from r69856, dev/tomcat/tomcat-9/v9.0.90/
Removed:
dev/tomcat/tomcat-9/v9.0.90/


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



[Bug 69141] New: https://woodlandhillsmedicaltransport.com/

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69141

Bug ID: 69141
   Summary: https://woodlandhillsmedicaltransport.com/
   Product: Tomcat Native
   Version: 2.0.7
  Hardware: PC
OS: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: aaronjhonson1...@gmail.com
  Target Milestone: ---

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 69141] https://woodlandhillsmedicaltransport.com/

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69141

Aaron Johnson  changed:

   What|Removed |Added

URL||https://woodlandhillsmedica
   ||ltransport.com/
   Keywords||APIBug

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1918433 [1/2] - in /tomcat/site/trunk: ./ docs/ xdocs/

2024-06-19 Thread remm
Author: remm
Date: Wed Jun 19 11:42:14 2024
New Revision: 1918433

URL: http://svn.apache.org/viewvc?rev=1918433&view=rev
Log:
Site update for 9.0.90

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/index.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-9.html
tomcat/site/trunk/docs/oldnews-2020.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1918433&r1=1918432&r2=1918433&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jun 19 11:42:14 2024
@@ -37,7 +37,7 @@ tomcat.loc=https://downloads.apache.org/
 
 # - Tomcat versions -
 tomcat8.5=8.5.100
-tomcat9.0=9.0.89
+tomcat9.0=9.0.90
 tomcat10.1=10.1.24
 tomcat11.0=11.0.0-M21
 

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1918433&r1=1918432&r2=1918433&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Jun 19 11:42:14 2024
@@ -74,8 +74,8 @@
 
   
 Latest Stable 9.0.x Release
-2024-05-07
-9.0.89
+2024-06-19
+9.0.90
   
 
 

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1918433&r1=1918432&r2=1918433&view=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Wed Jun 19 11:42:14 2024
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Apache Tomcat 10 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)<
 /li>https://tomcat.apache.org/download-10.cgi";>Tomcat 
10https://tomcat.apache.org/download-90.cgi";>Tomcat 
9https://tomcat.apache.org/download-80.cgi";>Tomcat 
8https://tomcat.apache.org/download-migration.cgi";>Tomcat 
Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBu
 ildbothttps://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.a
 pache.org/foundation/sponsorship.html">Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTomcat 10 Software Downloads
+Apache Tomcat® - Apache Tomcat 10 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

svn commit: r1918433 [2/2] - in /tomcat/site/trunk: ./ docs/ xdocs/

2024-06-19 Thread remm
Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1918433&r1=1918432&r2=1918433&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Jun 19 11:42:14 2024
@@ -1,5 +1,5 @@
 
-Apache Tomcat® - Migration Guide - Tomcat 
9.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/Su
 pportApache-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.apa
 che.org/download-11.cgi">Tomcat 11 (alpha)https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 11.0 (alpha)Tomcat 10.1Tomcat 9.0Tomcat 8.5
 UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothref="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations href="./tools.html">ToolsMediahref="https://twitter.com/theapachetomcat";>Twitterhref="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehref="https://blogs.apache.org/tomcat/";>BlogMisc href="./whoweare.html">Who We Arehref="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag href="./heritage.html">Heritagehref="http://www.apache.org";>Apache Homehref="./resources.html">Resourceshref="./contact.html">Contacthref="./legal.html">Legalhref="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy href="https://www.apache.org/foundation/contributing.html";>Su
 pport Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
+Apache Tomcat® - Migration Guide - Tomcat 
9.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/Su
 pportApache-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.apa
 che.org/download-11.cgi">Tomcat 11 (beta)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 (beta)Tomcat 10.1Tomcat 9.0Tomcat 8.5UpgradingTomcat ConnectorsTomcat Native 2Tomcat Native 1.3https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewS
 ource 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";>Supp
 ort Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
 GeneralMigrating from 8.0.x or 8.5.x to 
9.0.xJava 8 requiredSpecification APIsServlet 4.0 APIJava

svn commit: r1918434 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap

2024-06-19 Thread remm
Author: remm
Date: Wed Jun 19 11:47:37 2024
New Revision: 1918434

URL: http://svn.apache.org/viewvc?rev=1918434&view=rev
Log:
Docs update for 9.0.90


[This commit notification would consist of 115 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



svn commit: r1918435 - in /tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/buildutil/translate: BackportBase.html BackportEnglish.html BackportTranslations.html

2024-06-19 Thread remm
Author: remm
Date: Wed Jun 19 11:51:02 2024
New Revision: 1918435

URL: http://svn.apache.org/viewvc?rev=1918435&view=rev
Log:
Docs update for 9.0.90

Removed:

tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/buildutil/translate/BackportBase.html

tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/buildutil/translate/BackportEnglish.html

tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/buildutil/translate/BackportTranslations.html


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



[ANN] Apache Tomcat 9.0.90 available

2024-06-19 Thread Rémy Maucherat
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.90.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.

Apache Tomcat 9.0.90 is a bugfix and feature release. The notable
changes compared to 9.0.89 include:

- Ensure that static resources deployed via a JAR file remain accessible
   when the context is configured to use a bloom filter.

- Update to Commons Daemon 1.4.0.

- The default value of the discardFacades attribute of the Connector is now
  true for improved safety.

Along with lots of other bug fixes and improvements.

Please refer to the change log for the complete list of changes:
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html

Downloads:
https://tomcat.apache.org/download-90.cgi

Migration guides from Apache Tomcat 7.x and 8.x:
https://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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



[Bug 69141] SPAM SPAM SPAM SPAM

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69141

Chuck Caldarale  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
URL|https://woodlandhillsmedica |
   |ltransport.com/ |
 Resolution|--- |INVALID
Summary|https://woodlandhillsmedica |SPAM SPAM SPAM SPAM
   |ltransport.com/ |

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 69142] New: FileResourceSet allocates unnecessary Strings

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69142

Bug ID: 69142
   Summary: FileResourceSet allocates unnecessary Strings
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: jeng...@amazon.com
  Target Milestone: -

The method
'org.apache.catalina.webresources.FileResourceSet.getResource(String)' has
logic that in the common case (for us, anyway) appends a '/' to a String, then
immediately strips it back out.  The repeated concatenation means repeated
object allocation, and as this is a hot path, it impacts our startup time and
our request-handling time (we have unfortunate classpath scans during each
request).

In version 9.x, the append occurs at FileResourceSet.java#L83 and the character
is stripped at FileResourceSet.java#L87.  Rewriting that code to avoid the
duplication would be isolated, safe, and helpful.

A clunky example of that rewrite is:

if (path.charAt(path.length() - 1) != '/')
if (webAppMount.startsWith(path)) {
String name = path;
name = name.substring(name.lastIndexOf('/') + 1);
if (name.length() > 0) {
return new VirtualResource(root, path, name);
}
} else {
path = path + '/';
}
else if (webAppMount.startsWith(path)) {
String name = path.substring(0, path.length() - 1);
name = name.substring(name.lastIndexOf('/') + 1);
if (name.length() > 0) {
return new VirtualResource(root, path, name);
}
}
return new EmptyResource(root, path);

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 9.0.90

2024-06-19 Thread Christopher Schultz

Rémy,

On 6/14/24 11:06 AM, Rémy Maucherat wrote:

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

The notable changes compared to 9.0.89 are:

- Ensure that static resources deployed via a JAR file remain accessible
when the context is configured to use a bloom filter. Based on pull
request #730 provided by bergander.

- Update to Commons Daemon 1.4.0

- The default value of the discardFacades attribute of the Connector is now
   true for improved safety

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.90/

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

The tag is:
https://github.com/apache/tomcat/tree/9.0.90
65977c7d1da9b6016e2b19de06c3be7373f40859

The proposed 9.0.90 release is:
[ ] -1, Broken - do not release
[ ] +1, Stable - go ahead and release as 9.0.90


+1 for stable (6 hours late!)

Build is reproducible on MacOS x86-64. Unit tests pass except for APR, 
likely an environmental problem. Every APR-related test fails with "APR 
library was not found" so I'll investigate that and hopefully givea 
better vote next time


Details:

* Environment
*  Java (build):openjdk version "17.0.11" 2024-04-16 OpenJDK Runtime 
Environment Temurin-17.0.11+9 (build 17.0.11+9) OpenJDK 64-Bit Server VM 
Temurin-17.0.11+9 (build 17.0.11+9, mixed mode)
*  Java (test): openjdk version "22.0.1" 2024-04-16 OpenJDK Runtime 
Environment Temurin-22.0.1+8 (build 22.0.1+8) OpenJDK 64-Bit Server VM 
Temurin-22.0.1+8 (build 22.0.1+8, mixed mode)
*  Ant: Apache Ant(TM) version 1.10.14 compiled on August 16 
2023

*  OS:  Darwin 21.6.0 x86_64
*  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
*  make:GNU Make 3.81
*  OpenSSL: OpenSSL 3.2.1 30 Jan 2024 (Library: OpenSSL 3.2.1 30 
Jan 2024)

*  APR: 1.7.4
*
* Valid SHA-512 signature for apache-tomcat-9.0.90.zip
* Valid GPG signature for apache-tomcat-9.0.90.zip
* Valid SHA-512 signature for apache-tomcat-9.0.90.tar.gz
* Valid GPG signature for apache-tomcat-9.0.90.tar.gz
* Valid SHA-512 signature for apache-tomcat-9.0.90.exe
* Valid GPG signature for apache-tomcat-9.0.90.exe
* Valid SHA512 signature for apache-tomcat-9.0.90-src.zip
* Valid GPG signature for apache-tomcat-9.0.90-src.zip
* Valid SHA512 signature for apache-tomcat-9.0.90-src.tar.gz
* Valid GPG signature for apache-tomcat-9.0.90-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* javax.servlet.http.TestHttpServletDoHeadValidWrite1023.NIO2.txt
* org.apache.catalina.ant.TestDeployTask.APR.txt
* org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt
* org.apache.catalina.connector.TestConnector.APR.txt
* org.apache.catalina.connector.TestCoyoteAdapter.APR.txt
* org.apache.catalina.connector.TestRequest.APR.txt
* org.apache.catalina.connector.TestResponse.APR.txt
* org.apache.catalina.core.TestApplicationContext.APR.txt
* org.apache.catalina.core.TestAsyncContextImpl.APR.txt
* org.apache.catalina.core.TestStandardContext.APR.txt
* org.apache.catalina.core.TestStandardHostValve.APR.txt
* org.apache.catalina.filters.TestExpiresFilter.APR.txt
* org.apache.catalina.filters.TestRemoteIpFilter.APR.txt
* org.apache.catalina.startup.TestTomcat.APR.txt
* org.apache.catalina.valves.rewrite.TestRewriteValve.APR.txt
* org.apache.coyote.http11.TestHttp11InputBuffer.APR.txt
* org.apache.jasper.compiler.TestGenerator.APR.txt
* org.apache.jasper.servlet.TestTldScanner.APR.txt
* org.apache.tomcat.util.net.TestXxxEndpoint.APR.txt

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



[VOTE][RESULT] Release Apache Tomcat 10.1.25

2024-06-19 Thread Christopher Schultz

All,

The following votes were case:

+1: isapir, remm, markt, schultz

Non-binding:

+1: Dimitris Soumis, Adam Rauch

There were no other votes, therefore the vote passes.

Thanks to everyone who contributed toward this release.

Thanks,
-chris


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

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

The notable changes compared to 10.1.24 are:

- Ensure that static resources deployed via a JAR file remain accessible
  when the context is configured to use a bloom filter. Based on pull
  request #730 provided by bergander.

- Update to Commons Daemon 1.4.0

- Improvements to HTTP/2 streams and timeouts

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

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

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

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.25
https://github.com/apache/tomcat/commit/a0038178b617423537dc66b2f516c53da7093421

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


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



svn commit: r69863 - /dev/tomcat/tomcat-10/v10.1.25/ /release/tomcat/tomcat-10/v10.1.25/

2024-06-19 Thread schultz
Author: schultz
Date: Wed Jun 19 14:09:42 2024
New Revision: 69863

Log:
Promote v10.1.25 to release

Added:
release/tomcat/tomcat-10/v10.1.25/
  - copied from r69862, dev/tomcat/tomcat-10/v10.1.25/
Removed:
dev/tomcat/tomcat-10/v10.1.25/


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



Re: [VOTE] Release Apache Tomcat 9.0.90

2024-06-19 Thread Rémy Maucherat
On Wed, Jun 19, 2024 at 3:59 PM Christopher Schultz
 wrote:
>
> Rémy,
>
> On 6/14/24 11:06 AM, Rémy Maucherat wrote:
> > The proposed Apache Tomcat 9.0.90 release is now available for voting.
> >
> > The notable changes compared to 9.0.89 are:
> >
> > - Ensure that static resources deployed via a JAR file remain accessible
> > when the context is configured to use a bloom filter. Based on pull
> > request #730 provided by bergander.
> >
> > - Update to Commons Daemon 1.4.0
> >
> > - The default value of the discardFacades attribute of the Connector is now
> >true for improved safety
> >
> > For full details, see the changelog:
> > https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> >
> > It can be obtained from:
> > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.90/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1497
> >
> > The tag is:
> > https://github.com/apache/tomcat/tree/9.0.90
> > 65977c7d1da9b6016e2b19de06c3be7373f40859
> >
> > The proposed 9.0.90 release is:
> > [ ] -1, Broken - do not release
> > [ ] +1, Stable - go ahead and release as 9.0.90
>
> +1 for stable (6 hours late!)
>
> Build is reproducible on MacOS x86-64. Unit tests pass except for APR,
> likely an environmental problem. Every APR-related test fails with "APR
> library was not found" so I'll investigate that and hopefully givea
> better vote next time

I have verified the fix for the testsuite works:
https://github.com/apache/tomcat/commit/2a362e8a014e7857dc9491e9fcb22b243e268b9c

It's really only a testsuite thing overall.

Rémy

> Details:
>
> * Environment
> *  Java (build):openjdk version "17.0.11" 2024-04-16 OpenJDK Runtime
> Environment Temurin-17.0.11+9 (build 17.0.11+9) OpenJDK 64-Bit Server VM
> Temurin-17.0.11+9 (build 17.0.11+9, mixed mode)
> *  Java (test): openjdk version "22.0.1" 2024-04-16 OpenJDK Runtime
> Environment Temurin-22.0.1+8 (build 22.0.1+8) OpenJDK 64-Bit Server VM
> Temurin-22.0.1+8 (build 22.0.1+8, mixed mode)
> *  Ant: Apache Ant(TM) version 1.10.14 compiled on August 16
> 2023
> *  OS:  Darwin 21.6.0 x86_64
> *  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
> *  make:GNU Make 3.81
> *  OpenSSL: OpenSSL 3.2.1 30 Jan 2024 (Library: OpenSSL 3.2.1 30
> Jan 2024)
> *  APR: 1.7.4
> *
> * Valid SHA-512 signature for apache-tomcat-9.0.90.zip
> * Valid GPG signature for apache-tomcat-9.0.90.zip
> * Valid SHA-512 signature for apache-tomcat-9.0.90.tar.gz
> * Valid GPG signature for apache-tomcat-9.0.90.tar.gz
> * Valid SHA-512 signature for apache-tomcat-9.0.90.exe
> * Valid GPG signature for apache-tomcat-9.0.90.exe
> * Valid SHA512 signature for apache-tomcat-9.0.90-src.zip
> * Valid GPG signature for apache-tomcat-9.0.90-src.zip
> * Valid SHA512 signature for apache-tomcat-9.0.90-src.tar.gz
> * Valid GPG signature for apache-tomcat-9.0.90-src.tar.gz
> *
> * Binary Zip and tarball: Same
> * Source Zip and tarball: Same
> *
> * Building dependencies returned: 0
> * tcnative builds cleanly
> * Tomcat builds cleanly
> * Junit Tests: FAILED
> *
> * Tests that failed:
> * javax.servlet.http.TestHttpServletDoHeadValidWrite1023.NIO2.txt
> * org.apache.catalina.ant.TestDeployTask.APR.txt
> * org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt
> * org.apache.catalina.connector.TestConnector.APR.txt
> * org.apache.catalina.connector.TestCoyoteAdapter.APR.txt
> * org.apache.catalina.connector.TestRequest.APR.txt
> * org.apache.catalina.connector.TestResponse.APR.txt
> * org.apache.catalina.core.TestApplicationContext.APR.txt
> * org.apache.catalina.core.TestAsyncContextImpl.APR.txt
> * org.apache.catalina.core.TestStandardContext.APR.txt
> * org.apache.catalina.core.TestStandardHostValve.APR.txt
> * org.apache.catalina.filters.TestExpiresFilter.APR.txt
> * org.apache.catalina.filters.TestRemoteIpFilter.APR.txt
> * org.apache.catalina.startup.TestTomcat.APR.txt
> * org.apache.catalina.valves.rewrite.TestRewriteValve.APR.txt
> * org.apache.coyote.http11.TestHttp11InputBuffer.APR.txt
> * org.apache.jasper.compiler.TestGenerator.APR.txt
> * org.apache.jasper.servlet.TestTldScanner.APR.txt
> * org.apache.tomcat.util.net.TestXxxEndpoint.APR.txt
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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



svn commit: r1918451 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-10.1-doc/ docs/tomcat-10.1-doc/annotationapi/ docs/tomcat-10.1-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.1-doc/annotationa

2024-06-19 Thread schultz
Author: schultz
Date: Wed Jun 19 16:01:16 2024
New Revision: 1918451

URL: http://svn.apache.org/viewvc?rev=1918451&view=rev
Log:
Update web site to announce 10.1.25


[This commit notification would consist of 114 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



Re: (tomcat) branch main updated: Clear error earlier

2024-06-19 Thread Christopher Schultz

Rémy,

Michael-o has been pointing out that when fetching errors from OpenSSL, 
it's important to get all of them because OpenSSL tends to queue them up.


Instead of getting "last error" should we be getting "all errors" as a 
list/array of error messages?


-chris

On 6/18/24 10:41, r...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new 6fcf6d333b Clear error earlier
6fcf6d333b is described below

commit 6fcf6d333bec4855bd97494679a3d5272cd5786b
Author: remm 
AuthorDate: Tue Jun 18 16:40:41 2024 +0200

 Clear error earlier
---
  .../tomcat/util/net/openssl/panama/LocalStrings.properties|  1 +
  .../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 11 ++-
  2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties 
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
index b42309b801..ad0d1d4291 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -58,6 +58,7 @@ openssl.errorLoadingPassword=Error loading password file: 
[{0}]
  openssl.errorLoadingPrivateKey=Error loading private key: [{0}]
  openssl.errorLoadingCertificateRevocationListWithError=Error loading 
certificate revocation [{0}] with error [{1}]
  openssl.errorPrivateKeyCheck=Private key does not match the certificate 
public key: [{0}]
+openssl.errorReadingPEMParameters=Failed reading PEM parameters [{0}] for 
certificate [{1}]
  openssl.errorSSLCtxInit=Error initializing SSL context
  openssl.invalidSslProtocol=An invalid value [{0}] was provided for the 
SSLProtocol attribute
  openssl.keyManagerMissing=No key manager found
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 9a8ba2ea2b..3dedf0fd22 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -1068,6 +1068,10 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
  
log.debug(sm.getString("openssl.setCustomDHParameters", 
Integer.valueOf(numBits), certificate.getCertificateFile()));
  }
  } else {
+String errMessage = OpenSSLLibrary.getLastError();
+if (errMessage != null) {
+
log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage, 
certificate.getCertificateFile()));
+}
  SSL_CTX_ctrl(state.sslCtx, 
SSL_CTRL_SET_DH_AUTO(), 1, MemorySegment.NULL);
  }
  }
@@ -1220,9 +1224,14 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
  EVP_PKEY_free(pkey);
  } else {
  
log.debug(sm.getString("openssl.setCustomDHParameters", 
Integer.valueOf(numBits),
-certificate.getCertificateFile()));
+x509KeyManager.toString()));
  }
  } else {
+String errMessage = OpenSSLLibrary.getLastError();
+if (errMessage != null) {
+
log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage,
+x509KeyManager.toString()));
+}
  SSL_CTX_ctrl(state.sslCtx, SSL_CTRL_SET_DH_AUTO(), 1, 
MemorySegment.NULL);
  }
  }


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



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



Re: [VOTE] Release Apache Tomcat 9.0.90

2024-06-19 Thread Christopher Schultz

Rémy,

On 6/19/24 10:15, Rémy Maucherat wrote:

On Wed, Jun 19, 2024 at 3:59 PM Christopher Schultz
 wrote:


Rémy,

On 6/14/24 11:06 AM, Rémy Maucherat wrote:

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

The notable changes compared to 9.0.89 are:

- Ensure that static resources deployed via a JAR file remain accessible
 when the context is configured to use a bloom filter. Based on pull
 request #730 provided by bergander.

- Update to Commons Daemon 1.4.0

- The default value of the discardFacades attribute of the Connector is now
true for improved safety

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.90/

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

The tag is:
https://github.com/apache/tomcat/tree/9.0.90
65977c7d1da9b6016e2b19de06c3be7373f40859

The proposed 9.0.90 release is:
[ ] -1, Broken - do not release
[ ] +1, Stable - go ahead and release as 9.0.90


+1 for stable (6 hours late!)

Build is reproducible on MacOS x86-64. Unit tests pass except for APR,
likely an environmental problem. Every APR-related test fails with "APR
library was not found" so I'll investigate that and hopefully givea
better vote next time


I have verified the fix for the testsuite works:
https://github.com/apache/tomcat/commit/2a362e8a014e7857dc9491e9fcb22b243e268b9c

It's really only a testsuite thing overall.


No, I wasn't having this issue. My issue was that apparently the APR and 
tcnative library weren't being loaded at all.


:(

-chris


Details:

* Environment
*  Java (build):openjdk version "17.0.11" 2024-04-16 OpenJDK Runtime
Environment Temurin-17.0.11+9 (build 17.0.11+9) OpenJDK 64-Bit Server VM
Temurin-17.0.11+9 (build 17.0.11+9, mixed mode)
*  Java (test): openjdk version "22.0.1" 2024-04-16 OpenJDK Runtime
Environment Temurin-22.0.1+8 (build 22.0.1+8) OpenJDK 64-Bit Server VM
Temurin-22.0.1+8 (build 22.0.1+8, mixed mode)
*  Ant: Apache Ant(TM) version 1.10.14 compiled on August 16
2023
*  OS:  Darwin 21.6.0 x86_64
*  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
*  make:GNU Make 3.81
*  OpenSSL: OpenSSL 3.2.1 30 Jan 2024 (Library: OpenSSL 3.2.1 30
Jan 2024)
*  APR: 1.7.4
*
* Valid SHA-512 signature for apache-tomcat-9.0.90.zip
* Valid GPG signature for apache-tomcat-9.0.90.zip
* Valid SHA-512 signature for apache-tomcat-9.0.90.tar.gz
* Valid GPG signature for apache-tomcat-9.0.90.tar.gz
* Valid SHA-512 signature for apache-tomcat-9.0.90.exe
* Valid GPG signature for apache-tomcat-9.0.90.exe
* Valid SHA512 signature for apache-tomcat-9.0.90-src.zip
* Valid GPG signature for apache-tomcat-9.0.90-src.zip
* Valid SHA512 signature for apache-tomcat-9.0.90-src.tar.gz
* Valid GPG signature for apache-tomcat-9.0.90-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* javax.servlet.http.TestHttpServletDoHeadValidWrite1023.NIO2.txt
* org.apache.catalina.ant.TestDeployTask.APR.txt
* org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt
* org.apache.catalina.connector.TestConnector.APR.txt
* org.apache.catalina.connector.TestCoyoteAdapter.APR.txt
* org.apache.catalina.connector.TestRequest.APR.txt
* org.apache.catalina.connector.TestResponse.APR.txt
* org.apache.catalina.core.TestApplicationContext.APR.txt
* org.apache.catalina.core.TestAsyncContextImpl.APR.txt
* org.apache.catalina.core.TestStandardContext.APR.txt
* org.apache.catalina.core.TestStandardHostValve.APR.txt
* org.apache.catalina.filters.TestExpiresFilter.APR.txt
* org.apache.catalina.filters.TestRemoteIpFilter.APR.txt
* org.apache.catalina.startup.TestTomcat.APR.txt
* org.apache.catalina.valves.rewrite.TestRewriteValve.APR.txt
* org.apache.coyote.http11.TestHttp11InputBuffer.APR.txt
* org.apache.jasper.compiler.TestGenerator.APR.txt
* org.apache.jasper.servlet.TestTldScanner.APR.txt
* org.apache.tomcat.util.net.TestXxxEndpoint.APR.txt

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



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



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



[Bug 69142] FileResourceSet allocates unnecessary Strings

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69142

--- Comment #1 from Christopher Schultz  ---
The code is not equivalent. For reference, the original code:

Line
82if (path.charAt(path.length() - 1) != '/') {
83path = path + '/';
84}
85
86if (webAppMount.startsWith(path)) {
87String name = path.substring(0, path.length() - 1);
88name = name.substring(name.lastIndexOf('/') + 1);
89if (name.length() > 0) {
90return new VirtualResource(root, path, name);
91}
92}

The proposed solution avoids appending "/" on line 83 but then the predicate on
line 86 is not modified in the proposal, and webappMount.startsWith(path) is no
longer guaranteed to end in a "/".

I think the proposal needs a little adjustment.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: (tomcat) branch main updated: Clear error earlier

2024-06-19 Thread Rémy Maucherat
On Wed, Jun 19, 2024 at 6:49 PM Christopher Schultz
 wrote:
>
> Rémy,
>
> Michael-o has been pointing out that when fetching errors from OpenSSL,
> it's important to get all of them because OpenSSL tends to queue them up.
>
> Instead of getting "last error" should we be getting "all errors" as a
> list/array of error messages?

The important part is done (looping over all the errors to clear the
stack). I wasn't super convinced that returning something more than
the last error was very useful.

Rémy

> -chris
>
> On 6/18/24 10:41, r...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > remm pushed a commit to branch main
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/main by this push:
> >   new 6fcf6d333b Clear error earlier
> > 6fcf6d333b is described below
> >
> > commit 6fcf6d333bec4855bd97494679a3d5272cd5786b
> > Author: remm 
> > AuthorDate: Tue Jun 18 16:40:41 2024 +0200
> >
> >  Clear error earlier
> > ---
> >   .../tomcat/util/net/openssl/panama/LocalStrings.properties|  1 +
> >   .../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 11 
> > ++-
> >   2 files changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git 
> > a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties 
> > b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
> > index b42309b801..ad0d1d4291 100644
> > --- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
> > +++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
> > @@ -58,6 +58,7 @@ openssl.errorLoadingPassword=Error loading password file: 
> > [{0}]
> >   openssl.errorLoadingPrivateKey=Error loading private key: [{0}]
> >   openssl.errorLoadingCertificateRevocationListWithError=Error loading 
> > certificate revocation [{0}] with error [{1}]
> >   openssl.errorPrivateKeyCheck=Private key does not match the certificate 
> > public key: [{0}]
> > +openssl.errorReadingPEMParameters=Failed reading PEM parameters [{0}] for 
> > certificate [{1}]
> >   openssl.errorSSLCtxInit=Error initializing SSL context
> >   openssl.invalidSslProtocol=An invalid value [{0}] was provided for the 
> > SSLProtocol attribute
> >   openssl.keyManagerMissing=No key manager found
> > diff --git 
> > a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java 
> > b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
> > index 9a8ba2ea2b..3dedf0fd22 100644
> > --- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
> > +++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
> > @@ -1068,6 +1068,10 @@ public class OpenSSLContext implements 
> > org.apache.tomcat.util.net.SSLContext {
> >   
> > log.debug(sm.getString("openssl.setCustomDHParameters", 
> > Integer.valueOf(numBits), certificate.getCertificateFile()));
> >   }
> >   } else {
> > +String errMessage = 
> > OpenSSLLibrary.getLastError();
> > +if (errMessage != null) {
> > +
> > log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage, 
> > certificate.getCertificateFile()));
> > +}
> >   SSL_CTX_ctrl(state.sslCtx, 
> > SSL_CTRL_SET_DH_AUTO(), 1, MemorySegment.NULL);
> >   }
> >   }
> > @@ -1220,9 +1224,14 @@ public class OpenSSLContext implements 
> > org.apache.tomcat.util.net.SSLContext {
> >   EVP_PKEY_free(pkey);
> >   } else {
> >   
> > log.debug(sm.getString("openssl.setCustomDHParameters", 
> > Integer.valueOf(numBits),
> > -certificate.getCertificateFile()));
> > +x509KeyManager.toString()));
> >   }
> >   } else {
> > +String errMessage = OpenSSLLibrary.getLastError();
> > +if (errMessage != null) {
> > +
> > log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage,
> > +x509KeyManager.toString()));
> > +}
> >   SSL_CTX_ctrl(state.sslCtx, 
> > SSL_CTRL_SET_DH_AUTO(), 1, MemorySegment.NULL);
> >   }
> >   }
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additi

[Bug 69142] FileResourceSet allocates unnecessary Strings

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69142

--- Comment #2 from John Engebretson  ---
Good catch!  I wrote a fix, unit test, and speed test, and discovered that the
corrected logic performs comparably to the old.  In short, my proposed fix is
more complicated than current but performance neutral.

Please close as wont fix or such.  My apologies.  :)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: (tomcat) branch main updated: Clear error earlier

2024-06-19 Thread Christopher Schultz

Rémy,

On 6/19/24 15:17, Rémy Maucherat wrote:

On Wed, Jun 19, 2024 at 6:49 PM Christopher Schultz
 wrote:


Rémy,

Michael-o has been pointing out that when fetching errors from OpenSSL,
it's important to get all of them because OpenSSL tends to queue them up.

Instead of getting "last error" should we be getting "all errors" as a
list/array of error messages?


The important part is done (looping over all the errors to clear the
stack). I wasn't super convinced that returning something more than
the last error was very useful.


Okay.

-chris


On 6/18/24 10:41, r...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
   new 6fcf6d333b Clear error earlier
6fcf6d333b is described below

commit 6fcf6d333bec4855bd97494679a3d5272cd5786b
Author: remm 
AuthorDate: Tue Jun 18 16:40:41 2024 +0200

  Clear error earlier
---
   .../tomcat/util/net/openssl/panama/LocalStrings.properties|  1 +
   .../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 11 
++-
   2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties 
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
index b42309b801..ad0d1d4291 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -58,6 +58,7 @@ openssl.errorLoadingPassword=Error loading password file: 
[{0}]
   openssl.errorLoadingPrivateKey=Error loading private key: [{0}]
   openssl.errorLoadingCertificateRevocationListWithError=Error loading 
certificate revocation [{0}] with error [{1}]
   openssl.errorPrivateKeyCheck=Private key does not match the certificate 
public key: [{0}]
+openssl.errorReadingPEMParameters=Failed reading PEM parameters [{0}] for 
certificate [{1}]
   openssl.errorSSLCtxInit=Error initializing SSL context
   openssl.invalidSslProtocol=An invalid value [{0}] was provided for the 
SSLProtocol attribute
   openssl.keyManagerMissing=No key manager found
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 9a8ba2ea2b..3dedf0fd22 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -1068,6 +1068,10 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
   
log.debug(sm.getString("openssl.setCustomDHParameters", 
Integer.valueOf(numBits), certificate.getCertificateFile()));
   }
   } else {
+String errMessage = OpenSSLLibrary.getLastError();
+if (errMessage != null) {
+
log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage, 
certificate.getCertificateFile()));
+}
   SSL_CTX_ctrl(state.sslCtx, 
SSL_CTRL_SET_DH_AUTO(), 1, MemorySegment.NULL);
   }
   }
@@ -1220,9 +1224,14 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
   EVP_PKEY_free(pkey);
   } else {
   
log.debug(sm.getString("openssl.setCustomDHParameters", 
Integer.valueOf(numBits),
-certificate.getCertificateFile()));
+x509KeyManager.toString()));
   }
   } else {
+String errMessage = OpenSSLLibrary.getLastError();
+if (errMessage != null) {
+
log.debug(sm.getString("openssl.errorReadingPEMParameters", errMessage,
+x509KeyManager.toString()));
+}
   SSL_CTX_ctrl(state.sslCtx, SSL_CTRL_SET_DH_AUTO(), 
1, MemorySegment.NULL);
   }
   }


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



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



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



-

[Bug 69140] REGRESSION in change from Base64 from apache commons to java class

2024-06-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69140

--- Comment #5 from Mircea Butmalai  ---
Yes this bug is exactly the same bug as the one marked as duplicate

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org