[netty] 03/07: Merge tag 'upstream/4.0.35'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Mar 28 21:05:27 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 542a19ef35d8826172ea9ac2c4598788144120c3
Merge: a26b1ed 81c15e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Mar 27 01:17:08 2016 +0100
Merge tag 'upstream/4.0.35'
Upstream version 4.0.35
README.md | 2 +-
all/pom.xml | 20 +-
buffer/pom.xml | 2 +-
buffer/src/main/java/io/netty/buffer/ByteBuf.java | 12 +-
.../src/main/java/io/netty/buffer/ByteBufUtil.java | 66 +-
.../java/io/netty/buffer/CompositeByteBuf.java | 185 ++++--
.../src/main/java/io/netty/buffer/PoolArena.java | 57 +-
.../main/java/io/netty/buffer/PoolThreadCache.java | 12 +
.../io/netty/buffer/PooledByteBufAllocator.java | 55 +-
.../java/io/netty/buffer/UnsafeByteBufUtil.java | 3 +-
.../test/java/io/netty/buffer/ByteBufUtilTest.java | 149 ++++-
.../netty/buffer/PooledByteBufAllocatorTest.java | 135 +++-
codec-haproxy/pom.xml | 2 +-
codec-http/pom.xml | 2 +-
.../netty/handler/codec/http/HttpClientCodec.java | 16 +
.../io/netty/handler/codec/http/HttpHeaders.java | 43 ++
.../handler/codec/http/HttpObjectDecoder.java | 21 +-
.../handler/codec/http/HttpRequestDecoder.java | 6 +
.../handler/codec/http/HttpResponseDecoder.java | 6 +
.../netty/handler/codec/http/HttpServerCodec.java | 10 +
.../handler/codec/http/cookie/CookieUtil.java | 60 +-
.../multipart/HttpPostMultipartRequestDecoder.java | 5 +
.../http/websocketx/WebSocket08FrameEncoder.java | 2 +-
.../http/websocketx/WebSocketClientHandshaker.java | 34 +-
.../websocketx/WebSocketClientHandshaker00.java | 5 +-
.../websocketx/WebSocketClientHandshaker07.java | 6 +-
.../websocketx/WebSocketClientHandshaker08.java | 6 +-
.../websocketx/WebSocketClientHandshaker13.java | 6 +-
.../websocketx/WebSocketServerHandshaker00.java | 2 +-
.../WebSocketServerProtocolHandshakeHandler.java | 5 +
.../codec/http/cookie/ServerCookieEncoderTest.java | 30 +
.../http/multipart/HttpPostRequestDecoderTest.java | 64 ++
.../websocketx/WebSocketClientHandshakerTest.java | 116 ++++
codec-socks/pom.xml | 2 +-
.../handler/codec/socks/SocksAuthRequest.java | 2 +-
codec/pom.xml | 2 +-
.../io/netty/handler/codec/ByteToMessageCodec.java | 6 +-
.../netty/handler/codec/ByteToMessageDecoder.java | 28 +-
.../netty/handler/codec/LineBasedFrameDecoder.java | 14 +-
.../java/io/netty/handler/codec/base64/Base64.java | 12 +-
.../handler/codec/ByteToMessageDecoderTest.java | 76 ++-
.../netty/handler/codec/ReplayingDecoderTest.java | 14 +-
.../io/netty/handler/codec/base64/Base64Test.java | 62 ++
common/pom.xml | 2 +-
.../src/main/java/io/netty/util/CharsetUtil.java | 107 ++-
common/src/main/java/io/netty/util/NetUtil.java | 33 +-
.../java/io/netty/util/ResourceLeakDetector.java | 29 +-
.../netty/util/concurrent/PromiseAggregator.java | 3 +
.../io/netty/util/concurrent/PromiseCombiner.java | 75 +++
.../io/netty/util/concurrent/PromiseNotifier.java | 19 +-
.../util/concurrent/UnaryPromiseNotifier.java | 51 ++
.../netty/util/internal/BaseLinkedAtomicQueue.java | 110 ++++
.../io/netty/util/internal/BaseLinkedQueue.java | 158 +++++
.../netty/util/internal/LinkedQueueAtomicNode.java | 71 ++
.../io/netty/util/internal/LinkedQueueNode.java | 80 +++
.../netty/util/internal/MessagePassingQueue.java | 297 +++++++++
.../netty/util/internal/NativeLibraryLoader.java | 21 +
.../io/netty/util/internal/PlatformDependent.java | 11 +
.../netty/util/internal/SpscLinkedAtomicQueue.java | 118 ++++
.../io/netty/util/internal/SpscLinkedQueue.java | 215 ++++++
.../java/io/netty/util/internal/StringUtil.java | 61 ++
.../netty/util/concurrent/PromiseCombinerTest.java | 194 ++++++
.../netty/util/concurrent/PromiseNotifierTest.java | 1 +
.../io/netty/util/internal/StringUtilTest.java | 55 ++
example/pom.xml | 4 +-
.../websocketx/server/WebSocketFrameHandler.java | 48 ++
.../server/WebSocketIndexPageHandler.java | 110 ++++
.../websocketx/server/WebSocketServerHandler.java | 159 -----
.../server/WebSocketServerInitializer.java | 5 +-
handler/pom.xml | 4 +-
.../main/java/io/netty/handler/ssl/OpenSsl.java | 114 +++-
.../handler/ssl/OpenSslCertificateException.java | 80 +++
.../io/netty/handler/ssl/OpenSslClientContext.java | 94 +--
.../java/io/netty/handler/ssl/OpenSslContext.java | 47 +-
.../java/io/netty/handler/ssl/OpenSslEngine.java | 15 +-
.../io/netty/handler/ssl/OpenSslServerContext.java | 125 +---
.../main/java/io/netty/handler/ssl/PemReader.java | 45 +-
.../main/java/io/netty/handler/ssl/SslContext.java | 52 +-
.../io/netty/handler/ssl/SslContextBuilder.java | 75 +++
.../main/java/io/netty/handler/ssl/SslHandler.java | 31 +-
.../main/java/io/netty/handler/ssl/SslUtils.java | 3 +
...tiateTest.java => JdkSslClientContextTest.java} | 19 +-
.../netty/handler/ssl/JdkSslServerContextTest.java | 33 +-
...iateTest.java => OpenSslClientContextTest.java} | 19 +-
.../io/netty/handler/ssl/OpenSslEngineTest.java | 35 +
.../netty/handler/ssl/OpenSslRenegotiateTest.java | 2 +
...iateTest.java => OpenSslServerContextTest.java} | 17 +-
.../java/io/netty/handler/ssl/SSLEngineTest.java | 2 +-
.../java/io/netty/handler/ssl/SniClientTest.java | 105 +++
.../java/io/netty/handler/ssl/SniHandlerTest.java | 11 +-
.../java/io/netty/handler/ssl/SslContextTest.java | 89 +++
.../handler/ssl/test_encrypted_empty_pass.pem | 29 +
microbench/pom.xml | 8 +-
pom.xml | 94 ++-
tarball/pom.xml | 2 +-
testsuite-osgi/pom.xml | 14 +-
testsuite/pom.xml | 4 +-
.../testsuite/transport/socket/SocketRstTest.java | 144 +++++
.../socket/SocketSslClientRenegotiateTest.java | 2 +
.../websockets/autobahn/AutobahnServer.java | 4 +-
transport-native-epoll/pom.xml | 4 +-
.../src/main/c/io_netty_channel_epoll_Native.h | 90 ---
.../src/main/c/io_netty_channel_unix_Errors.h | 31 -
.../main/c/io_netty_channel_unix_FileDescriptor.h | 30 -
.../src/main/c/io_netty_channel_unix_Socket.h | 57 --
...channel_epoll_Native.c => netty_epoll_native.c} | 718 +++++++++++++--------
...y_channel_unix_Errors.c => netty_unix_errors.c} | 101 +--
.../src/main/c/netty_unix_errors.h | 2 +-
...ileDescriptor.c => netty_unix_filedescriptor.c} | 161 +++--
.../src/main/c/netty_unix_filedescriptor.h | 2 +-
...y_channel_unix_Socket.c => netty_unix_socket.c} | 382 +++++++----
.../src/main/c/netty_unix_socket.h | 2 +-
.../src/main/c/netty_unix_util.c | 25 +
.../src/main/c/netty_unix_util.h | 9 +
.../netty/channel/epoll/AbstractEpollChannel.java | 23 +-
.../channel/epoll/AbstractEpollServerChannel.java | 2 +-
.../channel/epoll/AbstractEpollStreamChannel.java | 53 +-
.../main/java/io/netty/channel/epoll/Epoll.java | 4 +-
.../io/netty/channel/epoll/EpollChannelOption.java | 2 +
.../netty/channel/epoll/EpollDatagramChannel.java | 6 +-
.../channel/epoll/EpollDatagramChannelConfig.java | 86 ++-
.../channel/epoll/EpollServerChannelConfig.java | 36 +-
.../channel/epoll/EpollServerSocketChannel.java | 3 +-
.../epoll/EpollServerSocketChannelConfig.java | 69 +-
.../io/netty/channel/epoll/EpollSocketChannel.java | 57 +-
.../channel/epoll/EpollSocketChannelConfig.java | 224 +++++--
.../main/java/io/netty/channel/epoll/Native.java | 96 ++-
.../NativeStaticallyReferencedJniMethods.java | 45 ++
.../java/io/netty/channel/epoll/TcpMd5Util.java | 4 +-
.../io/netty/channel/unix/DomainSocketChannel.java | 4 +-
.../main/java/io/netty/channel/unix/Errors.java | 19 +-
.../unix/ErrorsStaticallyReferencedJniMethods.java | 41 ++
.../java/io/netty/channel/unix/FileDescriptor.java | 72 ++-
.../main/java/io/netty/channel/unix/Socket.java | 159 +++--
.../io/netty/channel/epoll/EpollReuseAddrTest.java | 2 +-
.../epoll/EpollServerSocketChannelConfigTest.java | 78 +++
.../epoll/EpollSocketChannelConfigTest.java | 38 +-
.../io/netty/channel/epoll/EpollSocketRstTest.java | 49 ++
.../netty/channel/epoll/EpollSocketTcpMd5Test.java | 2 +
transport-rxtx/pom.xml | 2 +-
transport-sctp/pom.xml | 12 +-
transport-udt/pom.xml | 2 +-
transport/pom.xml | 2 +-
.../java/io/netty/channel/AbstractChannel.java | 59 +-
.../channel/AbstractChannelHandlerContext.java | 68 +-
.../main/java/io/netty/channel/ChannelFuture.java | 24 +-
.../java/io/netty/channel/ChannelPipeline.java | 8 +-
.../io/netty/channel/ChannelPromiseAggregator.java | 4 +
.../channel/CombinedChannelDuplexHandler.java | 2 +-
.../io/netty/channel/DefaultChannelPipeline.java | 542 +++++++++++-----
.../java/io/netty/channel/PendingWriteQueue.java | 52 +-
.../netty/channel/SimpleChannelInboundHandler.java | 6 +-
.../java/io/netty/channel/local/LocalChannel.java | 2 +-
.../{SocketChannel.java => DuplexChannel.java} | 19 +-
.../io/netty/channel/socket/SocketChannel.java | 29 +-
.../channel/CombinedChannelDuplexHandlerTest.java | 66 ++
.../channel/DefaultChannelHandlerContextTest.java | 75 +++
.../netty/channel/DefaultChannelPipelineTest.java | 415 ++++++++++++
.../io/netty/channel/PendingWriteQueueTest.java | 51 +-
.../io/netty/channel/nio/NioSocketChannelTest.java | 99 +++
160 files changed, 6883 insertions(+), 2162 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