[cxf] 03/03: Recording .gitmergeinfo Changes
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 e494dc257ab73ca50d7228cf2524872d79e906ca Author: Andriy Redko AuthorDate: Sat Sep 30 08:55:04 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 9f74b721d7..77647b5d88 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -569,6 +569,7 @@ M b2a41f877800a811699740c1ad68f8f10d8fafed M b2ee30f1728dba63ebf27b2bbae2836d633ccb42 M b302f29dda345aa5c40ca0fd41f6203e4826d4b2 M b3374081627e6ead5c9dba6c6e937d397e0c713c +M b365b5b58ca4997851c49281de7c807e40da37ed M b3d51944942ce2a63ea7f6f05980ab9164d2a79e M b40a2e5bf71e70a92bb5c782890d017c1fb2922a M b44d82d3496cfd27e920b81c563c06aa4f7763e4 @@ -672,6 +673,7 @@ M e24896930283395f953143d6d517aea6ad3675da M e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a M e2c881bfc0d8a95424f0a5343ab0b1bdbd16eb0f M e323b0724a6899e675ff020e70bc7119ab47c04f +M e4537e769c3a62dfe96eb850a89cac3580fc8b51 M e4787285893f1f2759d151a2719cd63168a92aef M e493398886b19b1a6dd75f2bc99a2914ddb63441 M e4a3e2493825ebae748ef8cd6e2f8c148fd4303d @@ -699,6 +701,7 @@ M eefbb64995c59fea459ee7e2fe324831ebcc10c3 M f00ca03f0852b8be195adbcee20c164a189e8b6e M f03c3b0f9dccf7ebec8e1016247091cb363344ea M f05bdcfeafebdbe93c6d189514e084ae1d40cac0 +M f0cd0884594281e630c83de19d9ec7d6a45046bb M f125c9675817f159fbfc565c0cc0406dcfd2216d M f2ad3c15f9ed98cdbc7cb2abdaa0afda13faae24 M f355ccc3a4bfc7d47485f1b623723e5b2cac96f5
[cxf] 02/03: Bump cxf.netty.version from 4.1.98.Final to 4.1.99.Final (#1457)
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 39156b90b03ab5827f5beb8435dbeea5bf60ac06 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 29 15:19:06 2023 -0400 Bump cxf.netty.version from 4.1.98.Final to 4.1.99.Final (#1457) Bumps `cxf.netty.version` from 4.1.98.Final to 4.1.99.Final. Updates `io.netty:netty-codec-http` from 4.1.98.Final to 4.1.99.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.98.Final...netty-4.1.99.Final) Updates `io.netty:netty-codec-http2` from 4.1.98.Final to 4.1.99.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.98.Final...netty-4.1.99.Final) Updates `io.netty:netty-codec-socks` from 4.1.98.Final to 4.1.99.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.98.Final...netty-4.1.99.Final) Updates `io.netty:netty-handler-proxy` from 4.1.98.Final to 4.1.99.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.98.Final...netty-4.1.99.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-socks dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b365b5b58ca4997851c49281de7c807e40da37ed) # Conflicts: # distribution/src/main/release/samples/pom.xml --- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 7dea873fdb..a85ac515bf 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -33,7 +33,7 @@ 2.7.16 3.1.7 10.0.16 -4.1.98.Final +4.1.99.Final 4.5.14 5.7.2 2.7.0 diff --git a/parent/pom.xml b/parent/pom.xml index fb8cd8eb58..24e42b5646 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -177,7 +177,7 @@ 2022.7 3.2.0 [4,5) -4.1.98.Final +4.1.99.Final 2.0.46.Final 2.0.12 3.2.2
[cxf] 01/03: [CXF-8935]:Add doPrivileged block to httpclient.sendAsync() in HttpClientHTTPConduit
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 e5106ca398aee0860d8fe69f0df11692e5c3ad2b
Author: Jim Ma
AuthorDate: Tue Sep 26 11:17:14 2023 +0800
[CXF-8935]:Add doPrivileged block to httpclient.sendAsync() in
HttpClientHTTPConduit
(cherry picked from commit 7e68c884c61f30199b7925c2f9d4020c3a5d6f1d)
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index d99309b3ca..86284ba093 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -548,8 +548,21 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
final BodyHandler handler =
BodyHandlers.ofInputStream();
-
-future = cl.sendAsync(request, handler);
+if (System.getSecurityManager() != null) {
+try {
+future = AccessController.doPrivileged(
+new
PrivilegedExceptionAction>>() {
+@Override
+public
CompletableFuture> run() throws IOException {
+return cl.sendAsync(request, handler);
+}
+});
+} catch (PrivilegedActionException e) {
+throw new RuntimeException(e);
+}
+} else {
+future = cl.sendAsync(request, handler);
+}
future.exceptionally(ex -> {
if (pout != null) {
synchronized (pout) {
[cxf] branch 3.6.x-fixes updated (242d9a76e6 -> e494dc257a)
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 242d9a76e6 Recording .gitmergeinfo Changes new e5106ca398 [CXF-8935]:Add doPrivileged block to httpclient.sendAsync() in HttpClientHTTPConduit new 39156b90b0 Bump cxf.netty.version from 4.1.98.Final to 4.1.99.Final (#1457) new e494dc257a 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 | 3 +++ distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml | 2 +- .../cxf/transport/http/HttpClientHTTPConduit.java | 17 +++-- 4 files changed, 20 insertions(+), 4 deletions(-)
