You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/03/09 15:29:54 UTC
httpcomponents-core git commit: [HTTPCORE-517] Allow SecurityManager
to stop socket connections.
Repository: httpcomponents-core
Updated Branches:
refs/heads/4.4.x b5239a882 -> 0d30dd28e
[HTTPCORE-517] Allow SecurityManager to stop socket connections.
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/0d30dd28
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/0d30dd28
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/0d30dd28
Branch: refs/heads/4.4.x
Commit: 0d30dd28e8dbd4edabb7faa17f72a20c4003a133
Parents: b5239a8
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Mar 9 08:29:51 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Mar 9 08:29:51 2018 -0700
----------------------------------------------------------------------
RELEASE_NOTES.txt | 3 +++
.../apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0d30dd28/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 88bcaf5..362542d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -21,6 +21,9 @@ Changelog
* HTTPCORE-515: Add convenience API org.apache.http.impl.nio.DefaultHttpServerIODispatch.create(T, SSLContext, ConnectionConfig, HttpRequestFactory).
Contributed by Gary Gregory <ggregory at apache.org>
+* HTTPCORE-517: Allow SecurityManager to stop socket connections.
+ Contributed by Gary Gregory <ggregory at apache.org> and Paul Thompson <pathompson at atlassian dot com>
+
Release 4.4.9
-------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0d30dd28/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
index 38598bb..da21c1b 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
@@ -280,6 +280,10 @@ public class DefaultConnectingIOReactor extends AbstractMultiworkerIOReactor
closeChannel(socketChannel);
request.failed(ex);
return;
+ } catch (final SecurityException ex) {
+ closeChannel(socketChannel);
+ request.failed(new IOException(ex));
+ return;
}
final SessionRequestHandle requestHandle = new SessionRequestHandle(request);