date:20230808

[GitHub] [tomcat] babyblue94520 opened a new pull request, #645: feat(Http11Processor): Add max value in keepalive.

2023-08-08 Thread via GitHub



babyblue94520 opened a new pull request, #645:
URL: https://github.com/apache/tomcat/pull/645

   __HttpClient__ judges how many connections are cached by the __keepalive__ 
header max value, but __Http11Processor__ doesn't provide it, so __HttpClient__ 
__keepAliveConnections__ is always __5__.
   
   ## sun.net.www.http.HttpClient
   
   Parse keepalive headers for max connections.
   
   * __parseHTTPHeader__
   
   ```java
   HeaderParser p = new HeaderParser(responses.findValue("Keep-Alive"));
   /* default should be larger in case of proxy */
   keepAliveConnections = p.findInt("max", usingProxy?50:5);
   keepAliveTimeout = p.findInt("timeout", usingProxy?60:5);
   ```
   
* __finished__
   
   ```java
   public void finished() {
   if (reuse) /* will be reused */
   return;
   keepAliveConnections--;
   poster = null;
   if (keepAliveConnections > 0 && isKeepingAlive() &&
  !(serverOutput.checkError())) {
   /* This connection is keepingAlive && still valid.
* Return it to the cache.
*/
   putInKeepAliveCache();
   } else {
   closeServer();
   }
   }
   ```


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

For queries about this service, please contact Infrastructure at:
us...@infra.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 11.0.0-M10

2023-08-08 Thread Han Li



> On Aug 9, 2023, at 02:18, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M10 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M10 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Refactor HTTP/2 implementation to reduce pinning when using virtual
>  threads.
> 
> - Pass through ciphers referring to an OpenSSL profile, such as
>  PROFILE=SYSTEM instead of producing an error trying to parse it.
> 
> - Update Tomcat Native to 2.0.5.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M10/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1447
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M10
> 06d0e42e6cd70aae860f164c27d16bdfdfcdc496
> 
> 
> The proposed 11.0.0-M10 release is:
> [ ] -1 Broken - do not release
> [ X] +1 Alpha  - go ahead and release as 11.0.0-M10
Tests pass.

Does Tomcat Native 2.0.5 haven’t been released ?. I can’t download from the 
official website.
https://tomcat.apache.org/download-native.cgi 


Han
> 
> -
> 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: Next is 9.0.80

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 22f1eea86c Next is 9.0.80
22f1eea86c is described below

commit 22f1eea86c64b74976bf8474587ed5eaef4695e2
Author: remm 
AuthorDate: Tue Aug 8 23:50:15 2023 +0200

Next is 9.0.80
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 9018216a40..6199f8189f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=79
+version.build=80
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 6fb3e602ba..3e96ddd13b 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.79
+maven.asf.release.deploy.version=9.0.80
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 895c26e3d1..f9cb5c0b4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

[VOTE] Release Apache Tomcat 9.0.79

2023-08-08 Thread Rémy Maucherat

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

The notable changes compared to 9.0.78 are:

- Refactor HTTP/2 implementation to reduce pinning when using virtual
   threads.

- Pass through ciphers referring to an OpenSSL profile, such as
   PROFILE=SYSTEM instead of producing an error trying to parse it.

- Update Tomcat Native to 2.0.5.

Along with lots of other bug fixes and improvements.

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.79/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1449
The tag is:
https://github.com/apache/tomcat/tree/9.0.79
a4bbc1f1676932460f993653c04ec43a1e9e8c88

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

Rémy

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

svn commit: r63400 - in /dev/tomcat/tomcat-9/v9.0.79: ./ bin/ bin/embed/ src/

2023-08-08 Thread remm

Author: remm
Date: Tue Aug  8 21:43:06 2023
New Revision: 63400

Log:
Upload 9.0.79 for voting

Added:
dev/tomcat/tomcat-9/v9.0.79/
dev/tomcat/tomcat-9/v9.0.79/KEYS
dev/tomcat/tomcat-9/v9.0.79/README.html
dev/tomcat/tomcat-9/v9.0.79/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.79/bin/
dev/tomcat/tomcat-9/v9.0.79/bin/README.html
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.tar.gz.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-fulldocs.tar.gz.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x64.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x86.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.exe   (with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.exe.asc   (with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.exe.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.zip   (with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.zip.asc   (with props)
dev/tomcat/tomcat-9/v9.0.79/bin/apache-tomcat-9.0.79.zip.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/embed/
dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.tar.gz.asc 
  (with props)

dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.79/bin/embed/apache-tomcat-9.0.79-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.79/src/
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.zip.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.79/src/apache-tomcat-9.0.79-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.79/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.79/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.79/KEYS Tue Aug  8 21:43:06 2023
@@ -0,0 +1,237 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   1024D/33C60243 2004-09-12
+  Key fingerprint = DCFD 35E0 BF8C A734 4752  DE8B 6FB2 1E89 33C6 0243
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+sub   2048g/0BECE548 2004-09-12
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.9 (MingW32)
+
+mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL
+rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw
+4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u
+k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON
+tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefVdq

[tomcat] 01/01: Tag 9.0.79

2023-08-08 Thread remm

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

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

commit a4bbc1f1676932460f993653c04ec43a1e9e8c88
Author: remm 
AuthorDate: Tue Aug 8 22:52:05 2023 +0200

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

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..e3d6dbeb7b
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-08-08T20:41:26Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on January 18 2023
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.20+8
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Linux 6.4.7-200.fc38.x86_64
+# File encoding:   UTF-8
+#
+# Release Manager: remm
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..4af54ec814
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..7ec00efc9a
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..00e764051c
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=9.0.79
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# Set the user name to use to upload the artefacts to Nexus.

[tomcat] tag 9.0.79 created (now a4bbc1f167)

2023-08-08 Thread remm

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

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


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

 new a4bbc1f167 Tag 9.0.79

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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

[VOTE] Release Apache Tomcat 10.1.12

2023-08-08 Thread Mark Thomas


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

The notable changes compared to 10.1.11 are:

- Refactor HTTP/2 implementation to reduce pinning when using virtual
  threads.

- Pass through ciphers referring to an OpenSSL profile, such as
  PROFILE=SYSTEM instead of producing an error trying to parse it.

- Update Tomcat Native to 2.0.5.

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.12/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.12
fb24d1d6525c774f27c3f711c52790552ee389ee

The proposed 10.1.12 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.1.12

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

Re: [VOTE] Release Apache Tomcat 11.0.0-M10

2023-08-08 Thread Mark Thomas


On 08/08/2023 19:18, Mark Thomas wrote:


The proposed 11.0.0-M10 release is:
[ ] -1 Broken - do not release
[X] +1 Alpha  - go ahead and release as 11.0.0-M10


Unit tests pass with Tomcat Native 2.0.5 on Linux, Windows, macOS M1 and 
macOS Intel.


Mark

-
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: Increment version for next release

2023-08-08 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 952cd784da Increment version for next release
952cd784da is described below

commit 952cd784daba39f38a39efa63531c01679231368
Author: Mark Thomas 
AuthorDate: Tue Aug 8 20:49:12 2023 +0100

Increment version for next release
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 15b3cb2ad0..b7582b230a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=1
-version.build=12
+version.build=13
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 9f239f0360..b790893857 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.12
+maven.asf.release.deploy.version=10.1.13
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6775229c95..5de9e9642d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

svn commit: r63398 - in /dev/tomcat/tomcat-10/v10.1.12: ./ bin/ bin/embed/ src/

2023-08-08 Thread markt

Author: markt
Date: Tue Aug  8 19:48:58 2023
New Revision: 63398

Log:
Upload 10.1.12 for voting

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

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

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

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

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

dev/tomcat/tomcat-10/v10.1.12/bin/embed/apache-tomcat-10.1.12-embed.tar.gz.asc

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

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

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

[tomcat] 01/01: tag 10.1.12

2023-08-08 Thread markt

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

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

commit fb24d1d6525c774f27c3f711c52790552ee389ee
Author: Mark Thomas 
AuthorDate: Tue Aug 8 20:29:32 2023 +0100

tag 10.1.12
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10253 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10253 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..2b46b03853
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-08-08T19:16:13Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Oracle Corporation
+# Java Version:21-ea+29-2411
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   UTF-8
+#
+# Release Manager: markt
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..468e6b68d5
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..0b3d0b53a4
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..bd556bb053
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.1.12
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Set

[tomcat] tag 10.1.12 created (now fb24d1d652)

2023-08-08 Thread markt

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

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


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

 new fb24d1d652 tag 10.1.12

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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

[tomcat] branch 10.1.x updated: Temporary change in release manager

2023-08-08 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 a40a60d355 Temporary change in release manager
a40a60d355 is described below

commit a40a60d35509692b6a3597683a21bf697d7d7a45
Author: Mark Thomas 
AuthorDate: Tue Aug 8 19:19:42 2023 +0100

Temporary change in release manager
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 49d56867c9..6775229c95 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[VOTE] Release Apache Tomcat 11.0.0-M10

2023-08-08 Thread Mark Thomas


The proposed Apache Tomcat 11.0.0-M10 release is now available for
voting.

Apache Tomcat 11.0.0-M10 is a milestone release of the 11.0.x branch and 
has been made to provide users with early access to the new features in 
Apache Tomcat 11.0.x so that they may provide feedback. The notable 
changes compared to the previous milestone include:


- Refactor HTTP/2 implementation to reduce pinning when using virtual
  threads.

- Pass through ciphers referring to an OpenSSL profile, such as
  PROFILE=SYSTEM instead of producing an error trying to parse it.

- Update Tomcat Native to 2.0.5.

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

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


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M10/

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

The tag is:
https://github.com/apache/tomcat/tree/11.0.0-M10
06d0e42e6cd70aae860f164c27d16bdfdfcdc496


The proposed 11.0.0-M10 release is:
[ ] -1 Broken - do not release
[ ] +1 Alpha  - go ahead and release as 11.0.0-M10

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

[tomcat] branch main updated: Increment version number for next release

2023-08-08 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 026b19fcc4 Increment version number for next release
026b19fcc4 is described below

commit 026b19fcc4cab5212e8f126bc8f1395dd5648585
Author: Mark Thomas 
AuthorDate: Tue Aug 8 19:13:21 2023 +0100

Increment version number for next release
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 224bac5948..7bcacbe8dd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=11
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M10
+version.suffix=-M11
 version.dev=-dev
 
 # - Build tools -
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 94795ac67f..bd50a12285 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=11.0.0-M10
+maven.asf.release.deploy.version=11.0.0-M11
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d453d4e3b4..046d1edfb8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

svn commit: r63393 - in /dev/tomcat/tomcat-11/v11.0.0-M10: ./ bin/ bin/embed/ src/

2023-08-08 Thread markt

Author: markt
Date: Tue Aug  8 18:13:07 2023
New Revision: 63393

Log:
Upload 11.0.0-M10 for voting

Added:
dev/tomcat/tomcat-11/v11.0.0-M10/
dev/tomcat/tomcat-11/v11.0.0-M10/KEYS
dev/tomcat/tomcat-11/v11.0.0-M10/README.html
dev/tomcat/tomcat-11/v11.0.0-M10/RELEASE-NOTES
dev/tomcat/tomcat-11/v11.0.0-M10/bin/
dev/tomcat/tomcat-11/v11.0.0-M10/bin/README.html

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.zip  
 (with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.zip.asc

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-deployer.zip.sha512

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-fulldocs.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-fulldocs.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-windows-x64.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-windows-x64.zip.asc

dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10-windows-x64.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.exe   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.exe.asc
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.exe.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.tar.gz.asc
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.zip   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.zip.asc
dev/tomcat/tomcat-11/v11.0.0-M10/bin/apache-tomcat-11.0.0-M10.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/

dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/apache-tomcat-11.0.0-M10-embed.tar.gz
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/apache-tomcat-11.0.0-M10-embed.tar.gz.asc

dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/apache-tomcat-11.0.0-M10-embed.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/apache-tomcat-11.0.0-M10-embed.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M10/bin/embed/apache-tomcat-11.0.0-M10-embed.zip.asc

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

dev/tomcat/tomcat-11/v11.0.0-M10/src/apache-tomcat-11.0.0-M10-src.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M10/src/apache-tomcat-11.0.0-M10-src.zip   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M10/src/apache-tomcat-11.0.0-M10-src.zip.asc
dev/tomcat/tomcat-11/v11.0.0-M10/src/apache-tomcat-11.0.0-M10-src.zip.sha512

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

[tomcat] 01/01: Tag 11.0.0-M10

2023-08-08 Thread markt

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

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

commit 06d0e42e6cd70aae860f164c27d16bdfdfcdc496
Author: Mark Thomas 
AuthorDate: Tue Aug 8 18:51:50 2023 +0100

Tag 11.0.0-M10
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10253 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10253 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..474338b6b8
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-08-08T17:40:09Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Oracle Corporation
+# Java Version:21-ea+29-2411
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   UTF-8
+#
+# Release Manager: markt
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..eb14f606b4
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..b28bb03d33
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..d174c209c7
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=11.0.0-M10
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+

[tomcat] tag 11.0.0-M10 created (now 06d0e42e6c)

2023-08-08 Thread markt

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

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


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

 new 06d0e42e6c Tag 11.0.0-M10

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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

[GitHub] [tomcat] markt-asf commented on pull request #644: Warn when non default ciphers are removed because the engine rejects them.

2023-08-08 Thread via GitHub



markt-asf commented on PR #644:
URL: https://github.com/apache/tomcat/pull/644#issuecomment-1669965294

   LGTM


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
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: Additional debug logging for intermittent test failure

2023-08-08 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 5736f39215 Additional debug logging for intermittent test failure
5736f39215 is described below

commit 5736f39215c519fac5781473fa51ed982b50a346
Author: Mark Thomas 
AuthorDate: Tue Aug 8 17:39:45 2023 +0100

Additional debug logging for intermittent test failure
---
 test/org/apache/catalina/core/TestAsyncContextImpl.java | 4 
 1 file changed, 4 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 14a10525ab..42c188e6d4 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -303,6 +303,10 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 result.append(req.isAsyncStarted());
 } catch (NullPointerException npe) {
 result.append("false");
+} catch (Throwable t) {
+// Additional debugging for intermittent test 
failure
+result.append(t.getClass().getName());
+t.printStackTrace();
 }
 done = true;
 } catch (InterruptedException | IOException e) {


-
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: Additional debug logging for intermittent test failure

2023-08-08 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 d3d2e63fe1 Additional debug logging for intermittent test failure
d3d2e63fe1 is described below

commit d3d2e63fe102ca65e88b4440df1d66d85a07ac9b
Author: Mark Thomas 
AuthorDate: Tue Aug 8 17:39:45 2023 +0100

Additional debug logging for intermittent test failure
---
 test/org/apache/catalina/core/TestAsyncContextImpl.java | 4 
 1 file changed, 4 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 762371cad3..cf96376c9a 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -303,6 +303,10 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 result.append(req.isAsyncStarted());
 } catch (NullPointerException npe) {
 result.append("false");
+} catch (Throwable t) {
+// Additional debugging for intermittent test 
failure
+result.append(t.getClass().getName());
+t.printStackTrace();
 }
 done = true;
 } catch (InterruptedException | IOException e) {


-
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: Additional debug logging for intermittent test failure

2023-08-08 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 a9e48f637e Additional debug logging for intermittent test failure
a9e48f637e is described below

commit a9e48f637eda16d1f298c666e69a4958d3c965ec
Author: Mark Thomas 
AuthorDate: Tue Aug 8 17:39:45 2023 +0100

Additional debug logging for intermittent test failure
---
 test/org/apache/catalina/core/TestAsyncContextImpl.java | 4 
 1 file changed, 4 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 79c22f3b7e..23f36dfb60 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -303,6 +303,10 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 result.append(req.isAsyncStarted());
 } catch (NullPointerException npe) {
 result.append("false");
+} catch (Throwable t) {
+// Additional debugging for intermittent test 
failure
+result.append(t.getClass().getName());
+t.printStackTrace();
 }
 done = true;
 } catch (InterruptedException | IOException e) {


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

[tomcat] branch main updated: Restore original test

2023-08-08 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 a53b1ba5a9 Restore original test
a53b1ba5a9 is described below

commit a53b1ba5a907019e91ac08b976f29b7714d771ef
Author: Mark Thomas 
AuthorDate: Tue Aug 8 17:41:48 2023 +0100

Restore original test
---
 test/org/apache/catalina/core/TestAsyncContextImpl.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 8158b4bca7..23f36dfb60 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -123,12 +123,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 counter++;
 }
 
