You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/11/08 15:51:44 UTC
(cxf) branch 3.6.x-fixes updated (fc508f5098 -> 095c23753a)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from fc508f5098 Update Apache Tomcat to 9.0.111
new 63028ebec9 CXF-9173: Default SO_LINGER induce TCP RST on each connection closure (#2715)
new 66ce298cea Update supported versions in SECURITY.md (#2717)
new 095c23753a Recording .gitmergeinfo Changes
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:
.gitmergeinfo | 1 +
SECURITY.md | 4 ++--
.../http/asyncclient/hc5/AsyncHTTPConduitFactory.java | 14 ++++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
(cxf) 01/03: CXF-9173: Default SO_LINGER induce TCP RST on each connection closure (#2715)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 63028ebec9e9aeef81011de4d9cf04e308ac425f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 8 09:01:51 2025 -0500
CXF-9173: Default SO_LINGER induce TCP RST on each connection closure (#2715)
(cherry picked from commit 8018384606b2c1dfee8a769edfe19254d2295024)
(cherry picked from commit e5bfff5dae74ffda55f77ffdc9fbb41e14861558)
---
.../http/asyncclient/hc5/AsyncHTTPConduitFactory.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/AsyncHTTPConduitFactory.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/AsyncHTTPConduitFactory.java
index 634843dc19..f23cdfec8b 100644
--- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/AsyncHTTPConduitFactory.java
+++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/AsyncHTTPConduitFactory.java
@@ -151,9 +151,9 @@ public class AsyncHTTPConduitFactory implements HTTPConduitFactory {
private int ioThreadCount = IOReactorConfig.DEFAULT.getIoThreadCount();
private long selectInterval = IOReactorConfig.DEFAULT.getSelectInterval().toMilliseconds();
- private int soLinger = IOReactorConfig.DEFAULT.getSoLinger().toMillisecondsIntBound();
+ private TimeValue soLinger = IOReactorConfig.DEFAULT.getSoLinger();
private int soTimeout = IOReactorConfig.DEFAULT.getSoTimeout().toMillisecondsIntBound();
- private boolean soKeepalive = IOReactorConfig.DEFAULT.isSoKeepalive();
+ private boolean soKeepalive = IOReactorConfig.DEFAULT.isSoKeepAlive();
private boolean tcpNoDelay = true;
@@ -223,11 +223,13 @@ public class AsyncHTTPConduitFactory implements HTTPConduitFactory {
selectInterval = getInt(s.get(SELECT_INTERVAL), 1000);
changed |= l != selectInterval;
- i = soLinger;
- soLinger = getInt(s.get(SO_LINGER), -1);
- changed |= i != soLinger;
+ i = soLinger.toSecondsIntBound();
+ // SO_LINGER timeout is set in seconds
+ soLinger = TimeValue.ofSeconds(getInt(s.get(SO_LINGER), -1));
+ changed |= i != soLinger.toSecondsIntBound();
i = soTimeout;
+ // SO_TIMEOUT timeout is set in milliseconds
soTimeout = getInt(s.get(SO_TIMEOUT), 0);
changed |= i != soTimeout;
@@ -338,7 +340,7 @@ public class AsyncHTTPConduitFactory implements HTTPConduitFactory {
final IOReactorConfig config = IOReactorConfig.custom()
.setIoThreadCount(ioThreadCount)
.setSelectInterval(TimeValue.ofMilliseconds(selectInterval))
- .setSoLinger(TimeValue.ofMilliseconds(soLinger))
+ .setSoLinger(soLinger)
.setSoTimeout(Timeout.ofMilliseconds(soTimeout))
.setSoKeepAlive(soKeepalive)
.setTcpNoDelay(tcpNoDelay)
(cxf) 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 095c23753a6181a2688da5ec884aa01f6d858804
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 8 10:15:53 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ef115b3dde..a13cfb5177 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -130,6 +130,7 @@ B 51183f786bc3769100cf2b6af90e5b63ec02ab27
B 514b281bd57fe656a464cc23ba41d1e963103a6e
B 517c8c2ba083e884125d153be02482101bd7dc72
B 52f98447a2068f9446e91e7189c2c440f2e90570
+B 533b26f0bf50e9368633c6fe890b284e7e6827a5
B 538a3869e3edef90ca7c32929ca1911e60ab941f
B 55a299c18f2417d70b8c1d0dae91202e86c0e3ce
B 56667a4295c0e1a9694fc9d6a943447d0f39a575
(cxf) 02/03: Update supported versions in SECURITY.md (#2717)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 66ce298cea5843aecc4f3387d94ae28895b8f6ae
Author: Stefano Cordio <st...@gmail.com>
AuthorDate: Sat Nov 8 16:14:20 2025 +0100
Update supported versions in SECURITY.md (#2717)
(cherry picked from commit 16b26a3c33d38eff5c31ec27e43a29eb376bf638)
(cherry picked from commit 9468f2807a5be0adea1be761f15a68826a293de4)
---
SECURITY.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SECURITY.md b/SECURITY.md
index 9d234fab3f..5b4bb4e298 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,10 +4,10 @@
| Version | Supported |
| ------- | ------------------ |
+| 4.1.x | :white_check_mark: |
| 4.0.x | :white_check_mark: |
| 3.6.x | :white_check_mark: |
-| 3.5.x | :white_check_mark: |
-| <= 3.4.x | :x: |
+| <= 3.5.x | :x: |
## Reporting a Vulnerability