[netty] 02/05: Merge tag 'upstream/4.0.37'
Tony Mancill
tmancill at moszumanska.debian.org
Sat Jun 18 21:55:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository netty.
commit 7a0d5958028ec3252e938633d3560716060d4dbc
Merge: 32b35d1 a985105
Author: tony mancill <tmancill at debian.org>
Date: Sat Jun 18 14:26:28 2016 -0700
Merge tag 'upstream/4.0.37'
Upstream version 4.0.37
all/pom.xml | 4 +-
buffer/pom.xml | 2 +-
.../main/java/io/netty/buffer/AbstractByteBuf.java | 3 +-
.../io/netty/buffer/AbstractDerivedByteBuf.java | 3 +
.../buffer/AdvancedLeakAwareCompositeByteBuf.java | 32 +-
.../java/io/netty/buffer/CompositeByteBuf.java | 108 ++-
.../java/io/netty/buffer/DefaultByteBufHolder.java | 16 +
.../io/netty/buffer/DuplicatedAbstractByteBuf.java | 30 +-
.../java/io/netty/buffer/DuplicatedByteBuf.java | 102 ++-
.../io/netty/buffer/FixedCompositeByteBuf.java | 2 +-
.../src/main/java/io/netty/buffer/PoolArena.java | 70 +-
.../main/java/io/netty/buffer/PoolArenaMetric.java | 5 +
.../src/main/java/io/netty/buffer/PoolChunk.java | 24 +-
.../main/java/io/netty/buffer/PoolChunkList.java | 81 +-
.../main/java/io/netty/buffer/PoolThreadCache.java | 2 +-
.../io/netty/buffer/PooledByteBufAllocator.java | 61 +-
.../io/netty/buffer/PooledUnsafeDirectByteBuf.java | 15 +
.../io/netty/buffer/PooledUnsafeHeapByteBuf.java | 33 +-
.../main/java/io/netty/buffer/ReadOnlyByteBuf.java | 61 +-
.../io/netty/buffer/ReadOnlyByteBufferBuf.java | 29 +-
.../io/netty/buffer/SlicedAbstractByteBuf.java | 28 +-
.../main/java/io/netty/buffer/SlicedByteBuf.java | 147 +++-
.../io/netty/buffer/UnpooledByteBufAllocator.java | 45 +-
.../netty/buffer/UnpooledUnsafeDirectByteBuf.java | 42 +-
.../io/netty/buffer/UnpooledUnsafeHeapByteBuf.java | 30 +-
.../UnpooledUnsafeNoCleanerDirectByteBuf.java | 72 ++
.../java/io/netty/buffer/UnsafeByteBufUtil.java | 25 +
.../io/netty/buffer/WrappedCompositeByteBuf.java | 24 +
.../java/io/netty/buffer/AbstractByteBufTest.java | 16 +
.../netty/buffer/AbstractCompositeByteBufTest.java | 6 +-
...BigEndianUnsafeNoCleanerDirectByteBufTest.java} | 24 +-
.../io/netty/buffer/DefaultByteBufHolderTest.java | 13 +
.../io/netty/buffer/FixedCompositeByteBufTest.java | 6 +
...tleEndianUnsafeNoCleanerDirectByteBufTest.java} | 23 +-
.../netty/buffer/PooledByteBufAllocatorTest.java | 111 ++-
.../java/io/netty/buffer/SlicedByteBufTest.java | 8 +-
codec-haproxy/pom.xml | 2 +-
codec-http/pom.xml | 2 +-
.../handler/codec/http/HttpContentCompressor.java | 10 +-
.../handler/codec/http/HttpContentDecoder.java | 7 +
.../codec/http/HttpContentDecompressor.java | 6 +-
.../handler/codec/http/HttpObjectDecoder.java | 5 +
.../http/multipart/AbstractMemoryHttpData.java | 6 +-
.../multipart/HttpPostStandardRequestDecoder.java | 4 +
.../codec/spdy/DefaultSpdySettingsFrame.java | 50 +-
.../handler/codec/http/HttpRequestDecoderTest.java | 2 +-
.../codec/http/HttpResponseDecoderTest.java | 12 +-
.../http/multipart/HttpPostRequestDecoderTest.java | 18 +
.../websocketx/WebSocketClientHandshakerTest.java | 6 +-
codec-socks/pom.xml | 2 +-
.../codec/socks/SocksAuthRequestDecoder.java | 5 +-
.../codec/socks/SocksCmdRequestDecoder.java | 7 +-
.../codec/socks/SocksCmdResponseDecoder.java | 7 +-
.../handler/codec/socks/SocksCommonUtils.java | 8 +
codec/pom.xml | 2 +-
.../netty/handler/codec/ByteToMessageDecoder.java | 74 +-
.../io/netty/handler/codec/CodecOutputList.java | 174 ++++
.../handler/codec/MessageToMessageDecoder.java | 5 +-
.../handler/codec/MessageToMessageEncoder.java | 9 +-
.../io/netty/handler/codec/ReplayingDecoder.java | 45 +-
.../protobuf/ProtobufVarint32FrameDecoder.java | 2 +-
.../netty/handler/codec/ReplayingDecoderTest.java | 39 +-
.../codec/compression/SnappyFramedEncoderTest.java | 3 +-
common/pom.xml | 38 +-
.../java/io/netty/util/DomainMappingBuilder.java | 128 +--
.../main/java/io/netty/util/DomainNameMapping.java | 17 +-
...gBuilder.java => DomainNameMappingBuilder.java} | 31 +-
common/src/main/java/io/netty/util/Recycler.java | 10 +-
.../io/netty/util/concurrent/DefaultPromise.java | 932 +++++++++------------
.../util/concurrent/DefaultThreadFactory.java | 12 +-
.../util/concurrent/ImmediateEventExecutor.java | 56 +-
.../util/concurrent/SingleThreadEventExecutor.java | 2 +-
...gerFactory.java => OutOfDirectMemoryError.java} | 20 +-
.../io/netty/util/internal/PlatformDependent.java | 115 +++
.../io/netty/util/internal/PlatformDependent0.java | 57 ++
.../io/netty/util/internal/ThreadLocalRandom.java | 125 +--
.../io/netty/util/internal/chmv8/ForkJoinPool.java | 41 +-
.../internal/logging/CommonsLoggerFactory.java | 9 +-
.../internal/logging/InternalLoggerFactory.java | 6 +-
.../util/internal/logging/JdkLoggerFactory.java | 9 +
.../netty/util/internal/logging/Log4J2Logger.java | 180 ++++
...LoggerFactory.java => Log4J2LoggerFactory.java} | 21 +-
.../util/internal/logging/Log4JLoggerFactory.java | 9 +
.../util/internal/logging/Slf4JLoggerFactory.java | 6 +
.../java/io/netty/util/DomainNameMappingTest.java | 47 +-
.../netty/util/concurrent/DefaultPromiseTest.java | 185 +++-
.../internal/logging/CommonsLoggerFactoryTest.java | 2 +-
.../internal/logging/JdkLoggerFactoryTest.java | 2 +-
...ctoryTest.java => Log4J2LoggerFactoryTest.java} | 11 +-
.../util/internal/logging/Log4J2LoggerTest.java | 224 +++++
.../internal/logging/Log4JLoggerFactoryTest.java | 2 +-
.../internal/logging/Slf4JLoggerFactoryTest.java | 2 +-
common/src/test/resources/logback-test.xml | 11 +
example/pom.xml | 2 +-
handler/pom.xml | 2 +-
.../ssl/ApplicationProtocolNegotiationHandler.java | 18 +-
.../io/netty/handler/ssl/JdkSslClientContext.java | 38 +-
.../java/io/netty/handler/ssl/JdkSslContext.java | 50 +-
.../io/netty/handler/ssl/JdkSslServerContext.java | 36 +-
.../main/java/io/netty/handler/ssl/OpenSsl.java | 63 +-
.../java/io/netty/handler/ssl/OpenSslContext.java | 12 +-
.../java/io/netty/handler/ssl/OpenSslEngine.java | 73 +-
.../io/netty/handler/ssl/OpenSslServerContext.java | 2 +
.../main/java/io/netty/handler/ssl/SslContext.java | 16 +
.../ssl/util/FingerprintTrustManagerFactory.java | 14 +-
.../io/netty/handler/timeout/IdleStateEvent.java | 13 +-
.../io/netty/handler/timeout/IdleStateHandler.java | 34 +-
.../java/io/netty/handler/ssl/SniHandlerTest.java | 148 +++-
microbench/pom.xml | 2 +-
.../handler/codec/CodecOutputListBenchmark.java | 76 ++
.../java/io/netty/handler/codec/package-info.java | 21 +-
pom.xml | 32 +-
tarball/pom.xml | 2 +-
testsuite-osgi/pom.xml | 2 +-
testsuite/pom.xml | 2 +-
.../transport/socket/DatagramUnicastTest.java | 30 +-
.../transport/socket/SocketConnectTest.java | 74 ++
.../transport/socket/SocketGatheringWriteTest.java | 2 +-
.../testsuite/transport/socket/SocketRstTest.java | 3 +-
.../transport/socket/SocketSslEchoTest.java | 4 +-
transport-native-epoll/pom.xml | 9 +-
.../src/main/c/netty_epoll_native.c | 8 +-
.../io/netty/channel/epoll/EpollEventLoop.java | 27 +
.../io/netty/channel/epoll/EpollSocketChannel.java | 22 +-
.../main/java/io/netty/channel/epoll/Native.java | 23 +-
.../channel/epoll/EpollSocketConnectTest.java | 21 +-
transport-rxtx/pom.xml | 2 +-
transport-sctp/pom.xml | 2 +-
transport-udt/pom.xml | 2 +-
transport/pom.xml | 2 +-
.../java/io/netty/bootstrap/AbstractBootstrap.java | 3 +-
.../java/io/netty/channel/AbstractChannel.java | 26 +-
.../channel/AbstractChannelHandlerContext.java | 341 +++++---
.../io/netty/channel/ChannelHandlerAdapter.java | 2 +-
.../io/netty/channel/ChannelOutboundBuffer.java | 37 +-
.../java/io/netty/channel/ChannelPipeline.java | 22 +-
.../io/netty/channel/DefaultChannelPipeline.java | 605 +++++++------
.../io/netty/channel/embedded/EmbeddedChannel.java | 51 +-
.../java/io/netty/channel/local/LocalChannel.java | 3 +-
.../java/io/netty/channel/nio/NioEventLoop.java | 48 +-
.../socket/nio/NioDatagramChannelConfig.java | 32 +-
.../netty/channel/ChannelOutboundBufferTest.java | 2 +-
.../netty/channel/DefaultChannelPipelineTest.java | 167 ++--
.../io/netty/channel/PendingWriteQueueTest.java | 13 +-
.../channel/embedded/EmbeddedChannelTest.java | 20 +-
.../io/netty/channel/local/LocalChannelTest.java | 10 +
146 files changed, 4356 insertions(+), 2040 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git
More information about the pkg-java-commits
mailing list