[netty] 02/04: Merge tag 'upstream/4.0.42'

[Emmanuel Bourg]

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

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

commit 14bef9e6a14affe87b23499e3cad27c1d453621f
Merge: 08098dc 5c2ec61
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 30 00:08:38 2016 +0200

    Merge tag 'upstream/4.0.42'
    
    Upstream version 4.0.42

 all/pom.xml                                        |   2 +-
 buffer/pom.xml                                     |   2 +-
 .../main/java/io/netty/buffer/AbstractByteBuf.java |   2 +-
 .../buffer/AbstractReferenceCountedByteBuf.java    |  44 +---
 .../src/main/java/io/netty/buffer/PoolArena.java   |  23 +++
 .../src/main/java/io/netty/buffer/PoolChunk.java   |   4 +
 .../main/java/io/netty/buffer/PoolChunkList.java   |  10 +-
 .../src/main/java/io/netty/buffer/PoolSubpage.java |   6 +
 .../java/io/netty/buffer/PooledDirectByteBuf.java  |   5 +-
 .../java/io/netty/buffer/PooledHeapByteBuf.java    |   4 +-
 .../io/netty/buffer/UnpooledDirectByteBuf.java     |   8 +-
 .../java/io/netty/buffer/UnpooledHeapByteBuf.java  |   4 +-
 .../java/io/netty/buffer/UnsafeByteBufUtil.java    |  13 +-
 .../java/io/netty/buffer/AbstractByteBufTest.java  |  60 ++++++
 .../java/io/netty/buffer/SlicedByteBufTest.java    |  27 +++
 .../test/java/io/netty/buffer/UnpooledTest.java    |  26 +++
 .../buffer/WrappedUnpooledUnsafeByteBufTest.java   |  12 ++
 codec-haproxy/pom.xml                              |   2 +-
 .../handler/codec/haproxy/HAProxyMessage.java      |   3 +
 codec-http/pom.xml                                 |   2 +-
 .../handler/codec/http/HttpObjectAggregator.java   | 123 +++++++-----
 .../handler/codec/http/HttpObjectDecoder.java      |   1 +
 .../codec/http/HttpServerKeepAliveHandler.java     | 128 ++++++++++++
 .../netty/handler/codec/http/cors/CorsHandler.java |  21 +-
 .../handler/codec/http/HttpContentDecoderTest.java |  68 ++++++-
 .../codec/http/HttpServerKeepAliveHandlerTest.java | 188 ++++++++++++++++++
 .../handler/codec/http/cors/CorsHandlerTest.java   | 130 +++++++++++-
 codec-socks/pom.xml                                |   2 +-
 codec/pom.xml                                      |   2 +-
 .../handler/codec/protobuf/ProtobufDecoder.java    |   2 +-
 common/pom.xml                                     |   7 +-
 .../io/netty/util/AbstractReferenceCounted.java    |  47 ++---
 .../java/io/netty/util/ResourceLeakDetector.java   |   2 +-
 .../io/netty/util/concurrent/PromiseNotifier.java  |  14 +-
 .../netty/util/internal/NativeLibraryLoader.java   |  36 +++-
 .../util/internal/PromiseNotificationUtil.java     |  76 +++++++
 example/pom.xml                                    |  10 +-
 handler/pom.xml                                    |   2 +-
 .../handler/flush/FlushConsolidationHandler.java   | 107 ++++++++--
 .../io/netty/handler/ssl/JdkSslClientContext.java  |   4 +-
 .../java/io/netty/handler/ssl/JdkSslContext.java   |  12 +-
 .../io/netty/handler/ssl/JdkSslServerContext.java  |   6 +-
 .../io/netty/handler/ssl/OpenSslClientContext.java |   2 +-
 .../java/io/netty/handler/ssl/OpenSslContext.java  |   9 +-
 .../handler/ssl/OpenSslKeyMaterialManager.java     |   2 +-
 .../io/netty/handler/ssl/OpenSslServerContext.java |  10 +-
 .../ssl/ReferenceCountedOpenSslClientContext.java  |   2 +-
 .../ssl/ReferenceCountedOpenSslContext.java        |  24 ++-
 .../handler/ssl/ReferenceCountedOpenSslEngine.java |  62 +++---
 .../ssl/ReferenceCountedOpenSslServerContext.java  |   8 +-
 .../main/java/io/netty/handler/ssl/SniHandler.java |  20 +-
 .../main/java/io/netty/handler/ssl/SslContext.java |  34 ++--
 .../io/netty/handler/ssl/SslContextBuilder.java    |  11 +-
 .../main/java/io/netty/handler/ssl/SslHandler.java |  73 ++++---
 .../ssl/util/SimpleTrustManagerFactory.java        |  19 +-
 .../handler/ssl/util/X509TrustManagerWrapper.java  |  73 +++++++
 .../io/netty/handler/timeout/IdleStateHandler.java |  16 +-
 .../traffic/AbstractTrafficShapingHandler.java     |   2 +-
 .../GlobalChannelTrafficShapingHandler.java        |   2 +-
 .../flush/FlushConsolidationHandlerTest.java       |  79 ++++++--
 ...Test.java => JdkOpenSslEngineInteroptTest.java} |  20 +-
 .../io/netty/handler/ssl/JdkSslEngineTest.java     |   7 +-
 .../io/netty/handler/ssl/OpenSslEngineTest.java    |  16 +-
 ...t.java => OpenSslJdkSslEngineInteroptTest.java} |  21 +-
 .../ssl/ReferenceCountedOpenSslEngineTest.java     |  21 +-
 .../java/io/netty/handler/ssl/SSLEngineTest.java   | 221 ++++++++++++++++++---
 .../java/io/netty/handler/ssl/SslHandlerTest.java  |  94 +++++++++
 microbench/pom.xml                                 |   6 +-
 pom.xml                                            |  17 +-
 tarball/pom.xml                                    |   2 +-
 testsuite-osgi/pom.xml                             |   2 +-
 testsuite/pom.xml                                  |   2 +-
 .../transport/socket/SocketFileRegionTest.java     |  81 +++++++-
 .../socket/SocketShutdownOutputBySelfTest.java     |  38 ++++
 .../transport/socket/SocketSslEchoTest.java        |  20 +-
 transport-native-epoll/pom.xml                     |   2 +-
 .../channel/epoll/AbstractEpollStreamChannel.java  | 110 +++++++++-
 .../io/netty/channel/epoll/EpollEventLoop.java     |  50 +++--
 .../main/java/io/netty/channel/unix/Socket.java    |   3 +
 transport-rxtx/pom.xml                             |   2 +-
 transport-sctp/pom.xml                             |   2 +-
 .../codec/sctp/SctpMessageCompletionHandler.java   |   7 +-
 transport-udt/pom.xml                              |   2 +-
 transport/pom.xml                                  |   2 +-
 .../java/io/netty/channel/AbstractChannel.java     |   2 +-
 .../channel/AbstractChannelHandlerContext.java     |   7 +-
 .../io/netty/channel/ChannelOutboundBuffer.java    |  24 +--
 .../channel/nio/AbstractNioMessageChannel.java     |  14 +-
 .../java/io/netty/channel/nio/NioEventLoop.java    |  90 ++++++---
 .../channel/socket/nio/NioDatagramChannel.java     |  10 +
 .../netty/channel/SingleThreadEventLoopTest.java   |  36 ++--
 91 files changed, 2084 insertions(+), 542 deletions(-)

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