[netty] 15/18: Merge tag 'upstream/4.0.31'

[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 b81cdd76e0f764f6402f4606dfb76f1d28aba541
Merge: 6964eb8 fb0a371
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Sep 12 23:10:06 2015 +0200

    Merge tag 'upstream/4.0.31'
    
    Upstream version 4.0.31

 all/pom.xml                                        |   2 +-
 buffer/pom.xml                                     |   2 +-
 .../io/netty/buffer/AbstractDerivedByteBuf.java    |  17 +-
 .../io/netty/buffer/AdvancedLeakAwareByteBuf.java  | 238 ++++---
 .../java/io/netty/buffer/DuplicatedByteBuf.java    |  10 +-
 .../main/java/io/netty/buffer/PoolThreadCache.java |  10 +-
 .../main/java/io/netty/buffer/PooledByteBuf.java   |  10 -
 .../io/netty/buffer/PooledDuplicatedByteBuf.java   |  56 --
 .../java/io/netty/buffer/PooledSlicedByteBuf.java  |  56 --
 .../main/java/io/netty/buffer/SlicedByteBuf.java   |  19 +-
 .../java/io/netty/buffer/DuplicateByteBufTest.java |  30 +-
 .../java/io/netty/buffer/SlicedByteBufTest.java    |  27 +-
 codec-haproxy/pom.xml                              |   2 +-
 codec-http/pom.xml                                 |   2 +-
 .../io/netty/handler/codec/http/HttpConstants.java |   5 +
 .../handler/codec/http/HttpContentEncoder.java     |  26 +-
 .../codec/http/HttpExpectationFailedEvent.java     |  16 +-
 .../handler/codec/http/HttpObjectAggregator.java   |  56 +-
 .../handler/codec/http/HttpObjectDecoder.java      |  75 +-
 .../java/io/netty/handler/codec/http/HttpUtil.java |  45 ++
 .../multipart/HttpPostMultipartRequestDecoder.java |  11 +-
 .../io/netty/handler/codec/spdy/SpdyCodecUtil.java |   3 +
 .../handler/codec/spdy/SpdySessionHandler.java     |   8 +-
 .../handler/codec/http/HttpClientCodecTest.java    | 113 ++-
 .../codec/http/HttpContentCompressorTest.java      |  74 ++
 .../codec/http/HttpObjectAggregatorTest.java       | 142 ++++
 .../http/multipart/HttpPostRequestDecoderTest.java |  29 +
 codec-socks/pom.xml                                |   2 +-
 codec/pom.xml                                      |   2 +-
 .../io/netty/handler/codec/ByteToMessageCodec.java |  28 +
 .../handler/codec/ByteToMessageCodecTest.java      |  37 +
 common/pom.xml                                     |   2 +-
 common/src/main/java/io/netty/util/Recycler.java   |  24 +-
 .../java/io/netty/util/ResourceLeakDetector.java   |  21 +-
 .../util/concurrent/SingleThreadEventExecutor.java |  59 +-
 .../io/netty/util/concurrent/ThreadProperties.java |  61 ++
 .../util/internal/AppendableCharSequence.java      |  49 +-
 .../io/netty/util/internal/MpscLinkedQueue.java    |  25 +-
 .../util/internal/MpscLinkedQueueHeadRef.java      |   2 +-
 .../netty/util/internal/NativeLibraryLoader.java   |   4 +-
 .../io/netty/util/internal/PlatformDependent0.java |   7 +-
 .../java/io/netty/util/internal/StringUtil.java    |  79 ++-
 .../io/netty/util/internal/ThreadLocalRandom.java  |   2 +-
 .../src/test/java/io/netty/util/RecyclerTest.java  |  33 +
 .../concurrent/SingleThreadEventExecutorTest.java  |  58 ++
 example/pom.xml                                    |   2 +-
 handler/pom.xml                                    |   2 +-
 .../ipfilter/AbstractRemoteAddressFilter.java      | 109 +++
 .../io/netty/handler/ipfilter/IpFilterRule.java    |  36 +
 .../netty/handler/ipfilter/IpFilterRuleType.java   |  17 +-
 .../netty/handler/ipfilter/IpSubnetFilterRule.java | 169 +++++
 .../netty/handler/ipfilter/RuleBasedIpFilter.java  |  60 ++
 .../io/netty/handler/ipfilter/UniqueIpFilter.java  |  54 ++
 .../io/netty/handler/ipfilter/package-info.java    |  13 +-
 .../io/netty/handler/ssl/JdkSslClientContext.java  |  58 +-
 .../java/io/netty/handler/ssl/JdkSslContext.java   |  28 +-
 .../io/netty/handler/ssl/JdkSslServerContext.java  |  59 +-
 .../io/netty/handler/ssl/OpenSslClientContext.java | 134 +++-
 .../java/io/netty/handler/ssl/OpenSslContext.java  |  61 +-
 .../io/netty/handler/ssl/OpenSslServerContext.java | 149 +++-
 .../main/java/io/netty/handler/ssl/SslContext.java | 151 ++--
 .../io/netty/handler/ssl/SslContextBuilder.java    | 123 +++-
 .../main/java/io/netty/handler/ssl/SslHandler.java |   6 +
 .../handler/ssl/util/SelfSignedCertificate.java    |  25 +
 .../netty/handler/ipfilter/IpSubnetFilterTest.java | 143 ++++
 .../netty/handler/ssl/SslContextBuilderTest.java   | 110 +++
 microbench/pom.xml                                 |   2 +-
 .../common/AppendableCharSequenceBenchmark.java    |  87 +++
 pom.xml                                            |  90 ++-
 tarball/pom.xml                                    |   2 +-
 testsuite-osgi/pom.xml                             |  24 +-
 testsuite/pom.xml                                  |   2 +-
 .../transport/socket/SocketSslEchoTest.java        |  16 +-
 .../transport/socket/SocketSslGreetingTest.java    |  16 +-
 .../transport/socket/SocketStartTlsTest.java       |  16 +-
 transport-native-epoll/pom.xml                     |   6 +-
 .../src/main/c/exception_helper.h                  |   1 +
 .../src/main/c/io_netty_channel_epoll_Native.c     | 103 ++-
 .../src/main/c/io_netty_channel_epoll_Native.h     |   2 +
 .../netty/channel/epoll/AbstractEpollChannel.java  |  50 +-
 .../channel/epoll/AbstractEpollStreamChannel.java  |  35 +-
 .../io/netty/channel/epoll/EpollChannelOption.java |   2 +
 .../epoll/EpollServerSocketChannelConfig.java      |  24 +-
 .../io/netty/channel/epoll/EpollSocketChannel.java |   4 +-
 .../channel/epoll/EpollSocketChannelConfig.java    |  20 +
 .../main/java/io/netty/channel/epoll/Native.java   |  14 +-
 .../epoll/EpollAbstractDomainSocketEchoTest.java}  |  19 +-
 .../channel/epoll/EpollChannelConfigTest.java      |  52 ++
 .../io/netty/channel/epoll/EpollReuseAddrTest.java |   2 +
 transport-rxtx/pom.xml                             |   2 +-
 transport-sctp/pom.xml                             |   2 +-
 .../io/netty/channel/sctp/oio/OioSctpChannel.java  |  53 +-
 transport-udt/pom.xml                              |   2 +-
 transport/pom.xml                                  |   2 +-
 .../netty/channel/group/DefaultChannelGroup.java   |  53 +-
 .../java/io/netty/channel/local/LocalChannel.java  | 189 ++++--
 .../io/netty/channel/pool/FixedChannelPool.java    |  56 +-
 .../io/netty/channel/pool/SimpleChannelPool.java   |  90 ++-
 .../io/netty/channel/local/LocalChannelTest.java   | 756 ++++++++++++++++++---
 .../netty/channel/pool/FixedChannelPoolTest.java   |  39 ++
 .../netty/channel/pool/SimpleChannelPoolTest.java  | 102 ++-
 101 files changed, 4164 insertions(+), 859 deletions(-)

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