-String result = servlet.getResult();
-Assert.assertTrue(result.startsWith("1false2true3true4true5"));
-
-result = result.substring(22);
-// Should be "false" (or possibly "") at this point. Must not be 
"true".
-Assert.assertNotEquals("true", servlet.getResult());
+Assert.assertEquals("1false2true3true4true5false", 
servlet.getResult());
 
 // Check the access log
 alv.validateAccessLog(1, 200, Bug49528Servlet.THREAD_SLEEP_TIME,


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

[tomcat] branch main updated: Additional debug logging for intermittent test failure

2023-08-08 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 1f0d5cb018 Additional debug logging for intermittent test failure
1f0d5cb018 is described below

commit 1f0d5cb01892442cb68f067a74093c988ecbc48e
Author: Mark Thomas 
AuthorDate: Tue Aug 8 17:39:45 2023 +0100

Additional debug logging for intermittent test failure
---
 test/org/apache/catalina/core/TestAsyncContextImpl.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 79c22f3b7e..8158b4bca7 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -123,7 +123,12 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 counter++;
 }
 
-Assert.assertEquals("1false2true3true4true5false", 
servlet.getResult());
+String result = servlet.getResult();
+Assert.assertTrue(result.startsWith("1false2true3true4true5"));
+
+result = result.substring(22);
+// Should be "false" (or possibly "") at this point. Must not be 
"true".
+Assert.assertNotEquals("true", servlet.getResult());
 
 // Check the access log
 alv.validateAccessLog(1, 200, Bug49528Servlet.THREAD_SLEEP_TIME,
@@ -303,6 +308,10 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 result.append(req.isAsyncStarted());
 } catch (NullPointerException npe) {
 result.append("false");
+} catch (Throwable t) {
+// Additional debugging for intermittent test 
failure
+result.append(t.getClass().getName());
+t.printStackTrace();
 }
 done = true;
 } catch (InterruptedException | IOException e) {


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

Re: [tomcat-native] branch main updated: Remove unused libraries and add support for 'Hybrid CRT' technique.

2023-08-08 Thread Mladen Turk





On 8/8/23 18:00, Mark Thomas wrote:

On 08/08/2023 16:57, Mladen Turk wrote:




Produced binary depends only on the Universal CRT, but not
on VCRuntime, so no redist packages are needed.


Excellent! That is really good news.

I'll try this once I have got the August release round out of the way.



I have few scripts that can help to setup
the build environment:

https://github.com/mturk/xbuildutils

Will try to document that better trough the summer,
but one can check the .bat files and try to
figure out the comments :)

Regards
--
^TM

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

Re: [tomcat-native] branch main updated: Remove unused libraries and add support for 'Hybrid CRT' technique.

2023-08-08 Thread Mark Thomas


On 08/08/2023 16:57, Mladen Turk wrote:



On 8/8/23 15:29, Mark Thomas wrote:

On 08/08/2023 13:27, mt...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new 12666aa60 Remove unused libraries and add support for 
'Hybrid CRT' technique.


This all looks interesting. What does this mean for the build 
environment?


Do we still need to build with your CMSC bundle?



Nope.
Thats the idea to move forward.

Best is to use the VisualStudio Build Tools.
I've build apr-1.7.4 and openssl-3.0.10 using STATIC_CRT=Hybrid
and VisualStudio 2022.

No need to patch openssl because of /MD /MT issue.

Produced binary depends only on the Universal CRT, but not
on VCRuntime, so no redist packages are needed.


Excellent! That is really good news.

I'll try this once I have got the August release round out of the way.

Mark

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

Re: [tomcat-native] branch main updated: Remove unused libraries and add support for 'Hybrid CRT' technique.

2023-08-08 Thread Mladen Turk





On 8/8/23 15:29, Mark Thomas wrote:

On 08/08/2023 13:27, mt...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new 12666aa60 Remove unused libraries and add support for 
'Hybrid CRT' technique.


This all looks interesting. What does this mean for the build environment?

Do we still need to build with your CMSC bundle?



Nope.
Thats the idea to move forward.

Best is to use the VisualStudio Build Tools.
I've build apr-1.7.4 and openssl-3.0.10 using STATIC_CRT=Hybrid
and VisualStudio 2022.

No need to patch openssl because of /MD /MT issue.

Produced binary depends only on the Universal CRT, but not
on VCRuntime, so no redist packages are needed.

Regards
--
^TM

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

[GitHub] [tomcat] markt-asf commented on a diff in pull request #644: Warn when non default ciphers are removed because the engine rejects them.

2023-08-08 Thread via GitHub



markt-asf commented on code in PR #644:
URL: https://github.com/apache/tomcat/pull/644#discussion_r1287317502


