[Bug 68558] Redundant calls to ByteChunk.toString()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68558 --- Comment #1 from Mark Thomas --- Are you sure about the request parameters being parsed multiple times? They should only be parsed once per request. Is org.apache.tomcat.util.buf.StringCache not caching the Strings or is just that local caching has much lower latency (which wouldn't surprise me)? Caching the String in ByteChunk.toString() is an option. I did look at that when I last worked on this code but it raises all sorts of complications around cache invalidation as the byte array is directly accessible. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68495] Unable to find match between the canonical context and the URI presented by the user agent
https://bz.apache.org/bugzilla/show_bug.cgi?id=68495 Mark Thomas changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEEDINFO|RESOLVED --- Comment #3 from Mark Thomas --- Closing as WORKSFORME due to lack of response from OP. If you still experience this issue and wish to re-open this bug please provide the minimum steps necessary - including any web application with source - to reproduce this issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68572] migration tool does not conver xmlrpc-server3.0.jar to be jakarta compliant
https://bz.apache.org/bugzilla/show_bug.cgi?id=68572 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- RVXmlRpcServlet is not part of the xmlrpc-server3.0.jar There have been multiple releases of the migration tool since 1.0.0 that may contain relevant bug fixes. Issues with the migration tool are tracked in GitHub: https://github.com/apache/tomcat-jakartaee-migration/issues I suspect that you need to run the migration tool on the entire web application rather than a single JAR. I recommend that you seek help from the users mailing list in the first instance rather than opening a bug in GitHub. https://tomcat.apache.org/lists.html#tomcat-users -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68533] Failed to load resource: net::ERR_HTTP2_PROTOCOL_ERROR
https://bz.apache.org/bugzilla/show_bug.cgi?id=68533 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- This is an application bug, not a Tomcat bug. Reviewing the logs shows the following: - the problems start in stream 55 - the request is processed correctly - a 304 response is sent So far, so good. Note that as per the HTTP specs (see RFC 9110, section 15.4.5) 304 responses cannot contain a response body. At this point the application attempts to send a response body. That triggers error handling that results in the closure of the HTTP/2 connection. Arguably, Tomcat could handle this differently and ignore the attempt to write the body or throw an IllegalStateException or similar but that is only working around the application misbehaviour. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68559] BadRequestException doesn't send back a 400 when using Async servlets
https://bz.apache.org/bugzilla/show_bug.cgi?id=68559 --- Comment #7 from Christopher Schultz --- How do you get a valid HTTP request (not a 400) but then find yourself in a "Bad Request" state once async gets started? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
Mark, On 2/5/24 11:39, Mark Thomas wrote: On 05/02/2024 14:11, Christopher Schultz wrote: I'm +1 to markt's suggestions for these releases, except maybe we should leave 8.5.x with tcnative 1.2.x. I wouldn't want to break the last few releases of 8.5.x for anybody. I think the chances of breakage are low as: - this is a fork from 1.2.x with the OpenSSL < 1.1.1 support removed - I'm testing the result with the 9.0.x unit tests (including the APR/Native connector) on multiple operating systems It is always possible that I broke something in an edge case but: - there is plenty of time to release a fix for 1.3.x before 8.5.x reaches EOL - updating to a new Tomcat Native is very simple even if an issue emerges after the last 8.5.x release - 1.3.x releases are likely to continue for the lifetime of 9.0.x which is probably another 3 years My current thinking is that I will switch 8.5.x to Tomcat Native 1.3.x as it means one less Tomcat Native release. I was thinking we'd just let 8.5.x ride on it current tcnative release. We only have, what... 2 more 8.5.x releases in total? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/904 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 5f06983eeefb53d1f3a4ce92cbf049c36abc411a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 2.0.7
Mark, Thanks for RMing. On 2/4/24 15:42, Mark Thomas wrote: The key differences of version 2.0.7 compared to 2.0.6 are: - Align default pass phrase prompt with httpd on Windows - The windows binaries in this release have been built with OpenSSL 3.0.13 and APR 1.7.4 The 2.0.x branch is primarily intended for use with Tomcat 10.1.x onwards but can be used with earlier versions as long as the APR/native connector is not used. The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 2.0.7 release is [ ] Stable, go ahead and release [ ] Broken because of ... +1 for stable release. Builds with (expected) deprecation warnings on MacOS x86-64 with clang 12.0.5, APR 1.7.4, and OpenSSL 3.2.0. Unit tests for 10.1.x trunk pass in this configuration and environment. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update JSign to 6.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5f06983eeefb53d1f3a4ce92cbf049c36abc411a
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:16:46 2024 +
Update JSign to 6.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 01d58ffc89..54f679fdd7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -301,10 +301,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=5.0
+jsign.version=6.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
+jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b6308843c3..b097dcee0c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -195,6 +195,9 @@
Update Checkstyle to 10.13.0. (markt)
+
+Update JSign to 6.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update Checkstyle to 10.13.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 034d0a40ff008aa415c00d14cadd2d9ab8dbcafd
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:14:54 2024 +
Update Checkstyle to 10.13.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7625b272fe..01d58ffc89 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.7
+checkstyle.version=10.13.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=6cb52796a8c52d190b881068b027fd18437a098e4cdaa89ddd70c29992ef6a4e1e50696f9246ff6a77a95743449d109068e215896b09cb98fc27afbe489596be
+checkstyle.checksum.value=209f015d6d2d1a7fb44e6552e090ab77e78ac7dc8aff1c4fa96ce413a1f9715d0e7896b10213f643b140d376a7861ae51893f878cc27fcefb70d73731e2213a0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e5f1f9249..b6308843c3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -192,7 +192,9 @@
names. Based on pull request 685 provided by Paul A.
Nicolucci.
(markt)
-
+
+Update Checkstyle to 10.13.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (a25e27cf57 -> 5f06983eee)
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 a25e27cf57 Differentiate trace and debug log levels new 034d0a40ff Update Checkstyle to 10.13.0 new 5f06983eee Update JSign to 6.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 8 webapps/docs/changelog.xml | 7 ++- 2 files changed, 10 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x updated: Increment version number for next development cycle
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new f6e1474c6 Increment version number for next development cycle
f6e1474c6 is described below
commit f6e1474c6b05e9cab0ad308647a3bde533c1cbce
Author: Mark Thomas
AuthorDate: Mon Feb 5 20:51:49 2024 +
Increment version number for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 4
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d4c677184..dd8f8590d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=3
-version.build=0
+version.build=1
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 9454fb579..0be7974ba 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 3
/** patch level */
-#define TCN_PATCH_VERSION 0
+#define TCN_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 55f623aa7..e915c25af 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.3.0"
+#define TCN_VERSION "1.3.1"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index f58dd3e24..f61381a63 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,10 @@
started from the 1.2.39 tag.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: Increment version number for next development cycle
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new d1cc229db Increment version number for next development cycle
d1cc229db is described below
commit d1cc229db7416b59f7d6ba2d7bcb8188b5ebffc6
Author: Mark Thomas
AuthorDate: Mon Feb 5 20:50:45 2024 +
Increment version number for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 4
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index dda9e6380..f78f8accf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=2
version.minor=0
-version.build=7
+version.build=8
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index ac42b20e9..b43b73616 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 0
/** patch level */
-#define TCN_PATCH_VERSION 7
+#define TCN_PATCH_VERSION 8
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index a0b8b28cf..e062dcfca 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -19,7 +19,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "2.0.7"
+#define TCN_VERSION "2.0.8"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 2,0,7,0
- PRODUCTVERSION 2,0,7,0
+ FILEVERSION 2,0,8,0
+ PRODUCTVERSION 2,0,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index a14324ecc..5d16781b6 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,10 @@
branch started from the 1.2.33 tag.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: http -> https
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/main by this push: new 0f6a36b97 http -> https 0f6a36b97 is described below commit 0f6a36b97851f811aa50356fbe9fe08d89b74857 Author: Mark Thomas AuthorDate: Mon Feb 5 16:41:31 2024 + http -> https --- README.txt | 4 ++-- xdocs/miscellaneous/project.xml | 2 +- xdocs/news/project.xml | 2 +- xdocs/project.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index ca5213fab..619c191a6 100644 --- a/README.txt +++ b/README.txt @@ -19,7 +19,7 @@ The Latest Version -- Details of the latest version can be found on the Apache Tomcat -project page under http://tomcat.apache.org/. +project page under https://tomcat.apache.org/. Documentation - @@ -27,7 +27,7 @@ Documentation The documentation available as of the date of this release is included in HTML format in the docs directory. The most up-to-date documentation can be found at -http://tomcat.apache.org/native-doc/ +https://tomcat.apache.org/native-doc/ Building diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index f58f3d20b..9ddf2f6a5 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 2.0 - Miscellaneous Documentation diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index f898536f5..968bb6246 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 2.0 - News diff --git a/xdocs/project.xml b/xdocs/project.xml index b483b67d4..cdb08d119 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 2.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.3.0
On 05/02/2024 20:43, Mark Thomas wrote: The Apache Tomcat Native 1.3.0 release is [X] Stable, go ahead and release [ ] Broken because of ... Tomcat 9.0.x tests (NIO, NIO2 and APR/native) all pass with Java 22 EA on Linux (OpenSSL 1.1.1w and 3.0.13) and Windows (OpenSSL 3.0.13). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68559] BadRequestException doesn't send back a 400 when using Async servlets
https://bz.apache.org/bugzilla/show_bug.cgi?id=68559 --- Comment #6 from adwsingh --- I agree on the closing connection part. Its just weird that sync and async behave differently, one sends out a 400 and other doesn't. Also the way you suggested in https://bz.apache.org/bugzilla/show_bug.cgi?id=68037#c7, doesn't work for BRE but works for SocketTimeout. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.3.0
This is the first release of the 1.3.x branch. The main differences compared to the 1.2.x branch are - Minimum OpenSSL version of 1.1.1 - Minimum APR version of 1.6.3 - Minimum LibreSSL version of 3.5.2 - The windows binaries in this release have been built with OpenSSL 3.0.13 and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.3.0 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.3.0 [2] https://github.com/apache/tomcat-native/commit/998746966815e1ae105cba9f2681d37cc30249bc - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68559] BadRequestException doesn't send back a 400 when using Async servlets
https://bz.apache.org/bugzilla/show_bug.cgi?id=68559 --- Comment #5 from Mark Thomas --- I haven't looked at this yet but I suspect it may end up as WONTFIX. A bad request indicates a syntactically invalid request. At that point, it can be argued that given that the request is invalid, Tomcat can't tell what is going on so the only safe thing to do is to close the connection. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r67193 - in /dev/tomcat/tomcat-connectors/native/1.3.0: ./ binaries/ source/
Author: markt Date: Mon Feb 5 20:36:36 2024 New Revision: 67193 Log: Upload Tomcat Native 1.3.0 for voting Added: dev/tomcat/tomcat-connectors/native/1.3.0/ dev/tomcat/tomcat-connectors/native/1.3.0/binaries/ dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.3.0/source/ dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.asc Mon Feb 5 20:36:36 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmXBPNYACgkQEMAcWi9g +WeetXhAA6mW/IhXbasidOLHwq4M1UeuoPDP5OzlMAd5YOXLeEBfOlWYeyR6R2dM3 +FmdexA4eH8U0/+1z+riG6C+/98BtjLDcixzcKn0IaZ+ppxpep0NiwXz/VBGz6/hF +OL98CsXboLKuz/Mj3MnuMupN9ZhAxuIkwpIX9Im/VjoF8yOO/WvZ8tkvMJTsUaLb +RDjc3psomAxoh/VtwzgM9f1+Z/afb3fjii5LVtyifSrtWRy3w7Awx3FFJf/R8UpY ++hFMyg8RebD0kz1oh31DgZqXq1GfgPRzbJzr9BpGCxJ6CnwO7+lEPx1cmyKiMPNo +45WdUlzy5fZ7PCOU8ZavqgVwR6aE7fCy3++BhVV39rDK2jl2H7Y0gIrFVSVXoLIx +U5Xk3B/+xtN4pTttKn2h4MP0fPk9X2jcAqyXLLfOxiilOSfnDnkOojjhY7WdWdCj +M9+q7vz8tl625bvCLxoZFuS7xvxlia+rth6ItMLKi6sf1JM2f5R3YiNmt2tctQWK +hfyULLW34qqbCNoukWs/rQF/0/te3e0ff5ED3dBD0z6GM9uDprt6z6+mzMJa/Mnq +HeOoGFdcH9YcjbIFIvPpv+n3QuXAcgZ+6X5a50brE6+/UH7IgQQI1YkZjUD1AHA9 +8vWlMHs1JHrEpgUSeGQBW57/h4ySYdDzDR4JEYIzqx9MB9qg8k8= +=el5P +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip.sha512 Mon Feb 5 20:36:36 2024 @@ -0,0 +1 @@ +5cdc9671529f7df8b89b9688776bc83d33392883c033761e604d8a0605b42a2233c0185794f3305db10adb7d5de5381c4e5872a4d35edd2913d167d13c15207c *tomcat-native-1.3.0-openssl-3.0.13-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.3.0/binaries/tomcat-native-1.3.0-openssl-3.0.13-win32-bin.zip -- svn:mime-type = application/octet-stream Added:
[Bug 68559] BadRequestException doesn't send back a 400 when using Async servlets
https://bz.apache.org/bugzilla/show_bug.cgi?id=68559 --- Comment #4 from adwsingh --- Any update on this? I can give fixing this a shot if no one else is planning to. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) tag 1.3.0 created (now 998746966)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.3.0 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at 998746966 (commit) This tag includes the following new commits: new 998746966 Tag 1.3.0 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-native) 01/01: Tag 1.3.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.3.0
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 998746966815e1ae105cba9f2681d37cc30249bc
Author: Mark Thomas
AuthorDate: Mon Feb 5 18:36:51 2024 +
Tag 1.3.0
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d4c677184..89996c793 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=3
version.build=0
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 9454fb579..4b4448719 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat-native) branch 1.3.x created (now de94af367)
On 05/02/2024 14:17, Mark Thomas wrote: On 05/02/2024 14:12, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 1.3.x The 1.3.x might not be perfect but it builds with OpenSSL 1.1.1w and 3.0.13 on Linux and all 9.0.x tests then all pass with Java 22 EA. I've obviously messed something up as the jnirelease.sh script isn't working yet. I want to get that working and test the Windows build before I tag 1.3.0. No issue with the script. Just needed to wait for gitbox to fully sync with GitHub. I've run the 9.0.x tests on Windows as well for 1.3.x with OpenSSL 3.0.13 and all is good. I'm going to tag 1.3.0 shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat-native) 03/03: Consistent formatting. Add missing entries. Add version to title.
On 05/02/2024 11:52, Konstantin Kolinko wrote: пн, 5 февр. 2024 г. в 11:45, : This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 34a274f39b836c9d9766e1707018b3b8b61c5506 Author: Mark Thomas AuthorDate: Mon Feb 5 08:27:04 2024 + Consistent formatting. Add missing entries. Add version to title. --- xdocs/miscellaneous/project.xml | 51 + xdocs/news/project.xml | 10 xdocs/project.xml | 8 --- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 1153ee1ea..31248d42e 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,41 +16,42 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> Just spotting: The three 'project.xml" files changed by this commit still use "http:" instead of "https:" in the tag above... I tested, http://tomcat.apache.org/ responds with a 301 redirect to https://tomcat.apache.org/ Fixed to use https. Thanks for spotting this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.2.x updated: http -> https
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 2118309f6 http -> https 2118309f6 is described below commit 2118309f67b3904ec5ea9756f53911d5705bcb2e Author: Mark Thomas AuthorDate: Mon Feb 5 16:41:31 2024 + http -> https --- README.txt | 4 ++-- xdocs/miscellaneous/project.xml | 2 +- xdocs/news/project.xml | 2 +- xdocs/project.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index 8ba008fc5..c04f7e094 100644 --- a/README.txt +++ b/README.txt @@ -20,7 +20,7 @@ The Latest Version -- Details of the latest version can be found on the Apache Tomcat -project page under http://tomcat.apache.org/. +project page under https://tomcat.apache.org/. Documentation - @@ -28,7 +28,7 @@ Documentation The documentation available as of the date of this release is included in HTML format in the docs directory. The most up-to-date documentation can be found at -http://tomcat.apache.org/native-doc/ +https://tomcat.apache.org/native-doc/ Documentation about the Tomcat APR connector which is based on this library can be found at diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 31248d42e..61af071d6 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.2 - Miscellaneous Documentation diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index 8502c18fe..a8bfe9120 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.2 - News diff --git a/xdocs/project.xml b/xdocs/project.xml index 664c14774..e2331c6ed 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x updated: http -> https
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.3.x by this push: new 92c8fc656 http -> https 92c8fc656 is described below commit 92c8fc6565e912a675bd3f8edc04906ddeb49615 Author: Mark Thomas AuthorDate: Mon Feb 5 16:41:31 2024 + http -> https --- README.txt | 4 ++-- xdocs/miscellaneous/project.xml | 2 +- xdocs/news/project.xml | 2 +- xdocs/project.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index 8ba008fc5..c04f7e094 100644 --- a/README.txt +++ b/README.txt @@ -20,7 +20,7 @@ The Latest Version -- Details of the latest version can be found on the Apache Tomcat -project page under http://tomcat.apache.org/. +project page under https://tomcat.apache.org/. Documentation - @@ -28,7 +28,7 @@ Documentation The documentation available as of the date of this release is included in HTML format in the docs directory. The most up-to-date documentation can be found at -http://tomcat.apache.org/native-doc/ +https://tomcat.apache.org/native-doc/ Documentation about the Tomcat APR connector which is based on this library can be found at diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 601499db1..f41dbe04f 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.3 - Miscellaneous Documentation diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index c164c0e7c..52b885e24 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.3 - News diff --git a/xdocs/project.xml b/xdocs/project.xml index 7e135ed5e..24cd6dfcc 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="https://tomcat.apache.org/;> The Apache Tomcat Native Library 1.3 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
On 05/02/2024 14:11, Christopher Schultz wrote: I'm +1 to markt's suggestions for these releases, except maybe we should leave 8.5.x with tcnative 1.2.x. I wouldn't want to break the last few releases of 8.5.x for anybody. I think the chances of breakage are low as: - this is a fork from 1.2.x with the OpenSSL < 1.1.1 support removed - I'm testing the result with the 9.0.x unit tests (including the APR/Native connector) on multiple operating systems It is always possible that I broke something in an edge case but: - there is plenty of time to release a fix for 1.3.x before 8.5.x reaches EOL - updating to a new Tomcat Native is very simple even if an issue emerges after the last 8.5.x release - 1.3.x releases are likely to continue for the lifetime of 9.0.x which is probably another 3 years My current thinking is that I will switch 8.5.x to Tomcat Native 1.3.x as it means one less Tomcat Native release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot cancelled in on tomcat-8.5.x
Build status: Build was cancelled Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/739 Blamelist: remm Build Text: compile (cancelled) Status Detected: cancelled build Build Source Stamp: [branch 8.5.x] 4f400e976d9ddcefc0c9d93a2abf94915aa8cf38 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: 6 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed Snapshot deployed to ASF Maven snapshot repository (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/903 Blamelist: remm Build Text: failed Snapshot deployed to ASF Maven snapshot repository (failure) Status Detected: new failure Build Source Stamp: [branch main] a25e27cf5784afeeaf8a650033edbef1b7aac1c2 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 2 -- ASF Buildbot - 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: Differentiate trace and debug log levels
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 4f400e976d Differentiate trace and debug log levels
4f400e976d is described below
commit 4f400e976d9ddcefc0c9d93a2abf94915aa8cf38
Author: remm
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +-
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java| 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 94 +++---
java/org/apache/coyote/http2/Stream.java | 40 -
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java| 4 +-
webapps/docs/changelog.xml | 5 ++
17 files changed, 157 insertions(+), 152 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 694e084e00..efe3b3c035 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -268,8 +268,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index fdd0d194fe..8948f145e2 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
-if (getLog().isDebugEnabled()) {
-getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index ea4e5467b5..6bcb71fee1 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -499,16 +499,16 @@ public abstract class AbstractProtocol implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
-if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
}
waitingProcessors.add(processor);
}
Buildbot success in on tomcat-8.5.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/738 Blamelist: Christopher Schultz , Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 8.5.x] 6350946b8426a9a36aebaf0fcafc7a85db80a75e 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
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
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 8d15796171 Differentiate trace and debug log levels
8d15796171 is described below
commit 8d157961712cfc8ae1156de701de1e65f9d9a871
Author: remm
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +-
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java| 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 32
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 94 +++---
java/org/apache/coyote/http2/Stream.java | 40 -
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java| 4 +-
webapps/docs/changelog.xml | 5 ++
18 files changed, 173 insertions(+), 168 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 2986bd8efa..5765395b7a 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -264,8 +264,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index fdd0d194fe..8948f145e2 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
-if (getLog().isDebugEnabled()) {
-getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 4a0754d49f..c265c2b2e4 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -458,16 +458,16 @@ public abstract class AbstractProtocol implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
-if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
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 cee5ebb0fe Differentiate trace and debug log levels
cee5ebb0fe is described below
commit cee5ebb0fe10bd9a086148f157dda2ad0454aae3
Author: remm
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +-
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java| 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 32
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 94 +++---
java/org/apache/coyote/http2/Stream.java | 40 -
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java| 4 +-
webapps/docs/changelog.xml | 5 ++
18 files changed, 173 insertions(+), 168 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index b9f5860fd7..44439a668e 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -265,8 +265,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index fdd0d194fe..8948f145e2 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
-if (getLog().isDebugEnabled()) {
-getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index fb60024311..3a05b01dcf 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -428,16 +428,16 @@ public abstract class AbstractProtocol implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
-if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
(tomcat) branch main updated: Differentiate trace and debug log levels
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 a25e27cf57 Differentiate trace and debug log levels
a25e27cf57 is described below
commit a25e27cf5784afeeaf8a650033edbef1b7aac1c2
Author: remm
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +--
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java| 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 32
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 92 +++---
java/org/apache/coyote/http2/Stream.java | 40 +-
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java| 4 +-
webapps/docs/changelog.xml | 5 ++
18 files changed, 172 insertions(+), 167 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 6cb85ffee6..38ad35fec0 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -264,8 +264,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index 5a60dd2a54..2a429e7b1b 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
-if (getLog().isDebugEnabled()) {
-getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 5e208ce45b..832eafee56 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -428,16 +428,16 @@ public abstract class AbstractProtocol implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
-if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
Re: (tomcat-native) branch 1.3.x created (now de94af367)
On 05/02/2024 14:12, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 1.3.x The 1.3.x might not be perfect but it builds with OpenSSL 1.1.1w and 3.0.13 on Linux and all 9.0.x tests then all pass with Java 22 EA. I've obviously messed something up as the jnirelease.sh script isn't working yet. I want to get that working and test the Windows build before I tag 1.3.0. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 02/09: Add 1.3.x branch
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 9db68a6c5b646edfe77b3d9592c39a5fb7b9ddf3
Author: Mark Thomas
AuthorDate: Mon Feb 5 08:01:24 2024 +
Add 1.3.x branch
---
jnirelease.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jnirelease.sh b/jnirelease.sh
index d781c355d..f76cda464 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -85,7 +85,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
echo ""
echo "Unknown Git tag/branch"
echo "Use:"
-echo " --ver=|1.1.x|1.2.x|main|."
+echo " --ver=|1.1.x|1.2.x|1.3.x|main|."
echo ""
exit 1
fi
@@ -136,6 +136,9 @@ fi
if [ "x$JKJNIEXT" = "xmain" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/main | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
+elif [ "x$JKJNIEXT" = "x1.3.x" ]; then
+JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.3.x | awk '{print $1}'`
+JKJNIVER="$JKJNIEXT-$JKJNIHASH"
elif [ "x$JKJNIEXT" = "x1.2.x" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.2.x | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 05/09: Consistent formatting. Correct entries for 1.3. Add version to title.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit e6f775502e1d0dcfc8c32d89c0d37b852b85abad Author: Mark Thomas AuthorDate: Mon Feb 5 08:27:04 2024 + Consistent formatting. Correct entries for 1.3. Add version to title. --- xdocs/miscellaneous/project.xml | 36 +++- xdocs/news/project.xml | 27 ++- xdocs/project.xml | 23 +-- 3 files changed, 22 insertions(+), 64 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 1153ee1ea..601499db1 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,41 +16,27 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> -The Apache Tomcat Native - Miscellaneous Documentation + The Apache Tomcat Native Library 1.3 - Miscellaneous Documentation - - The Apache Tomcat Native - Miscellaneous Documentation - - + +The Apache Tomcat Native Library - Miscellaneous Documentation + + - + - - + + - - - - - - - - - - - - - - - + - + diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index 115d900f0..c164c0e7c 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - The Apache Tomcat Native - News + The Apache Tomcat Native Library 1.3 - News -The Apache Tomcat Native - News +The Apache Tomcat Native Library - News @@ -30,27 +30,12 @@ - - + + - - - - - - - - - - - - - - - - + diff --git a/xdocs/project.xml b/xdocs/project.xml index 9184f9688..7e135ed5e 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - Apache Tomcat Native Library + The Apache Tomcat Native Library 1.3 -Apache Tomcat Native Library +The Apache Tomcat Native Library @@ -35,21 +35,8 @@ - - - - - - - - - - - - - - - + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 06/09: Second pass at version update
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit f2a7699d37db56bfbcb5f3c3215854598953141e
Author: Mark Thomas
AuthorDate: Mon Feb 5 08:58:41 2024 +
Second pass at version update
---
HOWTO-RELEASE.txt | 2 +-
build.properties.default | 4 ++--
native/include/tcn_version.h | 4 ++--
native/os/win32/libtcnative.rc | 4 ++--
native/srclib/VERSIONS | 11 +++
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 4dc2d8c79..3542ee962 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -23,7 +23,7 @@ Requirements
Java 8
Apache Ant 1.9 or later
-Apache APR 1.4.3 or later source (1.7.4 or later recommended)
+Apache APR 1.6.3 or later source (1.7.4 or later recommended)
Preparation
diff --git a/build.properties.default b/build.properties.default
index 37e678139..d4c677184 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -17,8 +17,8 @@
# - Version Control Flags -
version.major=1
-version.minor=2
-version.build=40
+version.minor=3
+version.build=0
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index d88bb4236..9454fb579 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -60,10 +60,10 @@ extern "C" {
* Minor API changes that do not cause binary compatibility problems.
* Should be reset to 0 when upgrading TCN_MAJOR_VERSION
*/
-#define TCN_MINOR_VERSION 2
+#define TCN_MINOR_VERSION 3
/** patch level */
-#define TCN_PATCH_VERSION 40
+#define TCN_PATCH_VERSION 0
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 55b45baa8..e4d443823 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,40,0
- PRODUCTVERSION 1,2,40,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index cef16403f..7eb22da70 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,21 +1,16 @@
The current minimum versions are:
-- OpenSSL 1.0.2
-- APR 1.4.3
+- OpenSSL 1.1.1
+- APR 1.6.3
The following version of the libraries are recommended:
- APR 1.7.4 or later, http://apr.apache.org
-- OpenSSL 3.0.11 or later, http://www.openssl.org
+- OpenSSL 3.0.13 or later, http://www.openssl.org
Older versions should also work but are not as thoroughly tested by the Tomcat
Native team
-It is current anticipated that Tomcat Native releases will transition to 1.3.x
-at some point in the future when the minimum version will become OpenSSL 1.1.1
and
-APR 1.6.3.
-
-
The minimum version of OpenSSL is driven by the version of OpenSSL used by
downstream distributions.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 08/09: Update minimum LibreSSL version to 3.5.2. Remove NPN support.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 29f0cc900310b1982b462b16fc308cbfeade79d4
Author: Mark Thomas
AuthorDate: Mon Feb 5 13:43:27 2024 +
Update minimum LibreSSL version to 3.5.2. Remove NPN support.
Additional updates after reviewing the 1.2.x/1.3.x/2.0.x diff
---
native/BUILDING | 10 +-
native/include/ssl_private.h | 45 +-
native/os/win32/libtcnative.rc| 4 +-
native/src/jnilib.c | 4 +-
native/src/ssl.c | 326 +-
native/src/sslcontext.c | 147 +
native/src/sslutils.c | 20 +--
native/srclib/BUILDING| 4 +-
xdocs/miscellaneous/changelog.xml | 7 +
9 files changed, 28 insertions(+), 539 deletions(-)
diff --git a/native/BUILDING b/native/BUILDING
index 51793e02a..eab66a699 100644
--- a/native/BUILDING
+++ b/native/BUILDING
@@ -20,8 +20,8 @@ Linux / Unix / OSX (dynamic linking)
1. Prerequisites
- Install OpenSSL version 1.0.2 or higher
- Install APR version 1.4.3 or higher.
+ Install OpenSSL version 1.1.1 or higher
+ Install APR version 1.6.3 or higher.
Download and expand the source package or use an git checkout
> cd native
@@ -48,7 +48,7 @@ Linux / Unix / OSX (dynamic linking)
Linux / Unix / OSX (static linking)
===
-1. Build static version of OpenSSL 1.0.2 or later
+1. Build static version of OpenSSL 1.1.1 or later
> ./Configure --prefix=~/natives/openssl no-shared -fPIC
> make
@@ -57,7 +57,7 @@ Linux / Unix / OSX (static linking)
Note: For the Solaris platform you should use -KPIC instead -fPIC so that
the
library is compiled with position independent code.
-2. Build static version of APR 1.4.3 or later
+2. Build static version of APR 1.6.3 or later
> ./configure --prefix=~/natives/apr
> make
@@ -112,7 +112,7 @@ Windows
4. Build OpenSSL
Unpack the OpenSSL source distribution into native\srclib\openssl
- Apply openssl-msvcrt.patch
+ Apply openssl-msvcrt-3.0.x.patch
> c:\cmsc\setenv.bat x86
> perl Configure VC-WIN32
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 286a50a04..aab34cc9d 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -46,7 +46,7 @@
#include
#include
#include
-#if (OPENSSL_VERSION_NUMBER > 0x2FFFL)
+#if OPENSSL_VERSION_NUMBER > 0x2FFFL && !defined(LIBRESSL_VERSION_NUMBER)
#include
#endif
/* Avoid tripping over an engine build installed globally and detected
@@ -217,39 +217,7 @@ extern ENGINE *tcn_ssl_engine;
#endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
-/* LibreSSL compatibility */
-#if defined(LIBRESSL_VERSION_NUMBER)
-#define OpenSSL_version SSLeay_version
-#define OpenSSL_version_num SSLeay
-#define OPENSSL_VERSION SSLEAY_VERSION
-#define OPENSSL_malloc_init CRYPTO_malloc_init
-#define BN_get_rfc2409_prime_768 get_rfc2409_prime_768
-#define BN_get_rfc2409_prime_1024get_rfc2409_prime_1024
-#define BN_get_rfc3526_prime_1536get_rfc3526_prime_1536
-#define BN_get_rfc3526_prime_2048get_rfc3526_prime_2048
-#define BN_get_rfc3526_prime_3072get_rfc3526_prime_3072
-#define BN_get_rfc3526_prime_4096get_rfc3526_prime_4096
-#define BN_get_rfc3526_prime_6144get_rfc3526_prime_6144
-#define BN_get_rfc3526_prime_8192get_rfc3526_prime_8192
-#define BIO_get_init(x) (x->init)
-#define BIO_set_init(x,v)(x->init=v)
-#define BIO_get_data(x) (x->ptr)
-#define BIO_set_data(x,v)(x->ptr=v)
-#define BIO_set_shutdown(x,v)(x->shutdown=v)
-#define X509_REVOKED_get0_serialNumber(x) x->serialNumber
-#define X509_STORE_CTX_get0_untrusted(x) (x->untrusted)
-#define X509_OBJECT_free(x) {X509_OBJECT_free_contents(obj);\
- OPENSSL_free(obj);}
-#define TLS_method SSLv23_method
-#define TLS_client_methodSSLv23_client_method
-#define TLS_server_methodSSLv23_server_method
-#endif /* defined(LIBRESSL_VERSION_NUMBER) */
-
-#if !defined(LIBRESSL_VERSION_NUMBER)
-#define HAVE_KEYLOG_CALLBACK
-#endif
-
-#define MAX_ALPN_NPN_PROTO_SIZE 65535
+#define MAX_ALPN_PROTO_SIZE 65535
#define SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL1
typedef struct {
@@ -394,19 +362,10 @@ voidSSL_callback_handshake(const SSL *, int, int);
int SSL_CTX_use_certificate_chain(SSL_CTX *, const char *, int);
int SSL_callback_SSL_verify(int, X509_STORE_CTX *);
int SSL_rand_seed(const char *file);
-int SSL_callback_next_protos(SSL *, const
(tomcat-native) 09/09: Align with 9.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit de94af36799ff0ca611330c2bc5a3194e06eab7a
Author: Mark Thomas
AuthorDate: Mon Feb 5 14:08:23 2024 +
Align with 9.0.x
---
java/org/apache/tomcat/jni/Library.java | 7 +--
java/org/apache/tomcat/jni/SSL.java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index aa350b17d..218a101b5 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -20,8 +20,11 @@ import java.io.File;
public final class Library {
-/* Default library names */
-private static final String [] NAMES = {"tcnative-2", "libtcnative-2",
"tcnative-1", "libtcnative-1"};
+/*
+ * Default library names - use 1.x in preference to 2.x if both are
available as only 1.x supports the APR/Native
+ * connector.
+ */
+private static final String [] NAMES = {"tcnative-1", "libtcnative-1",
"tcnative-2", "libtcnative-2"};
/* System property used to define CATALINA_HOME */
private static final String CATALINA_HOME_PROP = "catalina.home";
/*
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index ac0ca9da5..91a8bc66f 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -254,7 +254,7 @@ public final class SSL {
public static final int SSL_SELECTOR_FAILURE_NO_ADVERTISE = 0;
public static final int SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL = 1;
-/* Return OpenSSL version number (run time version) */
+/* Return OpenSSL version number (compile time version, if version <
1.1.0) */
public static native int version();
/* Return OpenSSL version string (run time version) */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x created (now de94af367)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at de94af367 Align with 9.0.x This branch includes the following new commits: new 35606620d Update ignores new 9db68a6c5 Add 1.3.x branch new dcb4f6595 First pass at updating version to 1.3 new 07e76d749 Update ASF logo new e6f775502 Consistent formatting. Correct entries for 1.3. Add version to title. new f2a7699d3 Second pass at version update new fdd917234 First pass at reviewing use of OPENSSL_VERSION_NUMBER new 29f0cc900 Update minimum LibreSSL version to 3.5.2. Remove NPN support. new de94af367 Align with 9.0.x The 9 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-native) 07/09: First pass at reviewing use of OPENSSL_VERSION_NUMBER
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit fdd91723488cb47de3319dbee40ca31ee036dcc3
Author: Mark Thomas
AuthorDate: Mon Feb 5 09:42:50 2024 +
First pass at reviewing use of OPENSSL_VERSION_NUMBER
---
native/build/tcnative.m4 | 6 +-
native/include/ssl_private.h | 10 ++--
native/src/ssl.c | 37 +---
native/src/sslcontext.c | 138 ++-
native/src/sslinfo.c | 2 +-
native/src/sslutils.c| 7 ---
6 files changed, 41 insertions(+), 159 deletions(-)
diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index 9681586ae..eee9710dc 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -240,16 +240,16 @@ AC_ARG_ENABLE(openssl-version-check,
[disable the OpenSSL version check])])
case "$enable_openssl_version_check" in
yes|'')
-AC_MSG_CHECKING(OpenSSL library version >= 1.0.2)
+AC_MSG_CHECKING(OpenSSL library version >= 1.1.1)
AC_TRY_RUN([
#include
#include
int main() {
-if (OPENSSL_VERSION_NUMBER >= 0x1000200fL)
+if (OPENSSL_VERSION_NUMBER >= 0x1010100fL)
return (0);
printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x (" OPENSSL_VERSION_TEXT
")\n",
OPENSSL_VERSION_NUMBER);
-printf("Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)\n\n");
+printf("Require OPENSSL_VERSION_NUMBER 0x1010100f or greater (1.1.1)\n\n");
return (1);
}
],
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index d90bc1f4b..286a50a04 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -217,8 +217,8 @@ extern ENGINE *tcn_ssl_engine;
#endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
-/* OpenSSL 1.0.2 compatibility */
-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL compatibility */
+#if defined(LIBRESSL_VERSION_NUMBER)
#define OpenSSL_version SSLeay_version
#define OpenSSL_version_num SSLeay
#define OPENSSL_VERSION SSLEAY_VERSION
@@ -243,9 +243,9 @@ extern ENGINE *tcn_ssl_engine;
#define TLS_method SSLv23_method
#define TLS_client_methodSSLv23_client_method
#define TLS_server_methodSSLv23_server_method
-#endif /* OPENSSL_VERSION_NUMBER < 0x1010L ||
defined(LIBRESSL_VERSION_NUMBER) */
+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
#define HAVE_KEYLOG_CALLBACK
#endif
@@ -401,7 +401,7 @@ int SSL_callback_alpn_select_proto(SSL *, const
unsigned char **, unsign
voidSSL_callback_add_keylog(SSL_CTX *);
#endif
-#if (OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER))
&& ! (defined(WIN32) || defined(WIN64))
+#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
unsigned long SSL_ERR_get(void);
void SSL_ERR_clear(void);
#else
diff --git a/native/src/ssl.c b/native/src/ssl.c
index ff716091f..a5bdaf43c 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -46,7 +46,7 @@ static void ssl_keylog_callback(const SSL *ssl, const char
*line)
static jclass byteArrayClass;
static jclass stringClass;
-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
/* Global reference to the pool used by the dynamic mutexes */
static apr_pool_t *dynlockpool = NULL;
@@ -210,8 +210,8 @@ static const jint supported_ssl_opts = 0
#endif
| 0;
-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-/* OpenSSL Pre-1.1.0 compatibility */
+#if defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL compatibility */
/* Taken from OpenSSL 1.1.0 snapshot 20160410 */
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
{
@@ -321,7 +321,7 @@ DH *SSL_get_dh_params(unsigned keylen)
return NULL; /* impossible to reach. */
}
-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
static void init_bio_methods(void);
static void free_bio_methods(void);
#endif
@@ -349,7 +349,7 @@ static apr_status_t ssl_init_cleanup(void *data)
return APR_SUCCESS;
ssl_initialized = 0;
-#if (OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER))
&& ! (defined(WIN32) || defined(WIN64))
+#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
if (threadkey_initialized) {
threadkey_initialized = 0;
apr_threadkey_private_delete(thread_exit_key);
@@ -362,7 +362,7 @@ static apr_status_t ssl_init_cleanup(void *data)
(tomcat-native) 04/09: Update ASF logo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 07e76d7496e5079bee1da18fe10974db62a7d93b Author: Mark Thomas AuthorDate: Mon Feb 5 08:32:03 2024 + Update ASF logo --- xdocs/images/asf-feather.png | Bin 40042 -> 0 bytes xdocs/images/asf-logo.svg| 226 +++ xdocs/style.xsl | 2 +- 3 files changed, 227 insertions(+), 1 deletion(-) diff --git a/xdocs/images/asf-feather.png b/xdocs/images/asf-feather.png deleted file mode 100644 index 7b596e668..0 Binary files a/xdocs/images/asf-feather.png and /dev/null differ diff --git a/xdocs/images/asf-logo.svg b/xdocs/images/asf-logo.svg new file mode 100644 index 0..e24cbe529 --- /dev/null +++ b/xdocs/images/asf-logo.svg @@ -0,0 +1,226 @@ + + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" +viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xdocs/style.xsl b/xdocs/style.xsl index e7b1cb566..3def0fe66 100644 --- a/xdocs/style.xsl +++ b/xdocs/style.xsl @@ -34,7 +34,7 @@ http://tomcat.apache.org/'"/> - + https://bz.apache.org/bugzilla/show_bug.cgi?id='"/> https://github.com/apache/tomcat-native/pull/'"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/09: Update ignores
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 35606620d24f2de513032359fdbc0221dbe0555b Author: Mark Thomas AuthorDate: Mon Feb 5 07:56:25 2024 + Update ignores --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0081ec7c5..85ad0373d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ /native/configure~ /native/libtcnative-1.la /native/libtcnative-2.la +/native/libtool /native/tcnative.pc /native/tcnative.spec - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 03/09: First pass at updating version to 1.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit dcb4f6595c65c5c057ab8bb57b8bf020ba761d5d
Author: Mark Thomas
AuthorDate: Mon Feb 5 08:19:58 2024 +
First pass at updating version to 1.3
---
HOWTO-RELEASE.txt | 20 +-
jnirelease.sh | 2 +-
native/NMAKEmakefile | 2 +-
native/build/rpm/tcnative.spec.in | 10 +-
native/os/win32/libtcnative.rc| 2 +-
xdocs/index.xml | 7 +-
xdocs/miscellaneous/changelog.xml | 702 +-
xdocs/news/2008.xml | 57
xdocs/news/2009.xml | 41 ---
xdocs/news/2010.xml | 46 ---
xdocs/news/2012.xml | 52 ---
xdocs/news/2013.xml | 55 ---
xdocs/news/2014.xml | 52 ---
xdocs/news/2015.xml | 59
xdocs/news/2016.xml | 72
xdocs/news/2017.xml | 55 ---
xdocs/news/2018.xml | 55 ---
xdocs/news/2019.xml | 44 ---
xdocs/news/2020.xml | 49 ---
xdocs/news/2021.xml | 54 ---
xdocs/news/2022.xml | 54 ---
xdocs/news/2023.xml | 57
xdocs/news/{2011.xml => 2024.xml} | 30 +-
23 files changed, 44 insertions(+), 1533 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index d0cb3cdcf..4dc2d8c79 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -43,10 +43,10 @@ Ensure dates and/or version numbers are up to date:
Run the release script to check the Java code is aligned with the current 9.0.x
source.
-./jnirelease.sh --ver=1.2.x --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.x --with-apr=/path/to/apr/source
-Switch back to the 1.2.x branch
-git checkout 1.2.x
+Switch back to the 1.3.x branch
+git checkout 1.3.x
Tagging
---
@@ -63,11 +63,11 @@ git status
git diff
# Tag (modify version as appropriate)
-git commit -a -m "Tag 1.2.35"
-git tag 1.2.35
-git push origin 1.2.35
+git commit -a -m "Tag 1.3.0"
+git tag 1.3.0
+git push origin 1.3.0
-# Reset 1.2.x
+# Reset 1.3.x
git reset --hard HEAD~1
@@ -75,10 +75,10 @@ Create the source release
-
# Modify version as appropriate
-./jnirelease.sh --ver=1.2.35 --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.0 --with-apr=/path/to/apr/source
-# Switch back to the 1.2.x branch
-git checkout 1.2.x
+# Switch back to the 1.3.x branch
+git checkout 1.3.x
Create the binary release for Windows
diff --git a/jnirelease.sh b/jnirelease.sh
index f76cda464..aa4cc82f0 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -178,7 +178,7 @@ if [ $diffcount -ne 0 ]; then
echo "WARNING: git subtree is not up to date with"
echo " $TCJAVA_GITBASE"
echo " Either correct now by running"
-echo " 'git checkout 1.2.x'"
+echo " 'git checkout 1.3.x'"
echo " 'git rm -rf java/org/apache/tomcat/jni'"
echo " 'git read-tree --prefix=java/org/apache/tomcat/jni/ -u
tcjava/9.0.x:java/org/apache/tomcat/jni'"
echo " 'git commit'"
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index ad02d3152..129ebe7b7 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -69,7 +69,7 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
!ENDIF
-LFLAGS = $(LFLAGS) /version:1.2
+LFLAGS = $(LFLAGS) /version:1.3
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib
ole32.lib
LFLAGS = $(LFLAGS) $(APR_LIB)
!IF DEFINED(WITH_FIPS)
diff --git a/native/build/rpm/tcnative.spec.in
b/native/build/rpm/tcnative.spec.in
index 73c164240..078ca8366 100644
--- a/native/build/rpm/tcnative.spec.in
+++ b/native/build/rpm/tcnative.spec.in
@@ -17,7 +17,7 @@
%define tcnver 1
%define aprmajor 1
-%define aprminor 4
+%define aprminor 6
Summary: Tomcat Native Java library
Name: tcnative
@@ -28,7 +28,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 1.0.2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 1.1.1
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -38,7 +38,7 @@ contains additional utility interfaces for Java.
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.0.2
+Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.1.1
%description devel
The mission of the Tomcat Native
Re: Moving to Tomcat Native 1.3.x
All, On 2/5/24 09:03, Christopher Schultz wrote: Mark, On 2/4/24 14:54, Mark Thomas wrote: AS you have probably noticed I am working on another round of Tomcat Native releases. We are overdue on switching to 1.3.x so I would like to propose the following with this release round: - create a new 1.3.x branch from the current 1.2.x HEAD - update minimum OpenSSL to 1.1.1 What about going all the way up to OpenSSL *3.x* with tcnative 1.*3.x*? Is that too far? - update minimum APR to 1.6.3 - remove code supporting OpenSSL < 1.1.1 +1 The next 8.5.x and 9.0.x releases would then ship with Tomcat Native 1.3.0 but minimum required/recommended Tomcat Native versions would not change. If anyone else is interested in dumping OpenSSL 1.x, we'd have to make some changes, here. I think only 10.x and 11.x could upgrade without ruffling a lot of feathers. Ignore this post. OpenSSL 3.xis what tcnative 2.x is for. I'm +1 to markt's suggestions for these releases, except maybe we should leave 8.5.x with tcnative 1.2.x. I wouldn't want to break the last few releases of 8.5.x for anybody. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
Mark, On 2/4/24 14:54, Mark Thomas wrote: AS you have probably noticed I am working on another round of Tomcat Native releases. We are overdue on switching to 1.3.x so I would like to propose the following with this release round: - create a new 1.3.x branch from the current 1.2.x HEAD - update minimum OpenSSL to 1.1.1 What about going all the way up to OpenSSL *3.x* with tcnative 1.*3.x*? Is that too far? - update minimum APR to 1.6.3 - remove code supporting OpenSSL < 1.1.1 +1 The next 8.5.x and 9.0.x releases would then ship with Tomcat Native 1.3.0 but minimum required/recommended Tomcat Native versions would not change. If anyone else is interested in dumping OpenSSL 1.x, we'd have to make some changes, here. I think only 10.x and 11.x could upgrade without ruffling a lot of feathers. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.2.x updated: Align with other branches. No functional change.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 04b4109ff Align with other branches. No functional change. 04b4109ff is described below commit 04b4109ff959f0f1226e2e06c24b931966a2534e Author: Mark Thomas AuthorDate: Mon Feb 5 12:07:19 2024 + Align with other branches. No functional change. --- native/BUILDING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/BUILDING b/native/BUILDING index 51793e02a..d3940682e 100644 --- a/native/BUILDING +++ b/native/BUILDING @@ -112,7 +112,7 @@ Windows 4. Build OpenSSL Unpack the OpenSSL source distribution into native\srclib\openssl - Apply openssl-msvcrt.patch + Apply openssl-msvcrt-3.0.x.patch > c:\cmsc\setenv.bat x86 > perl Configure VC-WIN32 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: Align with other branches. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 2f569cf2d Align with other branches. No functional change.
2f569cf2d is described below
commit 2f569cf2da8f37292fe4ef3e2ef4e9364b45b776
Author: Mark Thomas
AuthorDate: Mon Feb 5 12:07:08 2024 +
Align with other branches. No functional change.
---
native/src/jnilib.c | 1 -
native/src/sslcontext.c | 10 --
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 7367cd3ca..342df3b9c 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -74,7 +74,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
/* Initialize global java.lang.String class */
TCN_LOAD_CLASS(env, jString_class, "java/lang/String", JNI_ERR);
-
TCN_GET_METHOD(env, jString_class, jString_init,
"", "([B)V", JNI_ERR);
TCN_GET_METHOD(env, jString_class, jString_getBytes,
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index f5b2b9831..0855822e5 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -254,12 +254,13 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS,
jlong pool,
goto init_failed;
}
-if (mode == SSL_MODE_CLIENT)
+if (mode == SSL_MODE_CLIENT) {
ctx = SSL_CTX_new(TLS_client_method());
-else if (mode == SSL_MODE_SERVER)
+} else if (mode == SSL_MODE_SERVER) {
ctx = SSL_CTX_new(TLS_server_method());
-else
+} else {
ctx = SSL_CTX_new(TLS_method());
+}
if (!ctx) {
char err[256];
@@ -573,8 +574,6 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext,
getCiphers)(TCN_STDARGS, jlong ctx)
return NULL;
}
-/* For LibreSSL get_ciphers() iss only available
- * on an SSL, not for an SSL_CTX. */
sk = SSL_CTX_get_ciphers(c->ctx);
len = sk_SSL_CIPHER_num(sk);
@@ -1099,7 +1098,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
setCertificate)(TCN_STDARGS, jlong ctx,
(eckey = EC_KEY_new_by_curve_name(nid))) {
SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
}
-
/* OpenSSL assures us that _free() is NULL-safe */
EC_KEY_free(eckey);
EC_GROUP_free(ecparams);
-
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-8.5.x
On Mon, Feb 5, 2024 at 12:28 PM Konstantin Kolinko wrote: > > Running "release" target fails due to a typo in Javadoc. > Double ">>". > > [javadoc] Building tree for all the packages and classes... > [javadoc] > /home/buildslave/slave/tomcat-8.5.x/build/output/dist/src/java/org/apache/catalina/filters/CsrfPreventionFilter.java:232: > error: bad use of '>' > [javadoc] * >null if the pattern is null or blank. > [javadoc] ^ > ... > [javadoc] 1 error > [javadoc] 100 warnings > BUILD FAILED > /home/buildslave/slave/tomcat-8.5.x/build/build.xml:2052: Javadoc returned 1 Fixed. The newer versions of javadoc don't seem to have an issue with that it seems. Rémy > чт, 1 февр. 2024 г. в 21:08, : > > > > Build status: BUILD FAILED: failed compile (failure) > > Worker used: bb_worker2_ubuntu > > URL: https://ci2.apache.org/#builders/36/builds/728 > > Blamelist: Christopher Schultz , remm > > > > Build Text: failed compile (failure) > > Status Detected: new failure > > Build Source Stamp: [branch 8.5.x] 63ced512958556c7b6d7bfc60740648cecd0020d > > > > > > Steps: > > > > worker_preparation: 0 > > > > git: 0 > > > > shell: 0 > > > > shell_1: 0 > > > > shell_2: 0 > > > > shell_3: 0 > > > > shell_4: 0 > > > > shell_5: 0 > > > > compile: 2 > > > > > > -- 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 > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix javadoc
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 6350946b84 Fix javadoc
6350946b84 is described below
commit 6350946b8426a9a36aebaf0fcafc7a85db80a75e
Author: remm
AuthorDate: Mon Feb 5 12:57:26 2024 +0100
Fix javadoc
---
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index d014c0b98b..9958c9ac9b 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -229,7 +229,7 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
*/bar/*.
*
* @return A Predicate which can match the specified pattern, or
- * >null if the pattern is null or blank.
+ * null if the pattern is null or blank.
*/
protected static Predicate createNoNoncePredicate(ServletContext
context, String pattern) {
if (null == pattern || 0 == pattern.trim().length()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix javadoc
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 81799802fe Fix javadoc
81799802fe is described below
commit 81799802fefecdde8f277094eb79b74725245ad9
Author: remm
AuthorDate: Mon Feb 5 12:57:26 2024 +0100
Fix javadoc
---
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 9872c74c07..4cdc3aafc7 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -225,7 +225,7 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
*/bar/*.
*
* @return A Predicate which can match the specified pattern, or
- * >null if the pattern is null or blank.
+ * null if the pattern is null or blank.
*/
protected static Predicate createNoNoncePredicate(ServletContext
context, String pattern) {
if (null == pattern || 0 == pattern.trim().length()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix javadoc
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 dc680424df Fix javadoc
dc680424df is described below
commit dc680424dfbaad0b1142235519041f2da919b819
Author: remm
AuthorDate: Mon Feb 5 12:57:26 2024 +0100
Fix javadoc
---
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 4150ab0d92..2d65bb3544 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -225,7 +225,7 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
*/bar/*.
*
* @return A Predicate which can match the specified pattern, or
- * >null if the pattern is null or blank.
+ * null if the pattern is null or blank.
*/
protected static Predicate createNoNoncePredicate(ServletContext
context, String pattern) {
if (null == pattern || 0 == pattern.trim().length()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix javadoc
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 df1acafcae Fix javadoc
df1acafcae is described below
commit df1acafcae620d40d9c29376125039505f42d9d1
Author: remm
AuthorDate: Mon Feb 5 12:57:26 2024 +0100
Fix javadoc
---
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 4150ab0d92..2d65bb3544 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -225,7 +225,7 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
*/bar/*.
*
* @return A Predicate which can match the specified pattern, or
- * >null if the pattern is null or blank.
+ * null if the pattern is null or blank.
*/
protected static Predicate createNoNoncePredicate(ServletContext
context, String pattern) {
if (null == pattern || 0 == pattern.trim().length()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat-native) 03/03: Consistent formatting. Add missing entries. Add version to title.
пн, 5 февр. 2024 г. в 11:45, : > > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch 1.2.x > in repository https://gitbox.apache.org/repos/asf/tomcat-native.git > > commit 34a274f39b836c9d9766e1707018b3b8b61c5506 > Author: Mark Thomas > AuthorDate: Mon Feb 5 08:27:04 2024 + > > Consistent formatting. Add missing entries. Add version to title. > --- > xdocs/miscellaneous/project.xml | 51 > + > xdocs/news/project.xml | 10 > xdocs/project.xml | 8 --- > 3 files changed, 36 insertions(+), 33 deletions(-) > > diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml > index 1153ee1ea..31248d42e 100644 > --- a/xdocs/miscellaneous/project.xml > +++ b/xdocs/miscellaneous/project.xml > @@ -16,41 +16,42 @@ >limitations under the License. > --> > -href="http://tomcat.apache.org/;> > +href="http://tomcat.apache.org/;> Just spotting: The three 'project.xml" files changed by this commit still use "http:" instead of "https:" in the tag above... I tested, http://tomcat.apache.org/ responds with a 301 redirect to https://tomcat.apache.org/ Those values are used to generate links from the logo image, useful if anybody is viewing the documentation locally. Best regards, Konstantin Kolinko - 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-8.5.x
Running "release" target fails due to a typo in Javadoc. Double ">>". [javadoc] Building tree for all the packages and classes... [javadoc] /home/buildslave/slave/tomcat-8.5.x/build/output/dist/src/java/org/apache/catalina/filters/CsrfPreventionFilter.java:232: error: bad use of '>' [javadoc] * >null if the pattern is null or blank. [javadoc] ^ ... [javadoc] 1 error [javadoc] 100 warnings BUILD FAILED /home/buildslave/slave/tomcat-8.5.x/build/build.xml:2052: Javadoc returned 1 чт, 1 февр. 2024 г. в 21:08, : > > Build status: BUILD FAILED: failed compile (failure) > Worker used: bb_worker2_ubuntu > URL: https://ci2.apache.org/#builders/36/builds/728 > Blamelist: Christopher Schultz , remm > > Build Text: failed compile (failure) > Status Detected: new failure > Build Source Stamp: [branch 8.5.x] 63ced512958556c7b6d7bfc60740648cecd0020d > > > Steps: > > worker_preparation: 0 > > git: 0 > > shell: 0 > > shell_1: 0 > > shell_2: 0 > > shell_3: 0 > > shell_4: 0 > > shell_5: 0 > > compile: 2 > > > -- 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
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
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 0dae4663c7 Differentiate trace and debug log levels
0dae4663c7 is described below
commit 0dae4663c71ebadadff59515a52df059502beb62
Author: remm
AuthorDate: Mon Feb 5 10:49:57 2024 +0100
Differentiate trace and debug log levels
---
.../valves/CrawlerSessionManagerValve.java | 20
.../catalina/valves/ExtendedAccessLogValve.java| 8 +++
.../apache/catalina/valves/PersistentValve.java| 28 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 8 +++
.../catalina/valves/StuckThreadDetectionValve.java | 4 ++--
.../catalina/valves/rewrite/RewriteValve.java | 12 +-
webapps/docs/changelog.xml | 4
7 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 03a5e6b481..39dfab3138 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -180,8 +180,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
String clientIp = request.getRemoteAddr();
String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
request.getRequestedSessionId());
}
@@ -198,15 +198,15 @@ public class CrawlerSessionManagerValve extends ValveBase
{
// If more than one UA header - assume not a bot
if (uaHeader != null && !uaHeaders.hasMoreElements()) {
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": UserAgent=" + uaHeader);
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": UserAgent=" + uaHeader);
}
if (uaPattern.matcher(uaHeader).matches()) {
isBot = true;
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": Bot found.
UserAgent=" + uaHeader);
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": Bot found.
UserAgent=" + uaHeader);
}
}
}
@@ -214,8 +214,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
if (ipPattern != null && ipPattern.matcher(clientIp).matches()) {
isBot = true;
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": Bot found. IP=" +
clientIp);
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": Bot found. IP=" +
clientIp);
}
}
@@ -224,8 +224,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
sessionId = clientIdSessionId.get(clientIdentifier);
if (sessionId != null) {
request.setRequestedSessionId(sessionId);
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": SessionID=" +
sessionId);
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": SessionID=" +
sessionId);
}
}
}
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 1da207da4d..4ed97e9fa2 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -509,8 +509,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
String token = tokenizer.getToken();
while (token != null) {
-if (log.isDebugEnabled()) {
-log.debug("token = " + token);
+if (log.isTraceEnabled()) {
+log.trace("token = " + token);
}
AccessLogElement element = getLogElement(token, tokenizer);
if (element == null) {
@@ -526,8 +526,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
}
token = tokenizer.getToken();
}
-if (log.isDebugEnabled()) {
-log.debug("finished
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
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 f0c3e72ed9 Differentiate trace and debug log levels
f0c3e72ed9 is described below
commit f0c3e72ed934e8eb9d5e13ac0103951024a92533
Author: remm
AuthorDate: Mon Feb 5 10:49:57 2024 +0100
Differentiate trace and debug log levels
---
.../membership/cloud/AbstractStreamProvider.java | 8 +++
.../membership/cloud/CloudMembershipService.java | 8 +++
.../valves/CrawlerSessionManagerValve.java | 20
.../catalina/valves/ExtendedAccessLogValve.java| 8 +++
.../apache/catalina/valves/PersistentValve.java| 28 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 8 +++
.../catalina/valves/StuckThreadDetectionValve.java | 4 ++--
.../catalina/valves/rewrite/RewriteValve.java | 12 +-
webapps/docs/changelog.xml | 4
9 files changed, 52 insertions(+), 48 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 9902ec1ff2..2c283890a7 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -106,12 +106,12 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
URLConnection connection = openConnection(url, headers,
connectTimeout, readTimeout);
if (connection instanceof HttpsURLConnection) {
((HttpsURLConnection)
connection).setSSLSocketFactory(getSocketFactory());
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
}
} else {
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using URLConnection for url [%s].",
url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using URLConnection for url [%s].",
url));
}
}
return connection.getInputStream();
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
index f072861661..19c5e72362 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
@@ -139,8 +139,8 @@ public class CloudMembershipService extends
MembershipServiceBase
} else if (DNS.equals(provider)) {
provider = DNS_PROVIDER_CLASS;
}
-if (log.isDebugEnabled()) {
-log.debug("Using membershipProvider: " + provider);
+if (log.isTraceEnabled()) {
+log.trace("Using membershipProvider: " + provider);
}
membershipProvider =
(MembershipProvider)
Class.forName(provider).getConstructor().newInstance();
@@ -182,8 +182,8 @@ public class CloudMembershipService extends
MembershipServiceBase
@Override
public void setLocalMemberProperties(String listenHost, int listenPort,
int securePort, int udpPort) {
-if (log.isDebugEnabled()) {
-log.debug(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
+if (log.isTraceEnabled()) {
+log.trace(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
Integer.valueOf(listenPort), Integer.valueOf(securePort),
Integer.valueOf(udpPort)));
}
properties.setProperty("tcpListenHost", listenHost);
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 0d4994d06a..b9490f988f 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -180,8 +180,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
String clientIp = request.getRemoteAddr();
String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": ClientIdentifier=" +
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
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 d61ee4b6ce Differentiate trace and debug log levels
d61ee4b6ce is described below
commit d61ee4b6cef976c7252d74086610c414cf809ce0
Author: remm
AuthorDate: Mon Feb 5 10:49:57 2024 +0100
Differentiate trace and debug log levels
---
.../membership/cloud/AbstractStreamProvider.java | 8 +++
.../membership/cloud/CloudMembershipService.java | 8 +++
.../valves/CrawlerSessionManagerValve.java | 20
.../catalina/valves/ExtendedAccessLogValve.java| 8 +++
.../apache/catalina/valves/PersistentValve.java| 28 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 8 +++
.../catalina/valves/StuckThreadDetectionValve.java | 4 ++--
.../catalina/valves/rewrite/RewriteValve.java | 12 +-
webapps/docs/changelog.xml | 4
9 files changed, 52 insertions(+), 48 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 9902ec1ff2..2c283890a7 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -106,12 +106,12 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
URLConnection connection = openConnection(url, headers,
connectTimeout, readTimeout);
if (connection instanceof HttpsURLConnection) {
((HttpsURLConnection)
connection).setSSLSocketFactory(getSocketFactory());
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
}
} else {
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using URLConnection for url [%s].",
url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using URLConnection for url [%s].",
url));
}
}
return connection.getInputStream();
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
index f072861661..19c5e72362 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
@@ -139,8 +139,8 @@ public class CloudMembershipService extends
MembershipServiceBase
} else if (DNS.equals(provider)) {
provider = DNS_PROVIDER_CLASS;
}
-if (log.isDebugEnabled()) {
-log.debug("Using membershipProvider: " + provider);
+if (log.isTraceEnabled()) {
+log.trace("Using membershipProvider: " + provider);
}
membershipProvider =
(MembershipProvider)
Class.forName(provider).getConstructor().newInstance();
@@ -182,8 +182,8 @@ public class CloudMembershipService extends
MembershipServiceBase
@Override
public void setLocalMemberProperties(String listenHost, int listenPort,
int securePort, int udpPort) {
-if (log.isDebugEnabled()) {
-log.debug(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
+if (log.isTraceEnabled()) {
+log.trace(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
Integer.valueOf(listenPort), Integer.valueOf(securePort),
Integer.valueOf(udpPort)));
}
properties.setProperty("tcpListenHost", listenHost);
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 04472e5562..18cd9a26b4 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -180,8 +180,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
String clientIp = request.getRemoteAddr();
String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": ClientIdentifier=" +
(tomcat) branch main updated: Differentiate trace and debug log levels
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 d75334e8c3 Differentiate trace and debug log levels
d75334e8c3 is described below
commit d75334e8c3734b53b879cff395c5474321c9baba
Author: remm
AuthorDate: Mon Feb 5 10:49:57 2024 +0100
Differentiate trace and debug log levels
---
.../membership/cloud/AbstractStreamProvider.java | 8 +++
.../membership/cloud/CloudMembershipService.java | 8 +++
.../valves/CrawlerSessionManagerValve.java | 20
.../catalina/valves/ExtendedAccessLogValve.java| 8 +++
.../apache/catalina/valves/PersistentValve.java| 28 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 8 +++
.../catalina/valves/StuckThreadDetectionValve.java | 4 ++--
.../catalina/valves/rewrite/RewriteValve.java | 12 +-
webapps/docs/changelog.xml | 4
9 files changed, 52 insertions(+), 48 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 9902ec1ff2..2c283890a7 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -106,12 +106,12 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
URLConnection connection = openConnection(url, headers,
connectTimeout, readTimeout);
if (connection instanceof HttpsURLConnection) {
((HttpsURLConnection)
connection).setSSLSocketFactory(getSocketFactory());
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using HttpsURLConnection with
SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url));
}
} else {
-if (log.isDebugEnabled()) {
-log.debug(String.format("Using URLConnection for url [%s].",
url));
+if (log.isTraceEnabled()) {
+log.trace(String.format("Using URLConnection for url [%s].",
url));
}
}
return connection.getInputStream();
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
index f072861661..19c5e72362 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
@@ -139,8 +139,8 @@ public class CloudMembershipService extends
MembershipServiceBase
} else if (DNS.equals(provider)) {
provider = DNS_PROVIDER_CLASS;
}
-if (log.isDebugEnabled()) {
-log.debug("Using membershipProvider: " + provider);
+if (log.isTraceEnabled()) {
+log.trace("Using membershipProvider: " + provider);
}
membershipProvider =
(MembershipProvider)
Class.forName(provider).getConstructor().newInstance();
@@ -182,8 +182,8 @@ public class CloudMembershipService extends
MembershipServiceBase
@Override
public void setLocalMemberProperties(String listenHost, int listenPort,
int securePort, int udpPort) {
-if (log.isDebugEnabled()) {
-log.debug(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
+if (log.isTraceEnabled()) {
+log.trace(String.format("setLocalMemberProperties(%s, %d, %d,
%d)", listenHost,
Integer.valueOf(listenPort), Integer.valueOf(securePort),
Integer.valueOf(udpPort)));
}
properties.setProperty("tcpListenHost", listenHost);
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 04472e5562..18cd9a26b4 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -180,8 +180,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
String clientIp = request.getRemoteAddr();
String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
-if (log.isDebugEnabled()) {
-log.debug(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
+if (log.isTraceEnabled()) {
+log.trace(request.hashCode() + ": ClientIdentifier=" +
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
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 3358b627eb Differentiate trace and debug log levels
3358b627eb is described below
commit 3358b627eb6d5b6974f0439bbbc21cca86c66e69
Author: remm
AuthorDate: Mon Feb 5 09:53:34 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/session/DataSourceStore.java | 12 +++---
java/org/apache/catalina/session/FileStore.java| 12 +++---
java/org/apache/catalina/session/ManagerBase.java | 8 ++--
.../catalina/session/PersistentManagerBase.java| 28 +++---
.../apache/catalina/session/StandardManager.java | 36 +-
.../apache/catalina/session/StandardSession.java | 16
java/org/apache/catalina/session/StoreBase.java| 8 ++--
java/org/apache/catalina/startup/Bootstrap.java| 12 +++---
.../catalina/startup/ClassLoaderFactory.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 44 +++---
java/org/apache/catalina/startup/EngineConfig.java | 8 ++--
java/org/apache/catalina/startup/HostConfig.java | 24 ++--
java/org/apache/catalina/startup/Tool.java | 8 ++--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 4 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 4 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 13 +++
.../org/apache/catalina/storeconfig/ManagerSF.java | 4 +-
.../catalina/storeconfig/NamingResourcesSF.java| 5 +--
java/org/apache/catalina/storeconfig/RealmSF.java | 4 +-
.../catalina/storeconfig/StandardServerSF.java | 14 ---
.../catalina/storeconfig/StoreFactoryBase.java | 4 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 10 ++---
.../catalina/storeconfig/WatchedResourceSF.java| 5 +--
.../catalina/storeconfig/WrapperLifecycleSF.java | 5 +--
.../catalina/storeconfig/WrapperListenerSF.java| 4 +-
27 files changed, 151 insertions(+), 169 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index d52f00d4fc..839c1b1671 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -820,22 +820,22 @@ public final class CGIServlet extends HttpServlet {
webAppRootDir = webAppRootDir + File.separator + cgiPathPrefix;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
}
File currentLocation = new File(webAppRootDir);
StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
cginameBuilder.append('/').append(nextElement);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
}
String cginame = cginameBuilder.toString();
@@ -852,8 +852,8 @@ public final class CGIServlet extends HttpServlet {
scriptname = contextPath + servletPath + cginame;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
}
return new String[] { path, scriptname, cginame, name };
}
@@ -1437,8 +1437,8 @@ public final class CGIServlet extends HttpServlet {
throw new IOException(this.getClass().getName() + ": not ready
to run.");
}
-if (log.isDebugEnabled()) {
-log.debug("envp: [" + env +
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
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 6e934bb3f5 Differentiate trace and debug log levels
6e934bb3f5 is described below
commit 6e934bb3f5214c9ee800a1df0eb6008a455e296f
Author: remm
AuthorDate: Mon Feb 5 09:53:34 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/session/DataSourceStore.java | 12 +++---
java/org/apache/catalina/session/FileStore.java| 12 +++---
java/org/apache/catalina/session/ManagerBase.java | 8 ++--
.../catalina/session/PersistentManagerBase.java| 28 +++---
.../apache/catalina/session/StandardManager.java | 36 +-
.../apache/catalina/session/StandardSession.java | 16
java/org/apache/catalina/session/StoreBase.java| 8 ++--
java/org/apache/catalina/startup/Bootstrap.java| 12 +++---
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../catalina/startup/ClassLoaderFactory.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 44 +++---
java/org/apache/catalina/startup/EngineConfig.java | 8 ++--
java/org/apache/catalina/startup/HostConfig.java | 24 ++--
java/org/apache/catalina/startup/Tool.java | 8 ++--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 4 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 4 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 13 +++
.../org/apache/catalina/storeconfig/ManagerSF.java | 4 +-
.../catalina/storeconfig/NamingResourcesSF.java| 5 +--
java/org/apache/catalina/storeconfig/RealmSF.java | 4 +-
.../catalina/storeconfig/StandardServerSF.java | 14 ---
.../catalina/storeconfig/StoreFactoryBase.java | 4 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 10 ++---
.../catalina/storeconfig/WatchedResourceSF.java| 5 +--
.../catalina/storeconfig/WrapperLifecycleSF.java | 5 +--
.../catalina/storeconfig/WrapperListenerSF.java| 4 +-
28 files changed, 153 insertions(+), 171 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index bdbeffb032..4a41795f17 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -820,22 +820,22 @@ public final class CGIServlet extends HttpServlet {
webAppRootDir = webAppRootDir + File.separator + cgiPathPrefix;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
}
File currentLocation = new File(webAppRootDir);
StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
cginameBuilder.append('/').append(nextElement);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
}
String cginame = cginameBuilder.toString();
@@ -852,8 +852,8 @@ public final class CGIServlet extends HttpServlet {
scriptname = contextPath + servletPath + cginame;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
}
return new String[] { path, scriptname, cginame, name };
}
@@ -1437,8 +1437,8 @@ public final class CGIServlet extends HttpServlet {
throw new IOException(this.getClass().getName() + ": not ready
to run.");
}
-if
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
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 5efcb01a7f Differentiate trace and debug log levels
5efcb01a7f is described below
commit 5efcb01a7feeb0ec1212248d56e594503e4575e5
Author: remm
AuthorDate: Mon Feb 5 09:53:34 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/session/DataSourceStore.java | 12 +++---
java/org/apache/catalina/session/FileStore.java| 12 +++---
java/org/apache/catalina/session/ManagerBase.java | 8 ++--
.../catalina/session/PersistentManagerBase.java| 28 +++---
.../apache/catalina/session/StandardManager.java | 36 +-
.../apache/catalina/session/StandardSession.java | 16
java/org/apache/catalina/session/StoreBase.java| 8 ++--
java/org/apache/catalina/startup/Bootstrap.java| 12 +++---
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../catalina/startup/ClassLoaderFactory.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 44 +++---
java/org/apache/catalina/startup/EngineConfig.java | 8 ++--
java/org/apache/catalina/startup/HostConfig.java | 24 ++--
java/org/apache/catalina/startup/Tool.java | 8 ++--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 4 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 4 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 13 +++
.../org/apache/catalina/storeconfig/ManagerSF.java | 4 +-
.../catalina/storeconfig/NamingResourcesSF.java| 5 +--
java/org/apache/catalina/storeconfig/RealmSF.java | 4 +-
.../catalina/storeconfig/StandardServerSF.java | 14 ---
.../catalina/storeconfig/StoreFactoryBase.java | 4 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 10 ++---
.../catalina/storeconfig/WatchedResourceSF.java| 5 +--
.../catalina/storeconfig/WrapperLifecycleSF.java | 5 +--
.../catalina/storeconfig/WrapperListenerSF.java| 4 +-
28 files changed, 153 insertions(+), 171 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 797f38ea34..30b2097b36 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -821,22 +821,22 @@ public final class CGIServlet extends HttpServlet {
webAppRootDir = webAppRootDir + File.separator + cgiPathPrefix;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
}
File currentLocation = new File(webAppRootDir);
StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
cginameBuilder.append('/').append(nextElement);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
}
String cginame = cginameBuilder.toString();
@@ -853,8 +853,8 @@ public final class CGIServlet extends HttpServlet {
scriptname = contextPath + servletPath + cginame;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
}
return new String[] { path, scriptname, cginame, name };
}
@@ -1436,8 +1436,8 @@ public final class CGIServlet extends HttpServlet {
throw new IOException(this.getClass().getName() + ": not ready
to run.");
}
-if
(tomcat) branch main updated: Differentiate trace and debug log levels
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 eaff01e9d1 Differentiate trace and debug log levels
eaff01e9d1 is described below
commit eaff01e9d14884a520691ee4b1af2fe330cb46a2
Author: remm
AuthorDate: Mon Feb 5 09:53:34 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/session/DataSourceStore.java | 12 +++---
java/org/apache/catalina/session/FileStore.java| 12 +++---
java/org/apache/catalina/session/ManagerBase.java | 8 ++--
.../catalina/session/PersistentManagerBase.java| 28 +++---
.../apache/catalina/session/StandardManager.java | 36 +-
.../apache/catalina/session/StandardSession.java | 16
java/org/apache/catalina/session/StoreBase.java| 8 ++--
java/org/apache/catalina/startup/Bootstrap.java| 12 +++---
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../catalina/startup/ClassLoaderFactory.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 44 +++---
java/org/apache/catalina/startup/EngineConfig.java | 8 ++--
java/org/apache/catalina/startup/HostConfig.java | 24 ++--
java/org/apache/catalina/startup/Tool.java | 8 ++--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 4 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 4 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 13 +++
.../org/apache/catalina/storeconfig/ManagerSF.java | 4 +-
.../catalina/storeconfig/NamingResourcesSF.java| 5 +--
java/org/apache/catalina/storeconfig/RealmSF.java | 4 +-
.../catalina/storeconfig/StandardServerSF.java | 14 ---
.../catalina/storeconfig/StoreFactoryBase.java | 4 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 10 ++---
.../catalina/storeconfig/WatchedResourceSF.java| 5 +--
.../catalina/storeconfig/WrapperLifecycleSF.java | 5 +--
.../catalina/storeconfig/WrapperListenerSF.java| 4 +-
28 files changed, 153 insertions(+), 171 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 86d29f3c4f..c00d98bd4a 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -826,22 +826,22 @@ public final class CGIServlet extends HttpServlet {
webAppRootDir = webAppRootDir + File.separator + cgiPathPrefix;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
}
File currentLocation = new File(webAppRootDir);
StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
cginameBuilder.append('/').append(nextElement);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
}
String cginame = cginameBuilder.toString();
@@ -858,8 +858,8 @@ public final class CGIServlet extends HttpServlet {
scriptname = contextPath + servletPath + cginame;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
}
return new String[] { path, scriptname, cginame, name };
}
@@ -1441,8 +1441,8 @@ public final class CGIServlet extends HttpServlet {
throw new IOException(this.getClass().getName() + ": not ready
to run.");
}
-if
(tomcat-native) branch 1.2.x updated: Update links to Tomcat docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new b34e67ab5 Update links to Tomcat docs b34e67ab5 is described below commit b34e67ab51cde41547505758bb7e09b6a03ce77b Author: Mark Thomas AuthorDate: Mon Feb 5 08:46:39 2024 + Update links to Tomcat docs --- xdocs/index.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index f5bdc049a..30efa3aff 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -205,7 +205,8 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080 Refer to the tomcat documentation to configure the connectors (See -http://tomcat.apache.org/tomcat-10.0-doc/apr.html;>Tomcat 10.0.x, +http://tomcat.apache.org/tomcat-11.0-doc/apr.html;>Tomcat 11.0.x, +http://tomcat.apache.org/tomcat-10.1-doc/apr.html;>Tomcat 10.1.x, http://tomcat.apache.org/tomcat-9.0-doc/apr.html;>Tomcat 9.0.x and http://tomcat.apache.org/tomcat-8.5-doc/apr.html;>Tomcat 8.5.x) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated (d8edaeb9c -> c53512881)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from d8edaeb9c Update OpenSSL 3.0.x patch for addition of INT64_MAx constant new eec794374 Add 1.3.x branch new 49befd6de Consistent formatting. Add missing entries. new a06fa4c84 Add a version to the title new 38d316760 Update ASF logo new c53512881 News links should be in reverse date order The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: jnirelease.sh | 5 +- xdocs/images/asf-feather.png| Bin 40042 -> 0 bytes xdocs/images/asf-logo.svg | 226 xdocs/miscellaneous/project.xml | 23 ++-- xdocs/news/project.xml | 10 +- xdocs/project.xml | 8 +- xdocs/style.xsl | 2 +- 7 files changed, 253 insertions(+), 21 deletions(-) delete mode 100644 xdocs/images/asf-feather.png create mode 100644 xdocs/images/asf-logo.svg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 03/05: Add a version to the title
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit a06fa4c846b30fb8f6d16af634be443b38e6701b Author: Mark Thomas AuthorDate: Mon Feb 5 08:29:52 2024 + Add a version to the title --- xdocs/miscellaneous/project.xml | 2 +- xdocs/news/project.xml | 2 +- xdocs/project.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 8ac87194a..f58f3d20b 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -18,7 +18,7 @@ http://tomcat.apache.org/;> - The Apache Tomcat Native Library - Miscellaneous Documentation + The Apache Tomcat Native Library 2.0 - Miscellaneous Documentation The Apache Tomcat Native Library - Miscellaneous Documentation diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index cb4fc5eae..f898536f5 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -18,7 +18,7 @@ http://tomcat.apache.org/;> - The Apache Tomcat Native Library - News + The Apache Tomcat Native Library 2.0 - News The Apache Tomcat Native Library - News diff --git a/xdocs/project.xml b/xdocs/project.xml index 0c1cd793c..60cfa2bd3 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -18,7 +18,7 @@ http://tomcat.apache.org/;> - The Apache Tomcat Native Library + The Apache Tomcat Native Library 2.0 The Apache Tomcat Native Library - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 02/05: Consistent formatting. Add missing entries.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 49befd6de491f1bd499e82887b9484f3c293cdcf Author: Mark Thomas AuthorDate: Mon Feb 5 08:27:04 2024 + Consistent formatting. Add missing entries. --- xdocs/miscellaneous/project.xml | 23 --- xdocs/news/project.xml | 10 +- xdocs/project.xml | 8 +--- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 786b2113b..8ac87194a 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,27 +16,28 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> -The Apache Tomcat Native - Miscellaneous Documentation + The Apache Tomcat Native Library - Miscellaneous Documentation - - The Apache Tomcat Native - Miscellaneous Documentation - - + +The Apache Tomcat Native Library - Miscellaneous Documentation + + - + - - + + - + + - + diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index ec408b7ed..cb4fc5eae 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - The Apache Tomcat Native - News + The Apache Tomcat Native Library - News -The Apache Tomcat Native - News +The Apache Tomcat Native Library - News @@ -30,8 +30,8 @@ - - + + diff --git a/xdocs/project.xml b/xdocs/project.xml index 187634c8f..0c1cd793c 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - Apache Tomcat Native Library + The Apache Tomcat Native Library -Apache Tomcat Native Library +The Apache Tomcat Native Library @@ -36,6 +36,8 @@ + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 04/05: Update ASF logo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 38d316760990170df3518c9c782934ae33967537 Author: Mark Thomas AuthorDate: Mon Feb 5 08:32:03 2024 + Update ASF logo --- xdocs/images/asf-feather.png | Bin 40042 -> 0 bytes xdocs/images/asf-logo.svg| 226 +++ xdocs/style.xsl | 2 +- 3 files changed, 227 insertions(+), 1 deletion(-) diff --git a/xdocs/images/asf-feather.png b/xdocs/images/asf-feather.png deleted file mode 100644 index 7b596e668..0 Binary files a/xdocs/images/asf-feather.png and /dev/null differ diff --git a/xdocs/images/asf-logo.svg b/xdocs/images/asf-logo.svg new file mode 100644 index 0..e24cbe529 --- /dev/null +++ b/xdocs/images/asf-logo.svg @@ -0,0 +1,226 @@ + + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" +viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xdocs/style.xsl b/xdocs/style.xsl index 7e7e2c848..d298f0469 100644 --- a/xdocs/style.xsl +++ b/xdocs/style.xsl @@ -32,7 +32,7 @@ - + https://bz.apache.org/bugzilla/show_bug.cgi?id='"/> https://github.com/apache/tomcat-native/pull/'"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 05/05: News links should be in reverse date order
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit c535128817d035ce2e03feb76e0a7f8f796254ec Author: Mark Thomas AuthorDate: Mon Feb 5 08:39:06 2024 + News links should be in reverse date order --- xdocs/project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/project.xml b/xdocs/project.xml index 60cfa2bd3..b483b67d4 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -35,8 +35,8 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/05: Add 1.3.x branch
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit eec79437436fa8a8970700ad9cdf93833e49ec0b
Author: Mark Thomas
AuthorDate: Mon Feb 5 08:01:24 2024 +
Add 1.3.x branch
---
jnirelease.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jnirelease.sh b/jnirelease.sh
index 95bcd8fda..e1a15d184 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -85,7 +85,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
echo ""
echo "Unknown Git tag/branch"
echo "Use:"
-echo " --ver=|1.1.x|1.2.x|main|."
+echo " --ver=|1.1.x|1.2.x|1.3.x|main|."
echo ""
exit 1
fi
@@ -136,6 +136,9 @@ fi
if [ "x$JKJNIEXT" = "xmain" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/main | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
+elif [ "x$JKJNIEXT" = "x1.3.x" ]; then
+JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.3.x | awk '{print $1}'`
+JKJNIVER="$JKJNIEXT-$JKJNIHASH"
elif [ "x$JKJNIEXT" = "x1.2.x" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.2.x | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 03/03: Consistent formatting. Add missing entries. Add version to title.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 34a274f39b836c9d9766e1707018b3b8b61c5506 Author: Mark Thomas AuthorDate: Mon Feb 5 08:27:04 2024 + Consistent formatting. Add missing entries. Add version to title. --- xdocs/miscellaneous/project.xml | 51 + xdocs/news/project.xml | 10 xdocs/project.xml | 8 --- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 1153ee1ea..31248d42e 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -16,41 +16,42 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> -The Apache Tomcat Native - Miscellaneous Documentation + The Apache Tomcat Native Library 1.2 - Miscellaneous Documentation - - The Apache Tomcat Native - Miscellaneous Documentation - - + +The Apache Tomcat Native Library - Miscellaneous Documentation + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml index 115d900f0..8502c18fe 100644 --- a/xdocs/news/project.xml +++ b/xdocs/news/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - The Apache Tomcat Native - News + The Apache Tomcat Native Library 1.2 - News -The Apache Tomcat Native - News +The Apache Tomcat Native Library - News @@ -30,8 +30,8 @@ - - + + diff --git a/xdocs/project.xml b/xdocs/project.xml index 9184f9688..664c14774 100644 --- a/xdocs/project.xml +++ b/xdocs/project.xml @@ -16,12 +16,12 @@ limitations under the License. --> http://tomcat.apache.org/;> +href="http://tomcat.apache.org/;> - Apache Tomcat Native Library + The Apache Tomcat Native Library 1.2 -Apache Tomcat Native Library +The Apache Tomcat Native Library @@ -35,6 +35,7 @@ + @@ -51,5 +52,6 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/03: Add 1.3.x branch
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 1b030486091ed5ee9076c007ad85df277d5428bd
Author: Mark Thomas
AuthorDate: Mon Feb 5 08:01:24 2024 +
Add 1.3.x branch
---
jnirelease.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jnirelease.sh b/jnirelease.sh
index d781c355d..f76cda464 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -85,7 +85,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
echo ""
echo "Unknown Git tag/branch"
echo "Use:"
-echo " --ver=|1.1.x|1.2.x|main|."
+echo " --ver=|1.1.x|1.2.x|1.3.x|main|."
echo ""
exit 1
fi
@@ -136,6 +136,9 @@ fi
if [ "x$JKJNIEXT" = "xmain" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/main | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
+elif [ "x$JKJNIEXT" = "x1.3.x" ]; then
+JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.3.x | awk '{print $1}'`
+JKJNIVER="$JKJNIEXT-$JKJNIHASH"
elif [ "x$JKJNIEXT" = "x1.2.x" ]; then
JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.2.x | awk '{print $1}'`
JKJNIVER="$JKJNIEXT-$JKJNIHASH"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 02/03: Update ASF logo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 5ce3ac2f7ac7b5ff6dc726dc6d4a80186f1f0fdf Author: Mark Thomas AuthorDate: Mon Feb 5 08:32:03 2024 + Update ASF logo --- xdocs/images/asf-feather.png | Bin 40042 -> 0 bytes xdocs/images/asf-logo.svg| 226 +++ xdocs/style.xsl | 2 +- 3 files changed, 227 insertions(+), 1 deletion(-) diff --git a/xdocs/images/asf-feather.png b/xdocs/images/asf-feather.png deleted file mode 100644 index 7b596e668..0 Binary files a/xdocs/images/asf-feather.png and /dev/null differ diff --git a/xdocs/images/asf-logo.svg b/xdocs/images/asf-logo.svg new file mode 100644 index 0..e24cbe529 --- /dev/null +++ b/xdocs/images/asf-logo.svg @@ -0,0 +1,226 @@ + + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" +viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xdocs/style.xsl b/xdocs/style.xsl index e7b1cb566..3def0fe66 100644 --- a/xdocs/style.xsl +++ b/xdocs/style.xsl @@ -34,7 +34,7 @@ http://tomcat.apache.org/'"/> - + https://bz.apache.org/bugzilla/show_bug.cgi?id='"/> https://github.com/apache/tomcat-native/pull/'"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.2.x updated (d203c5364 -> 34a274f39)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from d203c5364 Update ignores new 1b0304860 Add 1.3.x branch new 5ce3ac2f7 Update ASF logo new 34a274f39 Consistent formatting. Add missing entries. Add version to title. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: jnirelease.sh | 5 +- xdocs/images/asf-feather.png| Bin 40042 -> 0 bytes xdocs/images/asf-logo.svg | 226 xdocs/miscellaneous/project.xml | 51 - xdocs/news/project.xml | 10 +- xdocs/project.xml | 8 +- xdocs/style.xsl | 2 +- 7 files changed, 267 insertions(+), 35 deletions(-) delete mode 100644 xdocs/images/asf-feather.png create mode 100644 xdocs/images/asf-logo.svg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
