[httpcomponents-core] 02/04: Merge tag 'upstream/4.4.6'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository httpcomponents-core.

commit df84e93bb8bc02d285823012d4c4af450dfa9364
Merge: 7e5de99 4f4488c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 13 00:38:50 2017 +0100

    Merge tag 'upstream/4.4.6'
    
    Upstream version 4.4.6

 .travis.yml                                        |  25 +++
 NOTICE.txt                                         |   2 +-
 RELEASE_NOTES.txt                                  |  38 +++++
 doap_HttpComponents_Core.rdf                       | 183 +++++++++++++++++++++
 httpcore-ab/pom.xml                                |   2 +-
 httpcore-nio/pom.xml                               |   2 +-
 .../http/impl/nio/SSLClientIOEventDispatch.java    |   5 +
 .../http/impl/nio/SSLServerIOEventDispatch.java    |   5 +
 .../nio/reactor/SSLIOSessionHandlerAdaptor.java    |   2 +
 .../impl/nio/reactor/SSLSetupHandlerAdaptor.java   |   2 +
 .../http/nio/entity/BufferingNHttpEntity.java      |   2 +
 .../nio/entity/ConsumingNHttpEntityTemplate.java   |   2 +
 .../apache/http/nio/entity/NHttpEntityWrapper.java |   2 +
 .../http/nio/entity/SkipContentListener.java       |   2 +
 .../http/nio/protocol/AsyncNHttpClientHandler.java |   9 +
 .../nio/protocol/AsyncNHttpServiceHandler.java     |  12 ++
 .../BasicAsyncRequestExecutionHandler.java         |  18 ++
 .../nio/protocol/BufferingHttpClientHandler.java   |  14 ++
 .../nio/protocol/BufferingHttpServiceHandler.java  |  11 ++
 .../protocol/HttpAsyncRequestHandlerRegistry.java  |   1 +
 .../nio/protocol/NHttpRequestHandlerRegistry.java  |   1 +
 .../apache/http/nio/protocol/NullNHttpEntity.java  |   2 +
 .../nio/protocol/SimpleNHttpRequestHandler.java    |   1 +
 .../nio/protocol/ThrottlingHttpClientHandler.java  |  11 ++
 .../nio/protocol/ThrottlingHttpServiceHandler.java |  10 ++
 .../org/apache/http/impl/nio/SSLContextUtils.java  |   2 +-
 .../apache/http/impl/nio/bootstrap/HttpServer.java |   6 +-
 .../http/impl/nio/bootstrap/ServerBootstrap.java   |   2 +-
 .../nio/reactor/DefaultConnectingIOReactor.java    |   2 +-
 .../http/impl/nio/reactor/IOReactorConfig.java     |   2 +-
 .../apache/http/nio/entity/NByteArrayEntity.java   |   1 +
 .../org/apache/http/nio/entity/NFileEntity.java    |   1 +
 .../org/apache/http/nio/entity/NStringEntity.java  |   1 +
 .../apache/http/nio/pool/AbstractNIOConnPool.java  |  41 ++++-
 .../apache/http/nio/pool/RouteSpecificPool.java    |   4 +-
 .../protocol/AbstractAsyncResponseConsumer.java    |  10 +-
 .../nio/protocol/HttpAsyncRequestExecutor.java     |   9 +-
 .../http/nio/protocol/HttpAsyncRequester.java      |  10 +-
 .../apache/http/nio/protocol/HttpAsyncService.java |   4 +-
 .../apache/http/nio/reactor/ssl/SSLIOSession.java  |  31 ++--
 .../http/nio/integration/TestTruncatedChunks.java  |   2 +-
 .../org/apache/http/nio/pool/TestNIOConnPool.java  |  68 +++++++-
 httpcore-osgi/pom.xml                              |   2 +-
 .../src/main/appended-resources/META-INF/LICENSE   |  64 -------
 .../src/main/appended-resources/META-INF/NOTICE    |   2 -
 .../src/test/java/org/apache/http/osgi/Common.java |   2 +-
 httpcore/pom.xml                                   |  26 +--
 .../src/main/appended-resources/META-INF/LICENSE   |  64 -------
 .../src/main/appended-resources/META-INF/NOTICE    |   2 -
 .../src/main/java/org/apache/http/HttpHost.java    |   2 +-
 .../org/apache/http/config/ConnectionConfig.java   |   2 +
 .../java/org/apache/http/config/SocketConfig.java  |   2 +-
 .../java/org/apache/http/entity/ContentType.java   |  60 +++++--
 .../org/apache/http/impl/BHttpConnectionBase.java  |   2 +-
 .../http/impl/DefaultConnectionReuseStrategy.java  |  42 +++--
 .../org/apache/http/impl/bootstrap/HttpServer.java |   8 +-
 .../http/impl/bootstrap/RequestListener.java       |   2 +-
 .../http/impl/bootstrap/ServerBootstrap.java       |   2 +-
 .../org/apache/http/impl/bootstrap/Worker.java     |   4 +-
 .../apache/http/impl/io/ChunkedInputStream.java    |   2 +-
 .../http/message/BasicHeaderValueParser.java       |   2 +-
 .../org/apache/http/pool/AbstractConnPool.java     | 132 +++++++++++----
 .../main/java/org/apache/http/pool/PoolEntry.java  |   3 +-
 .../java/org/apache/http/pool/PoolEntryFuture.java | 161 ------------------
 .../org/apache/http/pool/RouteSpecificPool.java    |  13 +-
 .../java/org/apache/http/util/EntityUtils.java     |  85 ++++++----
 .../test/java/org/apache/http/TestHttpHost.java    |   6 +-
 .../impl/TestDefaultConnectionReuseStrategy.java   |  24 +++
 .../org/apache/http/impl/io/TestChunkCoding.java   |   6 +-
 .../http/impl/io/TestSessionInOutBuffers.java      |   4 +-
 .../org/apache/http/integration/TestSyncHttp.java  |   5 +-
 .../java/org/apache/http/pool/TestConnPool.java    |   4 +-
 .../apache/http/pool/TestRouteSpecificPool.java    |   7 +-
 .../http/protocol/TestUriPatternMatcher.java       |   4 +-
 .../org/apache/http/ssl/TestSSLContextBuilder.java |  24 ++-
 pom.xml                                            |  21 ++-
 76 files changed, 853 insertions(+), 498 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-core.git