##
java/org/apache/tomcat/util/net/SSLUtilBase.java:
##
@@ -122,6 +122,10 @@ protected SSLUtilBase(SSLHostConfigCertificate 
certificate, boolean warnTls13) {
 
sslHostConfig.setTls13RenegotiationAvailable(isTls13RenegAuthAvailable());
 
 // Calculate the enabled ciphers
+boolean warnOnSkip = true;
+if 
(sslHostConfig.getCiphers().equals(sslHostConfig.DEFAULT_TLS_CIPHERS)) {
+warnOnSkip = false;
+}

Review Comment:
   `boolean warnOnSkip = 
!sslHostConfig.getCiphers().equals(sslHostConfig.DEFAULT_TLS_CIPHERS);`
   
   And move this inside the block where it is used.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
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: Back-port additional test from 9.0.x

2023-08-08 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 6dff6f36f9 Back-port additional test from 9.0.x
6dff6f36f9 is described below

commit 6dff6f36f9864632539148683beb6e2aca8e2985
Author: Mark Thomas 
AuthorDate: Tue Aug 8 16:44:32 2023 +0100

Back-port additional test from 9.0.x
---
 .../coyote/http2/TestHttp2ConnectionTimeouts.java  | 37 ++
 1 file changed, 37 insertions(+)

diff --git a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java 
b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
new file mode 100644
index 00..c18fa3b1b6
--- /dev/null
+++ b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
@@ -0,0 +1,37 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.coyote.http2;
+
+import org.junit.Test;
+
+public class TestHttp2ConnectionTimeouts extends Http2TestBase {
+
+@Test
+public void testConnectionTimeout() throws Exception {
+
+// Reduce default timeouts so test completes sooner
+enableHttp2(200, false, 5000, 5000, 1, 5000, 5000);
+configureAndStartWebApplication();
+openClientConnection(false);
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+// Wait for timeout - should receive GoAway frame
+handleGoAwayResponse(1, Http2Error.NO_ERROR);
+}
+}


-
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: Use standard GoAway handling for intermittent Windows NIO2 issues

2023-08-08 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 22c7bbcb50 Use standard GoAway handling for intermittent Windows NIO2 
issues
22c7bbcb50 is described below

commit 22c7bbcb50320ce9fe56aec525f888f500f1022e
Author: Mark Thomas 
AuthorDate: Tue Aug 8 16:33:54 2023 +0100

Use standard GoAway handling for intermittent Windows NIO2 issues
---
 test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java 
b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
index 5f1970daaf..c18fa3b1b6 100644
--- a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
+++ b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.http2;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 public class TestHttp2ConnectionTimeouts extends Http2TestBase {
@@ -33,8 +32,6 @@ public class TestHttp2ConnectionTimeouts extends 
Http2TestBase {
 validateHttp2InitialResponse();
 
 // Wait for timeout - should receive GoAway frame
-parser.readFrame();
-
-Assert.assertEquals("0-Goaway-[1]-[0]-[null]", output.getTrace());
+handleGoAwayResponse(1, Http2Error.NO_ERROR);
 }
 }


-
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: Use standard GoAway handling for intermittent Windows NIO2 issues

2023-08-08 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 b201577f56 Use standard GoAway handling for intermittent Windows NIO2 
issues
b201577f56 is described below

commit b201577f56ccc9d73ab403c8ba8c747498bc34d9
Author: Mark Thomas 
AuthorDate: Tue Aug 8 16:33:54 2023 +0100

Use standard GoAway handling for intermittent Windows NIO2 issues
---
 test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java 
b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
index 5f1970daaf..c18fa3b1b6 100644
--- a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
+++ b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.http2;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 public class TestHttp2ConnectionTimeouts extends Http2TestBase {
@@ -33,8 +32,6 @@ public class TestHttp2ConnectionTimeouts extends 
Http2TestBase {
 validateHttp2InitialResponse();
 
 // Wait for timeout - should receive GoAway frame
-parser.readFrame();
-
-Assert.assertEquals("0-Goaway-[1]-[0]-[null]", output.getTrace());
+handleGoAwayResponse(1, Http2Error.NO_ERROR);
 }
 }


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

[tomcat] branch main updated: Use standard GoAway handling for intermittent Windows NIO2 issues

2023-08-08 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 c78d895c51 Use standard GoAway handling for intermittent Windows NIO2 
issues
c78d895c51 is described below

commit c78d895c5143cbd108d804d5f0aecef954f0a85f
Author: Mark Thomas 
AuthorDate: Tue Aug 8 16:33:54 2023 +0100

Use standard GoAway handling for intermittent Windows NIO2 issues
---
 test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java 
b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
index 5f1970daaf..c18fa3b1b6 100644
--- a/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
+++ b/test/org/apache/coyote/http2/TestHttp2ConnectionTimeouts.java
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.http2;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 public class TestHttp2ConnectionTimeouts extends Http2TestBase {
@@ -33,8 +32,6 @@ public class TestHttp2ConnectionTimeouts extends 
Http2TestBase {
 validateHttp2InitialResponse();
 
 // Wait for timeout - should receive GoAway frame
-parser.readFrame();
-
-Assert.assertEquals("0-Goaway-[1]-[0]-[null]", output.getTrace());
+handleGoAwayResponse(1, Http2Error.NO_ERROR);
 }
 }


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

[GitHub] [tomcat] jfclere opened a new pull request, #644: Warn when non default ciphers are removed because the engine rejects them.

2023-08-08 Thread via GitHub



jfclere opened a new pull request, #644:
URL: https://github.com/apache/tomcat/pull/644

   When using nmap --script ssl-enum-ciphers -p port host
   the ciphers proposed are often a small subset of the expect ones.
   A warning helps to see what is rejected.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[tomcat] branch main updated: Add information on deprecation resolution

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/main by this push:
 new c2555a91df Add information on deprecation resolution
c2555a91df is described below

commit c2555a91df194a909e98660ce7320026974c2cf4
Author: remm 
AuthorDate: Tue Aug 8 16:39:56 2023 +0200

Add information on deprecation resolution

All the code was translated from tomcat-native, which in turn came from
mod_ssl. This revision has the resolution for all the deprecation issues
for OpenSSL 3.0 (which should then become the minimum supported version
given the Panama Java 22+ schedule).
---
 .../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index 9ed7f76f2d..43da3c13c9 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -39,6 +39,8 @@ import org.apache.tomcat.util.res.StringManager;
  * configuration parameters.
  * Using this from a listener is completely optional, but is needed for
  * configuration and full cleanup of a few native memory allocations.
+ * FIXME: OpenSSL 3 deprecation resolutions for the equivalent code:
+ * https://svn.apache.org/viewvc?view=revision=1908537
  */
 public class OpenSSLLibrary {
 


-
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-08 Thread buildbot

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


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Re: [tomcat-native] branch main updated: Remove unused libraries and add support for 'Hybrid CRT' technique.

2023-08-08 Thread Mark Thomas


On 08/08/2023 13:27, mt...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new 12666aa60 Remove unused libraries and add support for 'Hybrid CRT' 
technique.


This all looks interesting. What does this mean for the build environment?

Do we still need to build with your CMSC bundle?

Can we now build with Visual Stdio (which version / versions?) and not 
introduce any dependencies on additional runtimes that are not present 
on a default, clean OS install?


Which Windows OSes will this target?

Sorry for the barrage of questions but C compilation is still largely a 
mystery to me.


Mark



12666aa60 is described below

commit 12666aa60e62f926423bf6c0305891a7b2ff2365
Author: Mladen Turk 
AuthorDate: Tue Aug 8 14:27:13 2023 +0200

 Remove unused libraries and add support for 'Hybrid CRT' technique.
---
  native/NMAKEmakefile | 54 
  1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index 224d1352a..51653caf5 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -18,9 +18,10 @@
  # NMAKEmakefile   Tomcat Native makefile.
  # Usage:
  # APR_DECLARE_STATIC=1  Use static version of the APR
-# ENABLE_OCSP=1Enable OpenSSL OCSP code
+# ENABLE_OCSP=1 Enable OpenSSL OCSP code
  # OPENSSL_NEW_LIBS=1Use new OpenSSL lib file names
-# DEBUG=1  Build DEBUG version of TCN
+# DEBUG=1   Build DEBUG version of TCN
+# STATIC_CRT=Hybrid Build using the 'Hybrid CRT' technique
  #
  # Originally contributed by Mladen Turk 
  #
@@ -69,16 +70,16 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
  LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
  !ENDIF
  
-LFLAGS = $(LFLAGS) /version:1.1

-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib 
ole32.lib
-LFLAGS = $(LFLAGS) $(APR_LIB)
+LFLAGS = $(LFLAGS) /version:2.0
+LIBS = $(LIBS) user32.lib gdi32.lib $(APR_LIB)
  !IF DEFINED(WITH_FIPS)
-LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib 
/NODEFAULTLIB:LIBCMT
+LIBS = $(LIBS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
+LFLAGS = $(LFLAGS) /NODEFAULTLIB:LIBCMT
  !ELSE
  !IF DEFINED(OPENSSL_NEW_LIBS)
-LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib
+LIBS = $(LIBS) libssl.lib libcrypto.lib crypt32.lib
  !ELSE
-LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+LIBS = $(LIBS) libeay32.lib ssleay32.lib
  !ENDIF
  !ENDIF
  
@@ -86,7 +87,7 @@ CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA

-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_SSL_SET_STATE=1
  
  
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src

+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
  OBJECTS = \
$(WORKDIR)\bb.obj \
$(WORKDIR)\error.obj \
@@ -96,7 +97,8 @@ OBJECTS = \
$(WORKDIR)\sslcontext.obj \
$(WORKDIR)\sslconf.obj \
$(WORKDIR)\sslutils.obj \
-$(WORKDIR)\system.obj
+   $(WORKDIR)\system.obj
+
  !IF DEFINED(WITH_FIPS)
  OBJECTS = $(OBJECTS) srclib\openssl\tmp32\fips_premain.obj
  !ENDIF
@@ -108,24 +110,14 @@ LINK_WRAPPER = perl $(FIPSDIR)\bin\fipslink.pl
  LINK_WRAPPER = $(LINK)
  !ENDIF
  
-HEADERS = \

-   $(SRCDIR)\include\tcn.h \
-   $(SRCDIR)\include\tcn_api.h \
-   $(SRCDIR)\include\tcn_version.h \
-   $(SRCDIR)\include\ssl_private.h
-
  BUILDLIB = $(PREFIX)\lib
  BUILDBIN = $(WORKDIR)\$(PROJECT).dll
  BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
  BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
  
  all : $(WORKDIR) $(BUILDBIN)
  
-$(BUILDLIB) :

-   @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(WORKDIR) :
+$(WORKDIR):
@$(MAKEWORKDIR)
  
  {$(SRCDIR)\src}.c{$(WORKDIR)}.obj:

@@ -134,27 +126,23 @@ $(WORKDIR) :
  {$(SRCDIR)\os\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
  
-$(OBJECTS): $(HEADERS)

-
-$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc $(HEADERS)
-   $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES) 
$(SRCDIR)\os\win32\libtcnative.rc
+$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc
+   $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES) $**
  
-$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)

+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
SET FIPSLINK=perl $(FIPSDIR)\bin\fipslink.pl
SET FIPS_LINK=$(LINK)
SET FIPS_CC=$(CC)
SET FIPS_CC_ARGS=/Fosrclib\openssl\tmp32\fips_premain.obj /MD -c
-  SET PREMAIN_DSO_EXE=srclib\openssl\\out32\fips_premain_dso.exe
+  SET PREMAIN_DSO_EXE=srclib\openssl\out32\fips_premain_dso.exe
SET FIPS_TARGET=$(BUILDBIN)
SET

[tomcat] branch 8.5.x updated: Align with 9.0.x onwards

2023-08-08 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 cae270d2a3 Align with 9.0.x onwards
cae270d2a3 is described below

commit cae270d2a3a7381943848efc7959ec5b8e475d0e
Author: Mark Thomas 
AuthorDate: Tue Aug 8 14:25:58 2023 +0100

Align with 9.0.x onwards
---
 java/org/apache/catalina/ha/ClusterRuleSet.java|   5 -
 .../apache/catalina/ha/backend/CollectedInfo.java  |  24 +++--
 .../catalina/ha/backend/HeartbeatListener.java | 119 +++--
 .../catalina/ha/backend/MultiCastSender.java   |   2 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |   6 +-
 .../catalina/ha/deploy/FileMessageFactory.java |   3 +
 .../catalina/ha/deploy/LocalStrings.properties |   3 +-
 .../catalina/ha/deploy/LocalStrings_fr.properties  |   2 +
 .../catalina/ha/deploy/LocalStrings_ja.properties  |   2 +
 .../catalina/ha/deploy/LocalStrings_ko.properties  |   2 +
 .../ha/deploy/LocalStrings_zh_CN.properties|   2 +
 .../ha/session/ClusterSessionListener.java |   2 +-
 .../apache/catalina/ha/session/DeltaManager.java   |   7 ++
 .../apache/catalina/ha/session/DeltaSession.java   |   2 +-
 .../catalina/ha/tcp/LocalStrings_es.properties |   1 -
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  23 ++--
 java/org/apache/catalina/util/ToStringUtil.java|  62 +++
 17 files changed, 221 insertions(+), 46 deletions(-)

diff --git a/java/org/apache/catalina/ha/ClusterRuleSet.java 
b/java/org/apache/catalina/ha/ClusterRuleSet.java
index 8aed8fefff..a24ed5f29e 100644
--- a/java/org/apache/catalina/ha/ClusterRuleSet.java
+++ b/java/org/apache/catalina/ha/ClusterRuleSet.java
@@ -16,11 +16,9 @@
  */
 package org.apache.catalina.ha;
 
-
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomcat.util.digester.RuleSetBase;
 
-
 /**
  * 
  * RuleSet for processing the contents of a Cluster 
definition element.
@@ -48,9 +46,7 @@ public class ClusterRuleSet extends RuleSetBase {
  * Construct an instance of this RuleSet with the default 
matching pattern prefix.
  */
 public ClusterRuleSet() {
-
 this("");
-
 }
 
 
@@ -60,7 +56,6 @@ public class ClusterRuleSet extends RuleSetBase {
  * @param prefix Prefix for matching pattern rules (including the trailing 
slash character)
  */
 public ClusterRuleSet(String prefix) {
-super();
 this.prefix = prefix;
 }
 
diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java 
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 235e161df1..ab2436717c 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -61,7 +61,13 @@ public class CollectedInfo {
 Set set = mBeanServer.queryMBeans(objectName, null);
 for (ObjectInstance oi : set) {
 objName = oi.getObjectName();
+String subtype = objName.getKeyProperty("subType");
+if (subtype != null && subtype.equals("SocketProperties")) {
+objName = null;
+continue;
+}
 String name = objName.getKeyProperty("name");
+name = name.replace("\"", "");
 
 // Example names:
 // ajp-nio-8009
@@ -71,18 +77,22 @@ public class CollectedInfo {
 String[] elenames = name.split("-");
 String sport = elenames[elenames.length - 1];
 iport = Integer.parseInt(sport);
-String[] shosts = elenames[1].split("%2F");
-shost = shosts[0];
+if (elenames.length == 4) {
+shost = elenames[2];
+}
 
 if (port == 0 && host == null) {
 break; /* Done: take the first one */
 }
-if (host == null && iport == port) {
-break; /* Only port done */
-}
-if (shost.compareTo(host) == 0) {
-break; /* Done port and host are the expected ones */
+if (iport == port) {
+if (host == null) {
+break; /* Done: return the first with the right port */
+} else if (shost != null && shost.compareTo(host) == 0) {
+break; /* Done port and host are the expected ones */
+}
 }
+objName = null;
+shost = null;
 }
 if (objName == null) {
 throw new Exception(sm.getString("collectedInfo.noConnector", 
host, Integer.valueOf(port)));
diff --git a/java/org/apache/catalina/ha/backend/HeartbeatListener.java 
b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
index de6dfcada4..8cd64304b3 100644
--- a/java/org/apache/catalina/ha/backend/HeartbeatListener.java
+++

[tomcat] branch main updated: Code-clean-up - formatting. No functional change.

2023-08-08 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 7094596844 Code-clean-up - formatting. No functional change.
7094596844 is described below

commit 70945968440bc5163f0e4db737cea59412722923
Author: Mark Thomas 
AuthorDate: Tue Aug 8 13:43:32 2023 +0100

Code-clean-up - formatting. No functional change.

Files missed when package was re-formatted
---
 java/org/apache/catalina/ha/CatalinaCluster.java   |  16 +-
 .../apache/catalina/ha/tcp/SendMessageData.java|  15 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   | 170 ++---
 3 files changed, 99 insertions(+), 102 deletions(-)

diff --git a/java/org/apache/catalina/ha/CatalinaCluster.java 
b/java/org/apache/catalina/ha/CatalinaCluster.java
index 7246d586d9..af53bbaca0 100644
--- a/java/org/apache/catalina/ha/CatalinaCluster.java
+++ b/java/org/apache/catalina/ha/CatalinaCluster.java
@@ -26,14 +26,14 @@ import org.apache.catalina.tribes.Member;
 
 
 /**
- * A CatalinaCluster interface allows to plug in and out the
- * different cluster implementations
+ * A CatalinaCluster interface allows to plug in and out the different 
cluster implementations
  */
 public interface CatalinaCluster extends Cluster {
 // - Instance Variables
 
 /**
  * Sends a message to all the members in the cluster
+ *
  * @param msg ClusterMessage
  */
 void send(ClusterMessage msg);
@@ -41,7 +41,7 @@ public interface CatalinaCluster extends Cluster {
 /**
  * Sends a message to a specific member in the cluster.
  *
- * @param msg ClusterMessage
+ * @param msg  ClusterMessage
  * @param dest Member
  */
 void send(ClusterMessage msg, Member dest);
@@ -49,8 +49,8 @@ public interface CatalinaCluster extends Cluster {
 /**
  * Sends a message with the specified sendOptions to a specific member in 
the cluster.
  *
- * @param msg ClusterMessage
- * @param dest Member
+ * @param msg ClusterMessage
+ * @param destMember
  * @param sendOptions sendOptions
  */
 void send(ClusterMessage msg, Member dest, int sendOptions);
@@ -87,15 +87,19 @@ public interface CatalinaCluster extends Cluster {
 
 /**
  * Get Manager
+ *
  * @param name The manager name
+ *
  * @return The manager
  */
 Manager getManager(String name);
 
 /**
  * Get a new cluster name for a manager.
- * @param name Override name (optional)
+ *
+ * @param nameOverride name (optional)
  * @param manager The manager
+ *
  * @return the manager name in the cluster
  */
 String getManagerName(String name, Manager manager);
diff --git a/java/org/apache/catalina/ha/tcp/SendMessageData.java 
b/java/org/apache/catalina/ha/tcp/SendMessageData.java
index 5f1fc12c30..12e3a54429 100644
--- a/java/org/apache/catalina/ha/tcp/SendMessageData.java
+++ b/java/org/apache/catalina/ha/tcp/SendMessageData.java
@@ -23,18 +23,17 @@ import org.apache.catalina.tribes.Member;
  */
 public class SendMessageData {
 
-private Object message ;
-private Member destination ;
-private Exception exception ;
+private Object message;
+private Member destination;
+private Exception exception;
 
 
 /**
- * @param message The message to send
+ * @param message The message to send
  * @param destination Member destination
- * @param exception Associated error
+ * @param exception   Associated error
  */
-public SendMessageData(Object message, Member destination,
-Exception exception) {
+public SendMessageData(Object message, Member destination, Exception 
exception) {
 super();
 this.message = message;
 this.destination = destination;
@@ -47,12 +46,14 @@ public class SendMessageData {
 public Member getDestination() {
 return destination;
 }
+
 /**
  * @return the exception.
  */
 public Exception getException() {
 return exception;
 }
+
 /**
  * @return the message.
  */
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java 
b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 3f01ebf0eb..a970df0d7e 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -58,17 +58,14 @@ import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
- * A Cluster  implementation using simple multicast. Responsible for
- * setting up a cluster and provides callers with a valid multicast
- * receiver/sender.
- *
- * FIXME wrote testcases
+ * A Cluster  implementation using simple multicast. Responsible for 
setting up a cluster and

[tomcat] 01/02: Improvements to formatting prior to running automated reformatting.

2023-08-08 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 30b2ff85901fea21e0208cfb01113348d00ad870
Author: Mark Thomas 
AuthorDate: Tue Aug 8 11:53:12 2023 +0100

Improvements to formatting prior to running automated reformatting.
---
 .../apache/catalina/ha/backend/CollectedInfo.java   | 10 +-
 .../apache/catalina/ha/session/DeltaManager.java| 21 +++--
 .../apache/catalina/ha/session/DeltaRequest.java|  3 ++-
 .../apache/catalina/ha/session/SessionMessage.java  | 18 +-
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java 
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 00c39ed365..5d34b07192 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -62,11 +62,11 @@ public class CollectedInfo {
 objName = oi.getObjectName();
 String name = objName.getKeyProperty("name");
 
-/* Name are:
- * http-8080
- * jk-10.33.144.3-8009
- * jk-jfcpc%2F10.33.144.3-8009
- */
+// Example names:
+// ajp-nio-8009
+// ajp-nio-127.0.0.1-8009
+// ajp-nio-0:0:0:0:0:0:0:1-8009
+// ajp-nio-10.36.116.209-8009
 String [] elenames = name.split("-");
 String sport = elenames[elenames.length-1];
 iport = Integer.parseInt(sport);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 403a7e9711..d796c4cadf 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -43,10 +43,10 @@ import org.apache.tomcat.util.res.StringManager;
  * The DeltaManager manages replicated sessions by only replicating the deltas
  * in data. For applications written to handle this, the DeltaManager is the
  * optimal way of replicating data.
- *
+ * 
  * This code is almost identical to StandardManager with a difference in how it
  * persists sessions and some modifications to it.
- *
+ * 
  * IMPLEMENTATION NOTE : Correct behavior of session storing and
  * reloading depends upon external calls to the start() and
  * stop() methods of this class at the correct times.
@@ -660,7 +660,9 @@ public class DeltaManager extends ClusterManagerBase{
 
 /**
  * Load sessions from other cluster node.
+ * 
  * FIXME replace currently sessions with same id without notification.
+ * 
  * FIXME SSO handling is not really correct with the session replacement!
  * @param data Serialized data
  * @exception ClassNotFoundException
@@ -1395,10 +1397,9 @@ public class DeltaManager extends ClusterManagerBase{
 }
 
 /**
- * handle receive that other node want all sessions ( restart )
- * a) send all sessions with one message
- * b) send session at blocks
- * After sending send state is complete transferred
+ * Handle a get all sessions message from another node. Depending on 
{@link #sendAllSessions}, sessions are either
+ * sent in a single message or in batches. Sending is complete when this 
method exits.
+ *
  * @param msg Session message
  * @param sender Member which sent the message
  * @throws IOException IO error sending messages
@@ -1416,7 +1417,7 @@ public class DeltaManager extends ClusterManagerBase{
 if (isSendAllSessions()) {
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
-// send session at blocks
+// send sessions in batches
 int remain = currentSessions.length;
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
 int len = i + getSendAllSessionsSize() > 
currentSessions.length ?
@@ -1431,9 +1432,9 @@ public class DeltaManager extends ClusterManagerBase{
 Thread.sleep(getSendAllSessionsWaitTime());
 } catch (Exception sleep) {
 }
-}//end if
-}//for
-}//end if
+}
+}
+}
 
 SessionMessage newmsg = new SessionMessageImpl(name,
 SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null, 
"SESSION-STATE-TRANSFERRED",
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java 
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 4246f3397b..50d5095ce6 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -34,7 +34,8 @@ import org.apache.tomcat.util.res.StringManager;
  * This class is used to track the series of actions that happens when
  * a request is executed.

[tomcat] branch 8.5.x updated (493c208cc9 -> 3676295718)

2023-08-08 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 493c208cc9 Use parts size for maxParameterCount
 new 30b2ff8590 Improvements to formatting prior to running automated 
reformatting.
 new 3676295718 Code clean-up - formatting. No functional change.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/ha/CatalinaCluster.java   |  12 +-
 java/org/apache/catalina/ha/ClusterDeployer.java   |  56 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  45 +-
 java/org/apache/catalina/ha/ClusterManager.java| 131 +++--
 java/org/apache/catalina/ha/ClusterMessage.java|   4 +
 java/org/apache/catalina/ha/ClusterRuleSet.java| 178 +++---
 java/org/apache/catalina/ha/ClusterSession.java|  23 +-
 java/org/apache/catalina/ha/ClusterValve.java  |   9 +-
 .../ha/authenticator/ClusterSingleSignOn.java  |  68 ++-
 .../authenticator/ClusterSingleSignOnListener.java |   9 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  26 +-
 .../catalina/ha/backend/HeartbeatListener.java |  34 +-
 .../catalina/ha/backend/MultiCastSender.java   |   5 +-
 java/org/apache/catalina/ha/backend/Proxy.java |   4 +-
 java/org/apache/catalina/ha/backend/Sender.java|  31 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |  19 +-
 .../catalina/ha/context/ReplicatedContext.java |  78 +--
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |   2 +-
 .../catalina/ha/deploy/FileMessageFactory.java |   2 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   6 +-
 .../apache/catalina/ha/session/BackupManager.java  |  78 ++-
 .../catalina/ha/session/ClusterManagerBase.java|  50 +-
 .../ha/session/ClusterSessionListener.java |  41 +-
 .../apache/catalina/ha/session/DeltaManager.java   | 642 ++---
 .../apache/catalina/ha/session/DeltaRequest.java   | 152 +++--
 .../apache/catalina/ha/session/DeltaSession.java   | 298 --
 .../catalina/ha/session/JvmRouteBinderValve.java   | 174 +++---
 .../ha/session/ReplicatedSessionListener.java  |   5 +-
 .../apache/catalina/ha/session/SessionMessage.java |  47 +-
 .../catalina/ha/session/SessionMessageImpl.java| 118 ++--
 java/org/apache/catalina/ha/tcp/Constants.java |   3 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 261 -
 .../apache/catalina/ha/tcp/SendMessageData.java|  15 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   | 176 +++---
 34 files changed, 1333 insertions(+), 1469 deletions(-)


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

[tomcat] branch 9.0.x updated (78a5a7863e -> 594c530f7f)

2023-08-08 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 78a5a7863e Use parts size for maxParameterCount
 new 32dd0c6f1b Improvements to formatting prior to running autopmated 
reformatting.
 new 594c530f7f Code clean-up - formatting. No functional change.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/ha/CatalinaCluster.java   |  16 +-
 java/org/apache/catalina/ha/ClusterDeployer.java   |  56 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  45 +-
 java/org/apache/catalina/ha/ClusterManager.java| 131 +++--
 java/org/apache/catalina/ha/ClusterMessage.java|   4 +
 java/org/apache/catalina/ha/ClusterRuleSet.java| 202 +++
 java/org/apache/catalina/ha/ClusterSession.java|  23 +-
 java/org/apache/catalina/ha/ClusterValve.java  |   9 +-
 .../ha/authenticator/ClusterSingleSignOn.java  |  68 ++-
 .../authenticator/ClusterSingleSignOnListener.java |   9 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  25 +-
 .../catalina/ha/backend/HeartbeatListener.java |  54 +-
 .../catalina/ha/backend/MultiCastSender.java   |   5 +-
 java/org/apache/catalina/ha/backend/Proxy.java |   4 +-
 java/org/apache/catalina/ha/backend/Sender.java|  31 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |  19 +-
 .../catalina/ha/context/ReplicatedContext.java |  78 +--
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |   2 +-
 .../catalina/ha/deploy/FileMessageFactory.java |   2 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   6 +-
 .../apache/catalina/ha/session/BackupManager.java  |  81 ++-
 .../catalina/ha/session/ClusterManagerBase.java|  50 +-
 .../ha/session/ClusterSessionListener.java |  41 +-
 .../apache/catalina/ha/session/DeltaManager.java   | 646 ++---
 .../apache/catalina/ha/session/DeltaRequest.java   | 152 +++--
 .../apache/catalina/ha/session/DeltaSession.java   | 294 --
 .../catalina/ha/session/JvmRouteBinderValve.java   | 174 +++---
 .../ha/session/ReplicatedSessionListener.java  |   5 +-
 .../apache/catalina/ha/session/SessionMessage.java |  47 +-
 .../catalina/ha/session/SessionMessageImpl.java| 118 ++--
 java/org/apache/catalina/ha/tcp/Constants.java |   3 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 261 -
 .../apache/catalina/ha/tcp/SendMessageData.java|  15 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   | 170 +++---
 34 files changed, 1356 insertions(+), 1490 deletions(-)


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

[tomcat] 01/02: Improvements to formatting prior to running autopmated reformatting.

2023-08-08 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 32dd0c6f1b0554f651659517796d893601f888d9
Author: Mark Thomas 
AuthorDate: Tue Aug 8 11:53:12 2023 +0100

Improvements to formatting prior to running autopmated reformatting.
---
 .../apache/catalina/ha/backend/CollectedInfo.java   | 11 +--
 .../apache/catalina/ha/session/DeltaManager.java| 21 +++--
 .../apache/catalina/ha/session/DeltaRequest.java|  3 ++-
 .../apache/catalina/ha/session/SessionMessage.java  | 18 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java 
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 9fb046ddfb..8ca175acc3 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -68,12 +68,11 @@ public class CollectedInfo {
 String name = objName.getKeyProperty("name");
 name = name.replace("\"", "");
 
-/* Name are:
- * ajp-nio-8009
- * ajp-nio-127.0.0.1-8009
- * ajp-nio-0:0:0:0:0:0:0:1-8009
- * ajp-nio-10.36.116.209-8009
- */
+// Example names:
+// ajp-nio-8009
+// ajp-nio-127.0.0.1-8009
+// ajp-nio-0:0:0:0:0:0:0:1-8009
+// ajp-nio-10.36.116.209-8009
 String [] elenames = name.split("-");
 String sport = elenames[elenames.length-1];
 iport = Integer.parseInt(sport);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index e32415fd94..8dfd4c5991 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -44,10 +44,10 @@ import org.apache.tomcat.util.res.StringManager;
  * The DeltaManager manages replicated sessions by only replicating the deltas
  * in data. For applications written to handle this, the DeltaManager is the
  * optimal way of replicating data.
- *
+ * 
  * This code is almost identical to StandardManager with a difference in how it
  * persists sessions and some modifications to it.
- *
+ * 
  * IMPLEMENTATION NOTE : Correct behavior of session storing and
  * reloading depends upon external calls to the start() and
  * stop() methods of this class at the correct times.
@@ -661,7 +661,9 @@ public class DeltaManager extends ClusterManagerBase{
 
 /**
  * Load sessions from other cluster node.
+ * 
  * FIXME replace currently sessions with same id without notification.
+ * 
  * FIXME SSO handling is not really correct with the session replacement!
  * @param data Serialized data
  * @exception ClassNotFoundException
@@ -1396,10 +1398,9 @@ public class DeltaManager extends ClusterManagerBase{
 }
 
 /**
- * handle receive that other node want all sessions ( restart )
- * a) send all sessions with one message
- * b) send session at blocks
- * After sending send state is complete transferred
+ * Handle a get all sessions message from another node. Depending on 
{@link #sendAllSessions}, sessions are either
+ * sent in a single message or in batches. Sending is complete when this 
method exits.
+ *
  * @param msg Session message
  * @param sender Member which sent the message
  * @throws IOException IO error sending messages
@@ -1417,7 +1418,7 @@ public class DeltaManager extends ClusterManagerBase{
 if (isSendAllSessions()) {
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
-// send session at blocks
+// send sessions in batches
 int remain = currentSessions.length;
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
 int len = i + getSendAllSessionsSize() > 
currentSessions.length ?
@@ -1432,9 +1433,9 @@ public class DeltaManager extends ClusterManagerBase{
 Thread.sleep(getSendAllSessionsWaitTime());
 } catch (Exception sleep) {
 }
-}//end if
-}//for
-}//end if
+}
+}
+}
 
 SessionMessage newmsg = new SessionMessageImpl(name,
 SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null, 
"SESSION-STATE-TRANSFERRED",
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java 
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 4246f3397b..50d5095ce6 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -34,7 +34,8 @@ import org.apache.tomcat.util.res.StringManager;
  * This class is used to track the series of

[tomcat-native] branch main updated: Remove unused libraries and add support for 'Hybrid CRT' technique.

2023-08-08 Thread mturk

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 12666aa60 Remove unused libraries and add support for 'Hybrid CRT' 
technique.
12666aa60 is described below

commit 12666aa60e62f926423bf6c0305891a7b2ff2365
Author: Mladen Turk 
AuthorDate: Tue Aug 8 14:27:13 2023 +0200

Remove unused libraries and add support for 'Hybrid CRT' technique.
---
 native/NMAKEmakefile | 54 
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index 224d1352a..51653caf5 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -18,9 +18,10 @@
 # NMAKEmakefile   Tomcat Native makefile.
 # Usage:
 # APR_DECLARE_STATIC=1  Use static version of the APR
-# ENABLE_OCSP=1Enable OpenSSL OCSP code
+# ENABLE_OCSP=1 Enable OpenSSL OCSP code
 # OPENSSL_NEW_LIBS=1Use new OpenSSL lib file names
-# DEBUG=1  Build DEBUG version of TCN
+# DEBUG=1   Build DEBUG version of TCN
+# STATIC_CRT=Hybrid Build using the 'Hybrid CRT' technique
 #
 # Originally contributed by Mladen Turk 
 #
@@ -69,16 +70,16 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
 LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
 !ENDIF
 
-LFLAGS = $(LFLAGS) /version:1.1
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib 
ole32.lib
-LFLAGS = $(LFLAGS) $(APR_LIB)
+LFLAGS = $(LFLAGS) /version:2.0
+LIBS = $(LIBS) user32.lib gdi32.lib $(APR_LIB)
 !IF DEFINED(WITH_FIPS)
-LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib 
/NODEFAULTLIB:LIBCMT
+LIBS = $(LIBS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
+LFLAGS = $(LFLAGS) /NODEFAULTLIB:LIBCMT
 !ELSE
 !IF DEFINED(OPENSSL_NEW_LIBS)
-LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib
+LIBS = $(LIBS) libssl.lib libcrypto.lib crypt32.lib
 !ELSE
-LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib 
+LIBS = $(LIBS) libeay32.lib ssleay32.lib
 !ENDIF
 !ENDIF
 
@@ -86,7 +87,7 @@ CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 
-DOPENSSL_NO_IDEA
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_SSL_SET_STATE=1
 
 
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
 OBJECTS = \
$(WORKDIR)\bb.obj \
$(WORKDIR)\error.obj \
@@ -96,7 +97,8 @@ OBJECTS = \
$(WORKDIR)\sslcontext.obj \
$(WORKDIR)\sslconf.obj \
$(WORKDIR)\sslutils.obj \
-$(WORKDIR)\system.obj
+   $(WORKDIR)\system.obj
+
 !IF DEFINED(WITH_FIPS)
 OBJECTS = $(OBJECTS) srclib\openssl\tmp32\fips_premain.obj
 !ENDIF
@@ -108,24 +110,14 @@ LINK_WRAPPER = perl $(FIPSDIR)\bin\fipslink.pl
 LINK_WRAPPER = $(LINK)
 !ENDIF
 
-HEADERS = \
-   $(SRCDIR)\include\tcn.h \
-   $(SRCDIR)\include\tcn_api.h \
-   $(SRCDIR)\include\tcn_version.h \
-   $(SRCDIR)\include\ssl_private.h
-
 BUILDLIB = $(PREFIX)\lib
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
 BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
 
 all : $(WORKDIR) $(BUILDBIN)
 
-$(BUILDLIB) :
-   @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(WORKDIR) :
+$(WORKDIR):
@$(MAKEWORKDIR)
 
 {$(SRCDIR)\src}.c{$(WORKDIR)}.obj:
@@ -134,27 +126,23 @@ $(WORKDIR) :
 {$(SRCDIR)\os\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
 
-$(OBJECTS): $(HEADERS)
-
-$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc $(HEADERS)
-   $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES) 
$(SRCDIR)\os\win32\libtcnative.rc
+$(BUILDRES): $(SRCDIR)\os\win32\libtcnative.rc
+   $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES) $**
 
-$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
   SET FIPSLINK=perl $(FIPSDIR)\bin\fipslink.pl
   SET FIPS_LINK=$(LINK)
   SET FIPS_CC=$(CC)
   SET FIPS_CC_ARGS=/Fosrclib\openssl\tmp32\fips_premain.obj /MD -c
-  SET PREMAIN_DSO_EXE=srclib\openssl\\out32\fips_premain_dso.exe
+  SET PREMAIN_DSO_EXE=srclib\openssl\out32\fips_premain_dso.exe
   SET FIPS_TARGET=$(BUILDBIN)
   SET FIPS_SHA1_EXE=$(FIPSDIR)\bin\fips_standalone_sha1.exe
   SET FIPSLIB_D=$(FIPSDIR)\lib
-  $(LINK_WRAPPER) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) 
/pdb:$(BUILDPDB) $(FIPS_OPTS) /out:$(BUILDBIN)
-   IF EXIST $(BUILDMAN) \
-   mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+  $(LINK_WRAPPER) $(LFLAGS) $(LDIRS) $** $(LIBS) /pdb:$(BUILDPDB) $(FIPS_OPTS) 
/out:$(BUILDBIN)
 
 clean:
@$(CLEANTARGET)
 
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
-   @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
-   @xcopy "$(WORKDIR)\*.dll"

[tomcat] 01/02: Improvements to formatting prior to running autopmated reformatting.

2023-08-08 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 f4978e84491a01f42236690a1bd903878da6a116
Author: Mark Thomas 
AuthorDate: Tue Aug 8 11:53:12 2023 +0100

Improvements to formatting prior to running autopmated reformatting.
---
 .../apache/catalina/ha/backend/CollectedInfo.java   | 11 +--
 .../apache/catalina/ha/session/DeltaManager.java| 21 +++--
 .../apache/catalina/ha/session/DeltaRequest.java|  3 ++-
 .../apache/catalina/ha/session/SessionMessage.java  | 18 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java 
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 9fb046ddfb..8ca175acc3 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -68,12 +68,11 @@ public class CollectedInfo {
 String name = objName.getKeyProperty("name");
 name = name.replace("\"", "");
 
-/* Name are:
- * ajp-nio-8009
- * ajp-nio-127.0.0.1-8009
- * ajp-nio-0:0:0:0:0:0:0:1-8009
- * ajp-nio-10.36.116.209-8009
- */
+// Example names:
+// ajp-nio-8009
+// ajp-nio-127.0.0.1-8009
+// ajp-nio-0:0:0:0:0:0:0:1-8009
+// ajp-nio-10.36.116.209-8009
 String [] elenames = name.split("-");
 String sport = elenames[elenames.length-1];
 iport = Integer.parseInt(sport);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index ee41f8effe..3c778ef792 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -44,10 +44,10 @@ import org.apache.tomcat.util.res.StringManager;
  * The DeltaManager manages replicated sessions by only replicating the deltas
  * in data. For applications written to handle this, the DeltaManager is the
  * optimal way of replicating data.
- *
+ * 
  * This code is almost identical to StandardManager with a difference in how it
  * persists sessions and some modifications to it.
- *
+ * 
  * IMPLEMENTATION NOTE : Correct behavior of session storing and
  * reloading depends upon external calls to the start() and
  * stop() methods of this class at the correct times.
@@ -547,7 +547,9 @@ public class DeltaManager extends ClusterManagerBase{
 
 /**
  * Load sessions from other cluster node.
+ * 
  * FIXME replace currently sessions with same id without notification.
+ * 
  * FIXME SSO handling is not really correct with the session replacement!
  * @param data Serialized data
  * @exception ClassNotFoundException
@@ -1282,10 +1284,9 @@ public class DeltaManager extends ClusterManagerBase{
 }
 
 /**
- * handle receive that other node want all sessions ( restart )
- * a) send all sessions with one message
- * b) send session at blocks
- * After sending send state is complete transferred
+ * Handle a get all sessions message from another node. Depending on 
{@link #sendAllSessions}, sessions are either
+ * sent in a single message or in batches. Sending is complete when this 
method exits.
+ *
  * @param msg Session message
  * @param sender Member which sent the message
  * @throws IOException IO error sending messages
@@ -1303,7 +1304,7 @@ public class DeltaManager extends ClusterManagerBase{
 if (isSendAllSessions()) {
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
-// send session at blocks
+// send sessions in batches
 int remain = currentSessions.length;
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
 int len = i + getSendAllSessionsSize() > 
currentSessions.length ?
@@ -1318,9 +1319,9 @@ public class DeltaManager extends ClusterManagerBase{
 Thread.sleep(getSendAllSessionsWaitTime());
 } catch (Exception sleep) {
 }
-}//end if
-}//for
-}//end if
+}
+}
+}
 
 SessionMessage newmsg = new SessionMessageImpl(name,
 SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null, 
"SESSION-STATE-TRANSFERRED",
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java 
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 4246f3397b..50d5095ce6 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -34,7 +34,8 @@ import org.apache.tomcat.util.res.StringManager;
  * This class is used to track the series of

[tomcat] branch 10.1.x updated (9651c88542 -> a584fff596)

2023-08-08 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 9651c88542 Use parts size for maxParameterCount
 new f4978e8449 Improvements to formatting prior to running autopmated 
reformatting.
 new a584fff596 Code clean-up - formatting. No functional change.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/ha/CatalinaCluster.java   |  16 +-
 java/org/apache/catalina/ha/ClusterDeployer.java   |  56 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  45 +-
 java/org/apache/catalina/ha/ClusterManager.java| 131 ++---
 java/org/apache/catalina/ha/ClusterMessage.java|   4 +
 java/org/apache/catalina/ha/ClusterRuleSet.java| 202 +++
 java/org/apache/catalina/ha/ClusterSession.java|  23 +-
 java/org/apache/catalina/ha/ClusterValve.java  |   9 +-
 .../ha/authenticator/ClusterSingleSignOn.java  |  68 +--
 .../authenticator/ClusterSingleSignOnListener.java |   9 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  25 +-
 .../catalina/ha/backend/HeartbeatListener.java |  54 +-
 .../catalina/ha/backend/MultiCastSender.java   |   5 +-
 java/org/apache/catalina/ha/backend/Proxy.java |   4 +-
 java/org/apache/catalina/ha/backend/Sender.java|  31 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |  19 +-
 .../catalina/ha/context/ReplicatedContext.java |  78 +--
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |   2 +-
 .../catalina/ha/deploy/FileMessageFactory.java |   2 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   6 +-
 .../apache/catalina/ha/session/BackupManager.java  |  81 ++-
 .../catalina/ha/session/ClusterManagerBase.java|  50 +-
 .../ha/session/ClusterSessionListener.java |  41 +-
 .../apache/catalina/ha/session/DeltaManager.java   | 601 ++---
 .../apache/catalina/ha/session/DeltaRequest.java   | 152 +++---
 .../apache/catalina/ha/session/DeltaSession.java   | 294 +-
 .../catalina/ha/session/JvmRouteBinderValve.java   | 174 +++---
 .../ha/session/ReplicatedSessionListener.java  |   5 +-
 .../apache/catalina/ha/session/SessionMessage.java |  47 +-
 .../catalina/ha/session/SessionMessageImpl.java| 118 ++--
 java/org/apache/catalina/ha/tcp/Constants.java |   3 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 261 +
 .../apache/catalina/ha/tcp/SendMessageData.java|  15 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   | 170 +++---
 34 files changed, 1331 insertions(+), 1470 deletions(-)


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

[tomcat] branch main updated (c8ecf85eed -> 3a31cde6e7)

2023-08-08 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 c8ecf85eed Use parts size for maxParameterCount
 new 66f4c149a1 Improvements to formatting prior to running autopmated 
reformatting.
 new 3a31cde6e7 Code clean-up. Formatting. No functional change.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/ha/ClusterDeployer.java   |  56 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  45 +-
 java/org/apache/catalina/ha/ClusterManager.java| 131 ++---
 java/org/apache/catalina/ha/ClusterMessage.java|   4 +
 java/org/apache/catalina/ha/ClusterRuleSet.java| 202 +++
 java/org/apache/catalina/ha/ClusterSession.java|  23 +-
 java/org/apache/catalina/ha/ClusterValve.java  |   9 +-
 .../ha/authenticator/ClusterSingleSignOn.java  |  68 +--
 .../authenticator/ClusterSingleSignOnListener.java |   9 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  25 +-
 .../catalina/ha/backend/HeartbeatListener.java |  54 +-
 .../catalina/ha/backend/MultiCastSender.java   |   5 +-
 java/org/apache/catalina/ha/backend/Proxy.java |   4 +-
 java/org/apache/catalina/ha/backend/Sender.java|  31 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |  19 +-
 .../catalina/ha/context/ReplicatedContext.java |  78 +--
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |   2 +-
 .../catalina/ha/deploy/FileMessageFactory.java |   2 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   6 +-
 .../apache/catalina/ha/session/BackupManager.java  |  81 ++-
 .../catalina/ha/session/ClusterManagerBase.java|  50 +-
 .../ha/session/ClusterSessionListener.java |  41 +-
 .../apache/catalina/ha/session/DeltaManager.java   | 601 ++---
 .../apache/catalina/ha/session/DeltaRequest.java   | 152 +++---
 .../apache/catalina/ha/session/DeltaSession.java   | 294 +-
 .../catalina/ha/session/JvmRouteBinderValve.java   | 174 +++---
 .../ha/session/ReplicatedSessionListener.java  |   5 +-
 .../apache/catalina/ha/session/SessionMessage.java |  47 +-
 .../catalina/ha/session/SessionMessageImpl.java| 118 ++--
 java/org/apache/catalina/ha/tcp/Constants.java |   3 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 261 +
 31 files changed, 1232 insertions(+), 1368 deletions(-)


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

[tomcat] 01/02: Improvements to formatting prior to running autopmated reformatting.

2023-08-08 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 66f4c149a17f8f1e27a53526f8f0316d59618032
Author: Mark Thomas 
AuthorDate: Tue Aug 8 11:53:12 2023 +0100

Improvements to formatting prior to running autopmated reformatting.
---
 .../apache/catalina/ha/backend/CollectedInfo.java   | 11 +--
 .../apache/catalina/ha/session/DeltaManager.java| 21 +++--
 .../apache/catalina/ha/session/DeltaRequest.java|  3 ++-
 .../apache/catalina/ha/session/SessionMessage.java  | 18 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java 
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 9fb046ddfb..8ca175acc3 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -68,12 +68,11 @@ public class CollectedInfo {
 String name = objName.getKeyProperty("name");
 name = name.replace("\"", "");
 
-/* Name are:
- * ajp-nio-8009
- * ajp-nio-127.0.0.1-8009
- * ajp-nio-0:0:0:0:0:0:0:1-8009
- * ajp-nio-10.36.116.209-8009
- */
+// Example names:
+// ajp-nio-8009
+// ajp-nio-127.0.0.1-8009
+// ajp-nio-0:0:0:0:0:0:0:1-8009
+// ajp-nio-10.36.116.209-8009
 String [] elenames = name.split("-");
 String sport = elenames[elenames.length-1];
 iport = Integer.parseInt(sport);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index ee41f8effe..3c778ef792 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -44,10 +44,10 @@ import org.apache.tomcat.util.res.StringManager;
  * The DeltaManager manages replicated sessions by only replicating the deltas
  * in data. For applications written to handle this, the DeltaManager is the
  * optimal way of replicating data.
- *
+ * 
  * This code is almost identical to StandardManager with a difference in how it
  * persists sessions and some modifications to it.
- *
+ * 
  * IMPLEMENTATION NOTE : Correct behavior of session storing and
  * reloading depends upon external calls to the start() and
  * stop() methods of this class at the correct times.
@@ -547,7 +547,9 @@ public class DeltaManager extends ClusterManagerBase{
 
 /**
  * Load sessions from other cluster node.
+ * 
  * FIXME replace currently sessions with same id without notification.
+ * 
  * FIXME SSO handling is not really correct with the session replacement!
  * @param data Serialized data
  * @exception ClassNotFoundException
@@ -1282,10 +1284,9 @@ public class DeltaManager extends ClusterManagerBase{
 }
 
 /**
- * handle receive that other node want all sessions ( restart )
- * a) send all sessions with one message
- * b) send session at blocks
- * After sending send state is complete transferred
+ * Handle a get all sessions message from another node. Depending on 
{@link #sendAllSessions}, sessions are either
+ * sent in a single message or in batches. Sending is complete when this 
method exits.
+ *
  * @param msg Session message
  * @param sender Member which sent the message
  * @throws IOException IO error sending messages
@@ -1303,7 +1304,7 @@ public class DeltaManager extends ClusterManagerBase{
 if (isSendAllSessions()) {
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
-// send session at blocks
+// send sessions in batches
 int remain = currentSessions.length;
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
 int len = i + getSendAllSessionsSize() > 
currentSessions.length ?
@@ -1318,9 +1319,9 @@ public class DeltaManager extends ClusterManagerBase{
 Thread.sleep(getSendAllSessionsWaitTime());
 } catch (Exception sleep) {
 }
-}//end if
-}//for
-}//end if
+}
+}
+}
 
 SessionMessage newmsg = new SessionMessageImpl(name,
 SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null, 
"SESSION-STATE-TRANSFERRED",
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java 
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 4246f3397b..50d5095ce6 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -34,7 +34,8 @@ import org.apache.tomcat.util.res.StringManager;
  * This class is used to track the series of

[tomcat] branch 9.0.x updated: Use parts size for maxParameterCount

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 78a5a7863e Use parts size for maxParameterCount
78a5a7863e is described below

commit 78a5a7863e640e5746ef24a7db9d66657b04fb33
Author: remm 
AuthorDate: Tue Aug 8 13:23:35 2023 +0200

Use parts size for maxParameterCount

If parsing the parts first (which is usually not what happens), then the
parts count should affect maxParameterCount. Since the resource use of
parameters is small, allowing maxParameterCount parameters in addition
to the parts is not a noticeable issue. Parsing parameters first is
recommended though.
Report submitted by Matus Madzin.
---
 java/org/apache/catalina/connector/Request.java | 6 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 2a6934daa4..be6aed055f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3146,7 +3146,11 @@ public class Request implements HttpServletRequest {
 boolean success = false;
 try {
 // Set this every time in case limit has been changed via JMX
-parameters.setLimit(getConnector().getMaxParameterCount());
+int maxParameterCount = getConnector().getMaxParameterCount();
+if (parts != null && maxParameterCount > 0) {
+maxParameterCount -= parts.size();
+}
+parameters.setLimit(maxParameterCount);
 
 // getCharacterEncoding() may have been overridden to search for
 // hidden form field containing request encoding
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 832a9c63c0..895c26e3d1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,11 @@
 66822: Use the same naming format in log messages for
 Connector instances as the associated ProtocolHandler instance. (markt)
   
+  
+The parts count should also lower the actual
+maxParameterCount used for parsing parameters if parts are
+parsed first. (remm)
+  
 
   
   


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

[tomcat] branch 10.1.x updated: Use parts size for maxParameterCount

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 9651c88542 Use parts size for maxParameterCount
9651c88542 is described below

commit 9651c88542bed66f8c05bc95733f7c95f7c61cf3
Author: remm 
AuthorDate: Tue Aug 8 13:23:35 2023 +0200

Use parts size for maxParameterCount

If parsing the parts first (which is usually not what happens), then the
parts count should affect maxParameterCount. Since the resource use of
parameters is small, allowing maxParameterCount parameters in addition
to the parts is not a noticeable issue. Parsing parameters first is
recommended though.
Report submitted by Matus Madzin.
---
 java/org/apache/catalina/connector/Request.java | 6 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 784f271c4c..0f2ee5c046 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3087,7 +3087,11 @@ public class Request implements HttpServletRequest {
 boolean success = false;
 try {
 // Set this every time in case limit has been changed via JMX
-parameters.setLimit(getConnector().getMaxParameterCount());
+int maxParameterCount = getConnector().getMaxParameterCount();
+if (parts != null && maxParameterCount > 0) {
+maxParameterCount -= parts.size();
+}
+parameters.setLimit(maxParameterCount);
 
 // getCharacterEncoding() may have been overridden to search for
 // hidden form field containing request encoding
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a687302954..49d56867c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,11 @@
 66822: Use the same naming format in log messages for
 Connector instances as the associated ProtocolHandler instance. (markt)
   
+  
+The parts count should also lower the actual
+maxParameterCount used for parsing parameters if parts are
+parsed first. (remm)
+  
 
   
   


-
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: Use parts size for maxParameterCount

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 493c208cc9 Use parts size for maxParameterCount
493c208cc9 is described below

commit 493c208cc9fbb2eebc7096fb444a4def460143f4
Author: remm 
AuthorDate: Tue Aug 8 13:23:35 2023 +0200

Use parts size for maxParameterCount

If parsing the parts first (which is usually not what happens), then the
parts count should affect maxParameterCount. Since the resource use of
parameters is small, allowing maxParameterCount parameters in addition
to the parts is not a noticeable issue. Parsing parameters first is
recommended though.
Report submitted by Matus Madzin.
---
 java/org/apache/catalina/connector/Request.java | 6 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 276343415c..1adc04e392 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3161,7 +3161,11 @@ public class Request implements HttpServletRequest {
 boolean success = false;
 try {
 // Set this every time in case limit has been changed via JMX
-parameters.setLimit(getConnector().getMaxParameterCount());
+int maxParameterCount = getConnector().getMaxParameterCount();
+if (parts != null && maxParameterCount > 0) {
+maxParameterCount -= parts.size();
+}
+parameters.setLimit(maxParameterCount);
 
 // getCharacterEncoding() may have been overridden to search for
 // hidden form field containing request encoding
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 14854dcab1..2b5004c540 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,11 @@
 66822: Use the same naming format in log messages for
 Connector instances as the associated ProtocolHandler instance. (markt)
   
+  
+The parts count should also lower the actual
+maxParameterCount used for parsing parameters if parts are
+parsed first. (remm)
+  
 
   
   


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

[tomcat] branch main updated: Use parts size for maxParameterCount

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/main by this push:
 new c8ecf85eed Use parts size for maxParameterCount
c8ecf85eed is described below

commit c8ecf85eed4b395fdba34b73b9265d425058caa3
Author: remm 
AuthorDate: Tue Aug 8 13:23:35 2023 +0200

Use parts size for maxParameterCount

If parsing the parts first (which is usually not what happens), then the
parts count should affect maxParameterCount. Since the resource use of
parameters is small, allowing maxParameterCount parameters in addition
to the parts is not a noticeable issue. Parsing parameters first is
recommended though.
Report submitted by Matus Madzin.
---
 java/org/apache/catalina/connector/Request.java | 6 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 8094e7e565..4cea6996f1 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3045,7 +3045,11 @@ public class Request implements HttpServletRequest {
 boolean success = false;
 try {
 // Set this every time in case limit has been changed via JMX
-parameters.setLimit(getConnector().getMaxParameterCount());
+int maxParameterCount = getConnector().getMaxParameterCount();
+if (parts != null && maxParameterCount > 0) {
+maxParameterCount -= parts.size();
+}
+parameters.setLimit(maxParameterCount);
 
 // getCharacterEncoding() may have been overridden to search for
 // hidden form field containing request encoding
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e0d84c46fc..d453d4e3b4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,11 @@
 66822: Use the same naming format in log messages for
 Connector instances as the associated ProtocolHandler instance. (markt)
   
+  
+The parts count should also lower the actual
+maxParameterCount used for parsing parameters if parts are
+parsed first. (remm)
+  
 
   
   


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

[tomcat-native] branch main updated: Add STATIC_CRT=Hybrid compile time option that creates 'Hybrid CRT' technique which uses Universal CRT AND the static CRT

2023-08-08 Thread mturk

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

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


The following commit(s) were added to refs/heads/main by this push:
 new eb0e2be4b Add STATIC_CRT=Hybrid compile time option that creates 
'Hybrid CRT' technique which uses Universal CRT AND the static CRT
eb0e2be4b is described below

commit eb0e2be4b32aba66d6a7f1d010ade6fb772a3e61
Author: Mladen Turk 
AuthorDate: Tue Aug 8 12:32:40 2023 +0200

Add STATIC_CRT=Hybrid compile time option that creates 'Hybrid CRT' 
technique which uses Universal CRT AND the static CRT
---
 native/NMAKEmakefile.inc | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 2c641a5cc..2ed45329d 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -245,7 +245,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
 !ENDIF
 
 # Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib shell32.lib rpcrt4.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib shell32.lib rpcrt4.lib
 # Extra libs from command line or env
 !IF DEFINED(EXTRA_LIBS)
 LIBS = $(LIBS) $(EXTRA_LIBS)
@@ -265,6 +265,9 @@ COMMON_LFLAGS = /NOLOGO /MACHINE:$(MACHINE)
 OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
 !IF "$(BUILD)" == "RELEASE"
 OPT_LFLAGS = /OPT:REF $(OPT_LFLAGS)
+!IF DEFINED(STATIC_CRT) && "$(STATIC_CRT)" == "Hybrid"
+OPT_LFLAGS = $(OPT_LFLAGS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib
+!ENDIF
 !ENDIF
 
 !IF "$(TARGET)" == "EXE"


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

[tomcat-native] branch main updated: Add missing CFLAGS and RCFLAGS

2023-08-08 Thread mturk

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

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


The following commit(s) were added to refs/heads/main by this push:
 new fb5c82ecc Add missing CFLAGS and RCFLAGS
fb5c82ecc is described below

commit fb5c82ecc061e2b8c7bedea506812793599c5413
Author: Mladen Turk 
AuthorDate: Tue Aug 8 12:04:53 2023 +0200

Add missing CFLAGS and RCFLAGS
---
 native/NMAKEmakefile.inc | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 0b380b4ef..2c641a5cc 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -115,9 +115,13 @@ CPU=X86
 CPU=$(PROCESSOR_ARCHITEW6432)
 !ENDIF
 !ELSE
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+CPU=X64
+!ELSE
 CPU=$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
+!ENDIF
 
 !IF "$(CPU)" != "X86"
 !IF "$(CPU)" != "X64"
@@ -148,21 +152,17 @@ WINVER=WIN7
 
 !IF "$(WINVER)" == "WIN7"
 NMAKE_WINVER = 0x0601
-_WIN32_IE = 0x0800
 !ELSEIF "$(WINVER)" == "WIN8"
 NMAKE_WINVER = 0x0602
-_WIN32_IE = 0x0A00
 !ELSEIF "$(WINVER)" == "WIN81"
 NMAKE_WINVER = 0x0603
-_WIN32_IE = 0x0A00
 !ELSEIF "$(WINVER)" == "WIN10"
 NMAKE_WINVER = 0x0A00
-_WIN32_IE = 0x0A00
 !ELSE
 !ERROR Must specify WINVER environment variable (WIN7, WIN8, WIN81, WIN10)
 !ENDIF
 
-NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) 
-DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) -DPSAPI_VERSION=1
+NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) 
-DWINVER=$(NMAKE_WINVER)
 
 !IF !DEFINED(BUILD) || "$(BUILD)" == ""
 BUILD=RELEASE
@@ -196,6 +196,7 @@ CMN_CFLAGS = $(CMN_CFLAGS) -D_MBCS -DMBCS
 !ELSE
 CMN_CFLAGS = $(CMN_CFLAGS) -D_UNICODE -DUNICODE
 !ENDIF
+CMN_CFLAGS = $(CMN_CFLAGS) -D_CRT_SECURE_NO_DEPRECATE 
-D_CRT_NONSTDC_NO_DEPRECATE
 
 !IF "$(CPU)" == "X86"
 CPU_CFLAGS = -D_X86_=1
@@ -244,7 +245,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
 !ENDIF
 
 # Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib 
rpcrt4.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib shell32.lib rpcrt4.lib
 # Extra libs from command line or env
 !IF DEFINED(EXTRA_LIBS)
 LIBS = $(LIBS) $(EXTRA_LIBS)
@@ -258,20 +259,20 @@ CFLAGS = $(CFLAGS) -RTC1
 !ENDIF
 !ENDIF
 
-COMMON_LFLAGS = /NOLOGO
+COMMON_LFLAGS = /NOLOGO /MACHINE:$(MACHINE)
 
 # Always add debugging to the linker
 OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
 !IF "$(BUILD)" == "RELEASE"
-OPT_LFLAGS = /OPT:REF
+OPT_LFLAGS = /OPT:REF $(OPT_LFLAGS)
 !ENDIF
 
 !IF "$(TARGET)" == "EXE"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE
 !ELSEIF "$(TARGET)" == "GUI"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS
 !ELSEIF "$(TARGET)" == "DLL"
-LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS
 !ELSEIF "$(TARGET)" == "LIB"
 LFLAGS = -lib $(COMMON_LFLAGS)
 !ENDIF
@@ -286,13 +287,13 @@ LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
 
 # Resource compiler flags
 
-RCFLAGS=/l 0x409
+RCFLAGS=/l 0x409 /n
 !IF "$(BUILD)" == "RELEASE"
-RCFLAGS = $(RCFLAGS) /d "NDEBUG"
+RCFLAGS = $(RCFLAGS) /d NDEBUG
 !ELSE
-RCFLAGS = $(RCFLAGS) /d "_DEBUG" /d "DEBUG"
+RCFLAGS = $(RCFLAGS) /d _DEBUG /d DEBUG
 !ENDIF
-RCFLAGS = $(RCFLAGS)
+RCFLAGS = $(RCFLAGS) /d WIN32 /d WINNT /d WINVER=$(NMAKE_WINVER) /d 
_WIN32_WINNT=$(NMAKE_WINVER)
 !IF DEFINED(EXTRA_RCFLAGS)
 RCFLAGS = $(RCFLAGS) $(EXTRA_RCFLAGS)
 !ENDIF


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

[GitHub] [tomcat] michael-o commented on pull request #640: Catch NamingException instead of specialized sub-classes

2023-08-08 Thread via GitHub



michael-o commented on PR #640:
URL: https://github.com/apache/tomcat/pull/640#issuecomment-1669294674

   FTR: This is my workaround approach to this:
   
https://github.com/michael-o/tomcatspnegoad/blob/a22c3a4b0f7bc6592d4fd53268137599d84e6bf5/tomcat90/src/main/java/net/sf/michaelo/tomcat/realm/ActiveDirectoryRealm.java#L433-L457


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[tomcat-native] branch main updated: Add missing source files that are new to apr 1.7.x

2023-08-08 Thread mturk

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

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


The following commit(s) were added to refs/heads/main by this push:
 new e6487f2b0 Add missing source files that are new to apr 1.7.x
e6487f2b0 is described below

commit e6487f2b09a4a5549887cfca15d18613eba3f790
Author: Mladen Turk 
AuthorDate: Tue Aug 8 11:17:59 2023 +0200

Add missing source files that are new to apr 1.7.x
---
 native/srclib/apr/NMAKEmakefile | 154 +++-
 1 file changed, 72 insertions(+), 82 deletions(-)

diff --git a/native/srclib/apr/NMAKEmakefile b/native/srclib/apr/NMAKEmakefile
index 9cd5f7161..5cf07c46b 100644
--- a/native/srclib/apr/NMAKEmakefile
+++ b/native/srclib/apr/NMAKEmakefile
@@ -46,14 +46,34 @@ SRCDIR = .
 LFLAGS = $(LFLAGS) /version:1.4
 !ENDIF
 INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch 
-I$(SRCDIR)\include\private -I$(SRCDIR)\include\arch\win32 
-I$(SRCDIR)\include\arch\unix
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
+
 OBJECTS = \
$(WORKDIR)\apr_atomic.obj \
-   $(WORKDIR)\dso.obj \
+   $(WORKDIR)\apr_atomic64.obj \
+   $(WORKDIR)\apr_cpystrn.obj \
+   $(WORKDIR)\apr_cstr.obj \
+   $(WORKDIR)\apr_encode.obj \
$(WORKDIR)\apr_escape.obj \
+   $(WORKDIR)\apr_fnmatch.obj \
+   $(WORKDIR)\apr_getpass.obj \
+   $(WORKDIR)\apr_hash.obj \
+   $(WORKDIR)\apr_pools.obj \
+   $(WORKDIR)\apr_random.obj \
+   $(WORKDIR)\apr_skiplist.obj \
+   $(WORKDIR)\apr_snprintf.obj \
+   $(WORKDIR)\apr_strings.obj \
+   $(WORKDIR)\apr_strnatcmp.obj \
+   $(WORKDIR)\apr_strtok.obj \
+   $(WORKDIR)\apr_tables.obj \
$(WORKDIR)\buffer.obj \
+   $(WORKDIR)\charset.obj \
+   $(WORKDIR)\common.obj \
$(WORKDIR)\copy.obj \
$(WORKDIR)\dir.obj \
+   $(WORKDIR)\dso.obj \
+   $(WORKDIR)\env.obj \
+   $(WORKDIR)\errorcodes.obj \
$(WORKDIR)\fileacc.obj \
$(WORKDIR)\filedup.obj \
$(WORKDIR)\filepath.obj \
@@ -62,65 +82,54 @@ OBJECTS = \
$(WORKDIR)\filesys.obj \
$(WORKDIR)\flock.obj \
$(WORKDIR)\fullrw.obj \
-   $(WORKDIR)\mktemp.obj \
-   $(WORKDIR)\open.obj \
-   $(WORKDIR)\pipe.obj \
-   $(WORKDIR)\readwrite.obj \
-   $(WORKDIR)\seek.obj \
-   $(WORKDIR)\tempdir.obj \
-   $(WORKDIR)\proc_mutex.obj \
-   $(WORKDIR)\thread_cond.obj \
-   $(WORKDIR)\thread_mutex.obj \
-   $(WORKDIR)\thread_rwlock.obj \
-   $(WORKDIR)\apr_pools.obj \
-   $(WORKDIR)\apr_app.obj \
-   $(WORKDIR)\charset.obj \
-   $(WORKDIR)\env.obj \
-   $(WORKDIR)\errorcodes.obj \
$(WORKDIR)\getopt.obj \
+   $(WORKDIR)\groupinfo.obj \
+   $(WORKDIR)\inet_ntop.obj \
+   $(WORKDIR)\inet_pton.obj \
$(WORKDIR)\internal.obj \
$(WORKDIR)\misc.obj \
-   $(WORKDIR)\otherchild.obj \
-   $(WORKDIR)\rand.obj \
-   $(WORKDIR)\start.obj \
-   $(WORKDIR)\utf8.obj \
-   $(WORKDIR)\version.obj \
-   $(WORKDIR)\common.obj \
+   $(WORKDIR)\mktemp.obj \
$(WORKDIR)\mmap.obj \
-   $(WORKDIR)\inet_ntop.obj \
-   $(WORKDIR)\inet_pton.obj \
$(WORKDIR)\multicast.obj \
-   $(WORKDIR)\sendrecv.obj \
-   $(WORKDIR)\sockaddr.obj \
-   $(WORKDIR)\sockets.obj \
-   $(WORKDIR)\socket_util.obj \
-   $(WORKDIR)\sockopt.obj \
-   $(WORKDIR)\apr_getpass.obj \
+   $(WORKDIR)\open.obj \
+   $(WORKDIR)\otherchild.obj \
+   $(WORKDIR)\pipe.obj \
$(WORKDIR)\poll.obj \
$(WORKDIR)\pollcb.obj \
$(WORKDIR)\pollset.obj \
-   $(WORKDIR)\wakeup.obj \
+   $(WORKDIR)\proc.obj \
+   $(WORKDIR)\proc_mutex.obj \
+   $(WORKDIR)\rand.obj \
+   $(WORKDIR)\readwrite.obj \
+   $(WORKDIR)\seek.obj \
$(WORKDIR)\select.obj \
-   $(WORKDIR)\apr_random.obj \
+   $(WORKDIR)\sendrecv.obj \
$(WORKDIR)\sha2.obj \
$(WORKDIR)\sha2_glue.obj \
$(WORKDIR)\shm.obj \
-   $(WORKDIR)\apr_cpystrn.obj \
-   $(WORKDIR)\apr_fnmatch.obj \
-   $(WORKDIR)\apr_snprintf.obj \
-   $(WORKDIR)\apr_strings.obj \
-   $(WORKDIR)\apr_strnatcmp.obj \
-   $(WORKDIR)\apr_strtok.obj \
-   $(WORKDIR)\apr_hash.obj \
-   $(WORKDIR)\apr_tables.obj \
-   $(WORKDIR)\proc.obj \
$(WORKDIR)\signals.obj \
+   $(WORKDIR)\sockaddr.obj \
+   $(WORKDIR)\socket_util.obj \
+   $(WORKDIR)\sockets.obj \
+   $(WORKDIR)\sockopt.obj \
+   $(WORKDIR)\start.obj \
+   $(WORKDIR)\tempdir.obj \
$(WORKDIR)\thread.obj \
+   $(WORKDIR)\thread_cond.obj \
+   $(WORKDIR)\thread_mutex.obj \
+   $(WORKDIR)\thread_rwlock.obj \
$(WORKDIR)\threadpriv.obj \
$(WORKDIR)\time.obj \
$(WORKDIR)\timestr.obj \
-   $(WORKDIR)\groupinfo.obj \

[tomcat] branch main updated: Fix bad allocation

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 4aebd80331 Fix bad allocation
4aebd80331 is described below

commit 4aebd80331d139fdd260904125d12e799a952739
Author: remm 
AuthorDate: Tue Aug 8 11:10:49 2023 +0200

Fix bad allocation

Mostly cosmetic though.
---
 .../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 6f048fd094..f002731dbd 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1463,7 +1463,7 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 synchronized (OpenSSLEngine.this) {
 if (!destroyed) {
 try (var localArena = Arena.ofConfined()) {
-MemorySegment lenPointer = 
localArena.allocate(ValueLayout.ADDRESS);
+MemorySegment lenPointer = 
localArena.allocate(ValueLayout.JAVA_INT);
 var session = SSL_get_session(state.ssl);
 if (MemorySegment.NULL.equals(session)) {
 return new byte[0];


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

[tomcat] branch main updated: Fix bad allocation

2023-08-08 Thread remm

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

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


The following commit(s) were added to refs/heads/main by this push:
 new e61bd13460 Fix bad allocation
e61bd13460 is described below

commit e61bd13460162d932e0cf4bea19c688be78de031
Author: remm 
AuthorDate: Tue Aug 8 10:47:40 2023 +0200

Fix bad allocation

Probably caused by API or behavior changes, caught by the testsuite.
---
 .../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index aa4fb1d2b8..6f048fd094 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -905,7 +905,7 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 private String getProtocolNegotiated() {
 try (var localArena = Arena.ofConfined()) {
-MemorySegment lenAddress = 
localArena.allocate(ValueLayout.JAVA_INT, 0);
+MemorySegment lenAddress = 
localArena.allocate(ValueLayout.JAVA_INT);
 MemorySegment protocolPointer = 
localArena.allocateFrom(ValueLayout.ADDRESS, MemorySegment.NULL);
 SSL_get0_alpn_selected(state.ssl, protocolPointer, lenAddress);
 if (MemorySegment.NULL.equals(protocolPointer)) {


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

Re: Buildbot failure in on tomcat-9.0.x

2023-08-08 Thread Mark Thomas


On 07/08/2023 19:33, build...@apache.org wrote:

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


This was an APR crash. I'll see if I can find some details.

Mark




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



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

59 matches

Mail list logo