[netty] 01/05: Merge tag 'upstream/4.0.34'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Jan 31 22:45:02 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 35fa8ab84fa35b7b5d431219ab3d0ac46d9adc02
Merge: 24b6308 567704b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Jan 31 21:58:19 2016 +0100
Merge tag 'upstream/4.0.34'
Upstream version 4.0.34
all/pom.xml | 2 +-
buffer/pom.xml | 2 +-
.../io/netty/buffer/AbstractByteBufAllocator.java | 28 +-
.../buffer/AbstractReferenceCountedByteBuf.java | 6 +-
.../io/netty/buffer/AdvancedLeakAwareByteBuf.java | 218 ++---
...java => AdvancedLeakAwareCompositeByteBuf.java} | 480 +++++-----
buffer/src/main/java/io/netty/buffer/ByteBuf.java | 2 +-
.../src/main/java/io/netty/buffer/ByteBufUtil.java | 375 +++++---
.../java/io/netty/buffer/CompositeByteBuf.java | 28 +-
.../io/netty/buffer/PooledByteBufAllocator.java | 49 +
.../buffer/SimpleLeakAwareCompositeByteBuf.java | 79 ++
buffer/src/main/java/io/netty/buffer/Unpooled.java | 27 +-
.../java/io/netty/buffer/UnsafeByteBufUtil.java | 27 +-
.../io/netty/buffer/WrappedCompositeByteBuf.java | 994 +++++++++++++++++++++
.../java/io/netty/buffer/AbstractByteBufTest.java | 28 +
.../test/java/io/netty/buffer/ByteBufUtilTest.java | 28 +
.../java/io/netty/buffer/SlicedByteBufTest.java | 12 +
.../test/java/io/netty/buffer/UnpooledTest.java | 36 +
.../io/netty/buffer/UnsafeByteBufUtilTest.java | 48 +
codec-haproxy/pom.xml | 2 +-
codec-http/pom.xml | 2 +-
.../handler/codec/http/DefaultHttpHeaders.java | 17 +-
.../netty/handler/codec/http/FullHttpRequest.java | 2 +-
.../io/netty/handler/codec/http/HttpHeaders.java | 8 +-
.../codec/http/cookie/ClientCookieEncoder.java | 135 ++-
.../handler/codec/http/cookie/CookieEncoder.java | 2 +-
.../codec/http/cookie/ServerCookieEncoder.java | 79 +-
.../multipart/HttpPostMultipartRequestDecoder.java | 11 +-
.../http/multipart/HttpPostRequestEncoder.java | 4 +-
.../codec/http/multipart/InternalAttribute.java | 4 +-
.../http/websocketx/WebSocketClientHandshaker.java | 13 +
.../websocketx/WebSocketClientHandshaker00.java | 9 +-
.../websocketx/WebSocketClientHandshaker07.java | 9 +-
.../websocketx/WebSocketClientHandshaker08.java | 9 +-
.../websocketx/WebSocketClientHandshaker13.java | 9 +-
.../codec/http/websocketx/WebSocketUtil.java | 56 +-
.../io/netty/handler/codec/spdy/SpdySession.java | 4 +-
.../netty/handler/codec/http/HttpHeadersTest.java | 7 +-
.../codec/http/cookie/ClientCookieEncoderTest.java | 20 +-
.../codec/http/cookie/ServerCookieEncoderTest.java | 34 +-
.../http/multipart/HttpPostRequestDecoderTest.java | 30 +
.../WebSocketClientHandshaker00Test.java | 34 +-
.../WebSocketClientHandshaker07Test.java | 16 +-
.../WebSocketClientHandshaker08Test.java | 16 +-
.../WebSocketClientHandshaker13Test.java | 16 +-
.../websocketx/WebSocketClientHandshakerTest.java | 39 +
codec-socks/pom.xml | 2 +-
codec/pom.xml | 2 +-
.../netty/handler/codec/ByteToMessageDecoder.java | 9 +
.../java/io/netty/handler/codec/base64/Base64.java | 24 +-
.../handler/codec/compression/JZlibEncoder.java | 5 +-
.../handler/codec/compression/JdkZlibEncoder.java | 5 +-
.../io/netty/handler/codec/compression/Snappy.java | 6 +-
.../codec/compression/ZlibCodecFactory.java | 3 +-
.../handler/codec/ByteToMessageDecoderTest.java | 87 +-
.../io/netty/handler/codec/base64/Base64Test.java | 58 ++
.../handler/codec/compression/SnappyTest.java | 28 +
common/pom.xml | 2 +-
.../java/io/netty/util/DomainMappingBuilder.java | 191 ++++
.../main/java/io/netty/util/DomainNameMapping.java | 67 +-
.../java/io/netty/util/ThreadDeathWatcher.java | 14 +-
.../io/netty/util/concurrent/AbstractFuture.java | 7 +
.../io/netty/util/concurrent/DefaultPromise.java | 17 +-
.../main/java/io/netty/util/internal/MathUtil.java | 15 +
.../io/netty/util/internal/PlatformDependent.java | 23 +-
.../io/netty/util/internal/PlatformDependent0.java | 6 +-
.../java/io/netty/util/internal/StringUtil.java | 23 +
.../internal/UnsafeAtomicIntegerFieldUpdater.java | 3 +-
.../internal/UnsafeAtomicLongFieldUpdater.java | 3 +-
.../UnsafeAtomicReferenceFieldUpdater.java | 3 +-
.../java/io/netty/util/DomainNameMappingTest.java | 184 ++++
.../netty/util/concurrent/DefaultPromiseTest.java | 207 ++++-
.../io/netty/util/internal/StringUtilTest.java | 239 +++++
example/pom.xml | 4 +-
handler/pom.xml | 14 +-
.../ssl/ApplicationProtocolNegotiationHandler.java | 11 +-
.../io/netty/handler/ssl/OpenSslClientContext.java | 52 +-
.../java/io/netty/handler/ssl/OpenSslContext.java | 29 +-
.../java/io/netty/handler/ssl/OpenSslEngine.java | 133 ++-
.../io/netty/handler/ssl/OpenSslServerContext.java | 9 +
.../main/java/io/netty/handler/ssl/SniHandler.java | 258 ++++--
.../main/java/io/netty/handler/ssl/SslContext.java | 11 -
.../main/java/io/netty/handler/ssl/SslHandler.java | 146 ++-
.../main/java/io/netty/handler/ssl/SslUtils.java | 127 +++
.../handler/ssl/util/SelfSignedCertificate.java | 52 +-
.../netty/handler/stream/ChunkedWriteHandler.java | 3 +-
.../netty/handler/timeout/WriteTimeoutHandler.java | 130 ++-
.../traffic/ChannelTrafficShapingHandler.java | 3 +-
.../traffic/GlobalTrafficShapingHandler.java | 3 +-
.../io/netty/handler/ssl/JdkSslEngineTest.java | 217 ++---
.../io/netty/handler/ssl/OpenSslEngineTest.java | 57 ++
.../java/io/netty/handler/ssl/SSLEngineTest.java | 171 +++-
.../java/io/netty/handler/ssl/SniHandlerTest.java | 2 +-
microbench/pom.xml | 2 +-
pom.xml | 459 +---------
tarball/pom.xml | 2 +-
testsuite-osgi/pom.xml | 2 +-
testsuite/pom.xml | 2 +-
transport-native-epoll/pom.xml | 4 +-
.../src/main/c/io_netty_channel_epoll_Native.c | 61 +-
.../src/main/c/io_netty_channel_unix_Errors.c | 30 +-
.../main/c/io_netty_channel_unix_FileDescriptor.c | 9 +-
.../src/main/c/io_netty_channel_unix_Socket.c | 44 +-
.../src/main/c/io_netty_channel_unix_Socket.h | 1 +
.../src/main/c/netty_unix_errors.h | 2 +-
.../src/main/c/netty_unix_filedescriptor.h | 2 +-
.../src/main/c/netty_unix_socket.h | 2 +-
.../src/main/c/netty_unix_util.c | 26 +-
...tty_unix_filedescriptor.h => netty_unix_util.h} | 18 +-
.../netty/channel/epoll/AbstractEpollChannel.java | 6 +-
.../channel/epoll/AbstractEpollStreamChannel.java | 66 +-
.../netty/channel/epoll/EpollDatagramChannel.java | 3 +-
.../channel/epoll/EpollDomainSocketChannel.java | 3 +-
.../io/netty/channel/epoll/EpollEventLoop.java | 10 +
.../io/netty/channel/epoll/EpollSocketChannel.java | 82 +-
.../netty/channel/epoll/IovArrayThreadLocal.java | 61 --
.../java/io/netty/channel/unix/FileDescriptor.java | 26 +-
.../main/java/io/netty/channel/unix/Socket.java | 12 +-
.../netty/channel/epoll/EpollSocketTcpMd5Test.java | 2 +-
.../java/io/netty/channel/unix/SocketTest.java | 99 ++
transport-rxtx/pom.xml | 2 +-
.../java/io/netty/channel/rxtx/RxtxChannel.java | 3 +-
transport-sctp/pom.xml | 2 +-
.../java/io/netty/channel/sctp/SctpMessage.java | 4 +-
.../io/netty/channel/sctp/nio/NioSctpChannel.java | 5 +-
.../channel/sctp/nio/NioSctpServerChannel.java | 5 +-
.../io/netty/channel/sctp/oio/OioSctpChannel.java | 13 +-
.../channel/sctp/oio/OioSctpServerChannel.java | 5 +-
transport-udt/pom.xml | 2 +-
transport/pom.xml | 2 +-
.../java/io/netty/bootstrap/AbstractBootstrap.java | 3 +-
.../main/java/io/netty/bootstrap/Bootstrap.java | 3 +-
.../java/io/netty/bootstrap/ServerBootstrap.java | 3 +-
.../java/io/netty/channel/AbstractChannel.java | 73 +-
.../channel/AbstractChannelHandlerContext.java | 222 ++---
.../main/java/io/netty/channel/ChannelHandler.java | 3 +
.../io/netty/channel/ChannelHandlerContext.java | 8 +-
.../io/netty/channel/ChannelInboundHandler.java | 1 +
.../java/io/netty/channel/ChannelMetadata.java | 2 +-
.../main/java/io/netty/channel/ChannelOption.java | 4 +-
.../io/netty/channel/ChannelOutboundBuffer.java | 3 +-
.../channel/ChannelOutboundHandlerAdapter.java | 6 +-
.../java/io/netty/channel/ChannelPipeline.java | 2 +-
.../channel/CombinedChannelDuplexHandler.java | 447 ++++++++-
.../channel/DefaultChannelHandlerContext.java | 6 +-
.../io/netty/channel/DefaultChannelPipeline.java | 217 ++---
.../src/main/java/io/netty/channel/EventLoop.java | 2 +-
.../io/netty/channel/embedded/EmbeddedChannel.java | 55 +-
.../java/io/netty/channel/local/LocalChannel.java | 9 +-
.../java/io/netty/channel/nio/NioEventLoop.java | 2 +-
.../channel/socket/nio/NioDatagramChannel.java | 2 +-
.../channel/socket/nio/NioServerSocketChannel.java | 2 +-
.../netty/channel/socket/nio/NioSocketChannel.java | 21 +-
.../netty/channel/socket/oio/OioSocketChannel.java | 3 +-
.../java/io/netty/channel/AbstractChannelTest.java | 75 +-
.../channel/CombinedChannelDuplexHandlerTest.java | 324 +++++++
.../netty/channel/DefaultChannelPipelineTest.java | 96 ++
.../channel/embedded/EmbeddedChannelTest.java | 88 +-
.../io/netty/channel/local/LocalChannelTest.java | 52 ++
159 files changed, 6177 insertions(+), 2357 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