[netty] 02/07: Merge tag 'upstream/4.0.40'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Aug 2 23:07:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository netty.
commit 290828ccfa59cc4849e35ef0eb974d06995475d3
Merge: 235eec6 dc522f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Aug 2 13:46:55 2016 +0200
Merge tag 'upstream/4.0.40'
Upstream version 4.0.40
.gitignore | 1 +
all/pom.xml | 4 +-
buffer/pom.xml | 2 +-
.../main/java/io/netty/buffer/AbstractByteBuf.java | 4 +-
.../src/main/java/io/netty/buffer/ByteBufUtil.java | 198 ++++++
.../src/main/java/io/netty/buffer/PoolArena.java | 41 +-
.../netty/buffer/AbstractCompositeByteBufTest.java | 31 +
.../test/java/io/netty/buffer/ByteBufUtilTest.java | 97 +++
.../netty/buffer/PooledByteBufAllocatorTest.java | 26 +
codec-haproxy/pom.xml | 2 +-
codec-http/pom.xml | 2 +-
.../netty/handler/codec/http/HttpChunkedInput.java | 3 +
.../handler/codec/http/HttpContentDecoder.java | 1 +
.../handler/codec/http/HttpContentEncoder.java | 11 +-
.../io/netty/handler/codec/http/HttpHeaders.java | 10 +-
.../handler/codec/http/HttpObjectDecoder.java | 15 +-
.../handler/codec/http/QueryStringDecoder.java | 24 +-
.../codec/http/multipart/DiskFileUpload.java | 16 +-
.../codec/http/multipart/FileUploadUtil.java | 20 +-
.../codec/http/multipart/MemoryFileUpload.java | 16 +-
.../http/websocketx/WebSocketChunkedInput.java | 87 +++
.../http/websocketx/WebSocketClientHandshaker.java | 36 +-
.../websocketx/WebSocketClientHandshaker00.java | 23 +-
.../websocketx/WebSocketClientHandshaker07.java | 22 +-
.../websocketx/WebSocketClientHandshaker08.java | 22 +-
.../websocketx/WebSocketClientHandshaker13.java | 31 +-
.../http/websocketx/WebSocketServerHandshaker.java | 8 +-
.../handler/codec/spdy/SpdySessionHandler.java | 13 +-
.../handler/codec/http/HttpChunkedInputTest.java | 27 +-
.../handler/codec/http/HttpContentDecoderTest.java | 80 ++-
.../handler/codec/http/HttpContentEncoderTest.java | 25 +
.../codec/http/HttpResponseDecoderTest.java | 14 +
.../handler/codec/http/QueryStringDecoderTest.java | 17 +
.../DiskFileUploadTest.java} | 18 +-
.../MemoryFileUploadTest.java} | 18 +-
.../WebSocketClientHandshaker07Test.java | 30 +
.../WebSocketClientHandshaker08Test.java | 2 +-
.../WebSocketClientHandshaker13Test.java | 2 +-
codec-socks/pom.xml | 2 +-
codec/pom.xml | 2 +-
.../handler/codec/compression/JZlibEncoder.java | 5 +-
.../handler/codec/compression/JdkZlibEncoder.java | 5 +-
common/pom.xml | 39 +-
.../io/netty/util/AbstractReferenceCounted.java | 15 +-
.../java/io/netty/util/DefaultAttributeMap.java | 62 +-
.../main/java/io/netty/util/HashedWheelTimer.java | 71 ++-
common/src/main/java/io/netty/util/Recycler.java | 115 +++-
.../java/io/netty/util/ResourceLeakDetector.java | 74 ++-
.../io/netty/util/ResourceLeakDetectorFactory.java | 144 +++++
.../java/io/netty/util/ThreadDeathWatcher.java | 16 +-
.../util/concurrent/AbstractEventExecutor.java | 28 +-
.../concurrent/AbstractScheduledEventExecutor.java | 5 +-
.../util/concurrent/DefaultEventExecutor.java | 5 +
.../util/concurrent/DefaultEventExecutorGroup.java | 22 +-
.../io/netty/util/concurrent/DefaultPromise.java | 39 +-
.../util/concurrent/DefaultThreadFactory.java | 11 +-
.../main/java/io/netty/util/concurrent/Future.java | 4 +-
.../netty/util/concurrent/GlobalEventExecutor.java | 21 +-
.../OrderedEventExecutor.java} | 15 +-
.../util/concurrent/RejectedExecutionHandler.java | 23 +-
.../util/concurrent/RejectedExecutionHandlers.java | 72 +++
.../util/concurrent/SingleThreadEventExecutor.java | 147 ++++-
.../UnorderedThreadPoolEventExecutor.java | 251 ++++++++
.../netty/util/internal/BaseLinkedAtomicQueue.java | 110 ----
.../io/netty/util/internal/BaseLinkedQueue.java | 158 -----
.../main/java/io/netty/util/internal/Cleaner0.java | 24 +-
.../internal/ConcurrentCircularArrayQueue.java | 207 -------
.../netty/util/internal/LinkedQueueAtomicNode.java | 71 ---
.../io/netty/util/internal/LinkedQueueNode.java | 80 ---
.../netty/util/internal/MessagePassingQueue.java | 297 ---------
.../io/netty/util/internal/MpscArrayQueue.java | 331 ----------
.../io/netty/util/internal/MpscLinkedQueue.java | 378 ------------
.../util/internal/MpscLinkedQueueHeadRef.java | 54 --
.../netty/util/internal/MpscLinkedQueueNode.java | 65 --
.../util/internal/MpscLinkedQueueTailRef.java | 54 --
.../java/io/netty/util/internal/OneTimeTask.java | 32 -
.../io/netty/util/internal/PlatformDependent.java | 105 ++--
.../io/netty/util/internal/PlatformDependent0.java | 11 +-
.../internal/RecyclableMpscLinkedQueueNode.java | 45 --
.../netty/util/internal/SpscLinkedAtomicQueue.java | 118 ----
.../io/netty/util/internal/SpscLinkedQueue.java | 215 -------
.../java/io/netty/util/internal/ThrowableUtil.java | 55 ++
.../src/test/java/io/netty/util/RecyclerTest.java | 48 ++
.../java/io/netty/util/ThreadDeathWatcherTest.java | 28 +-
.../netty/util/concurrent/DefaultPromiseTest.java | 37 ++
.../util/concurrent/DefaultThreadFactoryTest.java | 266 ++++++++
.../util/concurrent/GlobalEventExecutorTest.java | 35 +-
.../concurrent/SingleThreadEventExecutorTest.java | 77 +++
.../netty/util/internal/PlatformDependentTest.java | 61 ++
example/pom.xml | 10 +-
handler/pom.xml | 2 +-
.../handler/flush/FlushConsolidationHandler.java | 145 +++++
.../java/io/netty/handler/flush/package-info.java | 12 +-
.../io/netty/handler/ssl/DelegatingSslContext.java | 84 +++
.../java/io/netty/handler/ssl/JdkSslContext.java | 27 -
.../main/java/io/netty/handler/ssl/OpenSsl.java | 103 +++-
.../io/netty/handler/ssl/OpenSslClientContext.java | 201 ++++--
.../java/io/netty/handler/ssl/OpenSslContext.java | 332 ++++++----
.../java/io/netty/handler/ssl/OpenSslEngine.java | 685 ++++++++++++---------
.../io/netty/handler/ssl/OpenSslEngineMap.java | 17 +-
.../ssl/OpenSslExtendedKeyMaterialManager.java | 39 ++
.../handler/ssl/OpenSslKeyMaterialManager.java | 121 ++++
.../io/netty/handler/ssl/OpenSslServerContext.java | 138 ++---
.../handler/ssl/OpenSslServerSessionContext.java | 16 +-
.../netty/handler/ssl/OpenSslSessionContext.java | 24 +-
.../io/netty/handler/ssl/OpenSslSessionStats.java | 61 +-
.../java/io/netty/handler/ssl/PemEncoded.java} | 28 +-
.../java/io/netty/handler/ssl/PemPrivateKey.java | 196 ++++++
.../main/java/io/netty/handler/ssl/PemValue.java | 84 +++
.../io/netty/handler/ssl/PemX509Certificate.java | 393 ++++++++++++
.../main/java/io/netty/handler/ssl/SslContext.java | 37 ++
.../main/java/io/netty/handler/ssl/SslHandler.java | 28 +-
.../main/java/io/netty/handler/ssl/SslUtils.java | 33 +
.../netty/handler/stream/ChunkedWriteHandler.java | 3 +-
.../netty/handler/timeout/ReadTimeoutHandler.java | 141 +----
.../netty/handler/timeout/WriteTimeoutHandler.java | 3 +-
.../traffic/ChannelTrafficShapingHandler.java | 3 +-
.../traffic/GlobalTrafficShapingHandler.java | 3 +-
.../flush/FlushConsolidationHandlerTest.java | 129 ++++
.../handler/ssl/OpenSslClientContextTest.java | 9 +
.../io/netty/handler/ssl/OpenSslEngineTest.java | 56 +-
.../netty/handler/ssl/OpenSslRenegotiateTest.java | 14 +-
.../handler/ssl/OpenSslServerContextTest.java | 8 +
.../java/io/netty/handler/ssl/SSLEngineTest.java | 186 +++++-
microbench/pom.xml | 2 +-
pom.xml | 99 +--
tarball/pom.xml | 2 +-
testsuite-osgi/pom.xml | 10 +-
testsuite/pom.xml | 2 +-
transport-native-epoll/pom.xml | 18 +-
.../src/main/c/netty_epoll_native.c | 82 ++-
.../src/main/c/netty_unix_errors.c | 5 +
.../src/main/c/netty_unix_socket.c | 28 -
.../netty/channel/epoll/AbstractEpollChannel.java | 3 +-
.../channel/epoll/AbstractEpollStreamChannel.java | 54 +-
.../channel/epoll/EpollDomainSocketChannel.java | 3 +-
.../epoll/EpollDomainSocketChannelConfig.java | 2 +
.../io/netty/channel/epoll/EpollEventLoop.java | 12 +-
.../netty/channel/epoll/EpollEventLoopGroup.java | 12 +-
.../channel/epoll/EpollSocketChannelConfig.java | 2 +
.../main/java/io/netty/channel/epoll/Native.java | 26 +-
.../main/java/io/netty/channel/unix/Errors.java | 53 +-
.../unix/ErrorsStaticallyReferencedJniMethods.java | 1 +
.../java/io/netty/channel/unix/FileDescriptor.java | 52 +-
.../main/java/io/netty/channel/unix/Socket.java | 47 +-
transport-rxtx/pom.xml | 2 +-
.../java/io/netty/channel/rxtx/RxtxChannel.java | 3 +-
transport-sctp/pom.xml | 2 +-
.../io/netty/channel/sctp/nio/NioSctpChannel.java | 5 +-
.../channel/sctp/nio/NioSctpServerChannel.java | 5 +-
.../io/netty/channel/sctp/oio/OioSctpChannel.java | 5 +-
.../channel/sctp/oio/OioSctpServerChannel.java | 5 +-
transport-udt/pom.xml | 2 +-
transport/pom.xml | 2 +-
.../java/io/netty/bootstrap/AbstractBootstrap.java | 11 +-
.../main/java/io/netty/bootstrap/Bootstrap.java | 3 +-
.../java/io/netty/bootstrap/ServerBootstrap.java | 19 +-
.../java/io/netty/channel/AbstractChannel.java | 69 ++-
.../channel/AbstractChannelHandlerContext.java | 156 +++--
.../io/netty/channel/ChannelDuplexHandler.java | 20 +-
.../io/netty/channel/ChannelHandlerContext.java | 2 +-
.../main/java/io/netty/channel/ChannelOption.java | 3 +
.../io/netty/channel/ChannelOutboundBuffer.java | 29 +-
.../channel/CombinedChannelDuplexHandler.java | 17 +-
.../io/netty/channel/DefaultChannelConfig.java | 30 +-
.../io/netty/channel/DefaultChannelPipeline.java | 58 +-
.../src/main/java/io/netty/channel/EventLoop.java | 4 +-
.../java/io/netty/channel/PendingWriteQueue.java | 18 +-
.../io/netty/channel/SingleThreadEventLoop.java | 14 +-
.../channel/ThreadPerChannelEventLoopGroup.java | 6 +-
.../java/io/netty/channel/local/LocalChannel.java | 22 +-
.../io/netty/channel/nio/AbstractNioChannel.java | 14 +-
.../java/io/netty/channel/nio/NioEventLoop.java | 26 +-
.../io/netty/channel/nio/NioEventLoopGroup.java | 16 +-
.../java/io/netty/channel/pool/ChannelPool.java | 6 +
.../io/netty/channel/pool/FixedChannelPool.java | 22 +-
.../io/netty/channel/pool/SimpleChannelPool.java | 34 +-
.../netty/channel/socket/nio/NioSocketChannel.java | 5 +-
.../netty/channel/socket/oio/OioSocketChannel.java | 3 +-
.../java/io/netty/bootstrap/BootstrapTest.java | 1 +
.../io/netty/bootstrap/ServerBootstrapTest.java | 77 +++
.../io/netty/channel/ChannelInitializerTest.java | 35 ++
.../netty/channel/DefaultChannelPipelineTest.java | 140 +++++
.../io/netty/channel/PendingWriteQueueTest.java | 1 +
.../io/netty/channel/local/LocalChannelTest.java | 15 +-
185 files changed, 5879 insertions(+), 4068 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