This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository netty.
commit ef42876bc088304623cc66a44870bd58f344906d Merge: 674482f 971df66 Author: Emmanuel Bourg <[email protected]> Date: Thu Nov 19 23:27:49 2015 +0100 Merge tag 'upstream/4.0.33' Upstream version 4.0.33 README.md | 2 +- all/pom.xml | 2 +- buffer/pom.xml | 2 +- .../main/java/io/netty/buffer/AbstractByteBuf.java | 121 +- .../netty/buffer/AbstractUnsafeSwappedByteBuf.java | 169 +++ .../src/main/java/io/netty/buffer/ByteBufUtil.java | 151 ++- .../java/io/netty/buffer/DefaultByteBufHolder.java | 10 +- .../io/netty/buffer/DuplicatedAbstractByteBuf.java | 80 ++ .../java/io/netty/buffer/DuplicatedByteBuf.java | 20 +- .../main/java/io/netty/buffer/HeapByteBufUtil.java | 89 ++ .../src/main/java/io/netty/buffer/PoolArena.java | 10 +- .../src/main/java/io/netty/buffer/PoolChunk.java | 47 +- .../src/main/java/io/netty/buffer/PoolSubpage.java | 95 +- .../main/java/io/netty/buffer/PoolThreadCache.java | 17 +- .../java/io/netty/buffer/PooledHeapByteBuf.java | 103 +- .../io/netty/buffer/PooledUnsafeDirectByteBuf.java | 147 +-- .../io/netty/buffer/PooledUnsafeHeapByteBuf.java | 102 ++ .../netty/buffer/ReadOnlyUnsafeDirectByteBuf.java | 19 +- .../io/netty/buffer/SlicedAbstractByteBuf.java | 81 ++ .../main/java/io/netty/buffer/SlicedByteBuf.java | 95 +- .../io/netty/buffer/UnpooledByteBufAllocator.java | 3 +- .../io/netty/buffer/UnpooledDirectByteBuf.java | 5 - .../java/io/netty/buffer/UnpooledHeapByteBuf.java | 47 +- .../netty/buffer/UnpooledUnsafeDirectByteBuf.java | 146 +-- .../io/netty/buffer/UnpooledUnsafeHeapByteBuf.java | 156 +++ .../java/io/netty/buffer/UnsafeByteBufUtil.java | 389 +++++++ .../netty/buffer/UnsafeDirectSwappedByteBuf.java | 147 +-- .../io/netty/buffer/UnsafeHeapSwappedByteBuf.java | 63 ++ .../main/java/io/netty/buffer/WrappedByteBuf.java | 57 +- .../java/io/netty/buffer/AbstractByteBufTest.java | 3 +- .../netty/buffer/AbstractCompositeByteBufTest.java | 12 +- .../io/netty/buffer/AbstractPooledByteBufTest.java | 9 +- .../netty/buffer/BigEndianDirectByteBufTest.java | 9 +- .../io/netty/buffer/BigEndianHeapByteBufTest.java | 9 +- .../test/java/io/netty/buffer/ByteBufUtilTest.java | 48 + .../io/netty/buffer/DefaultByteBufHolderTest.java | 24 +- .../java/io/netty/buffer/DuplicateByteBufTest.java | 10 +- .../java/io/netty/buffer/EmptyByteBufTest.java | 9 +- .../io/netty/buffer/FixedCompositeByteBufTest.java | 14 +- .../buffer/LittleEndianDirectByteBufTest.java | 9 +- .../netty/buffer/LittleEndianHeapByteBufTest.java | 9 +- .../netty/buffer/PooledByteBufAllocatorTest.java | 140 +++ .../buffer/ReadOnlyDirectByteBufferBufTest.java | 80 +- .../java/io/netty/buffer/SlicedByteBufTest.java | 33 +- codec-haproxy/pom.xml | 2 +- codec-http/pom.xml | 2 +- .../codec/http/websocketx/WebSocketFrame.java | 2 +- .../io/netty/handler/codec/rtsp/RtspDecoder.java | 174 +++ .../io/netty/handler/codec/rtsp/RtspEncoder.java | 75 ++ .../handler/codec/rtsp/RtspObjectDecoder.java | 3 + .../handler/codec/rtsp/RtspObjectEncoder.java | 3 + .../handler/codec/rtsp/RtspRequestDecoder.java | 74 +- .../handler/codec/rtsp/RtspRequestEncoder.java | 32 +- .../handler/codec/rtsp/RtspResponseDecoder.java | 79 +- .../handler/codec/rtsp/RtspResponseEncoder.java | 31 +- .../netty/handler/codec/rtsp/RtspDecoderTest.java | 73 ++ .../netty/handler/codec/rtsp/RtspEncoderTest.java | 173 +++ codec-socks/pom.xml | 2 +- codec/pom.xml | 2 +- .../netty/handler/codec/ByteToMessageDecoder.java | 27 +- .../io/netty/handler/codec/ReplayingDecoder.java | 12 +- common/pom.xml | 2 +- .../java/io/netty/util/ResourceLeakDetector.java | 12 +- .../io/netty/util/concurrent/DefaultPromise.java | 12 +- .../netty/util/concurrent/GlobalEventExecutor.java | 5 +- .../main/java/io/netty/util/internal/MathUtil.java | 51 + .../io/netty/util/internal/PlatformDependent.java | 43 + .../io/netty/util/internal/PlatformDependent0.java | 136 +-- .../netty/util/internal/RecyclableArrayList.java | 33 +- .../netty/util/concurrent/DefaultPromiseTest.java | 32 + example/pom.xml | 2 +- .../example/proxy/HexDumpProxyBackendHandler.java | 2 - handler/pom.xml | 2 +- .../java/io/netty/handler/ssl/OpenSslEngine.java | 121 +- .../io/netty/handler/ssl/OpenSslServerContext.java | 22 +- .../netty/handler/ssl/JdkSslRenegotiateTest.java | 13 +- .../io/netty/handler/ssl/OpenSslEngineTest.java | 12 + .../netty/handler/ssl/OpenSslRenegotiateTest.java | 21 +- .../java/io/netty/handler/ssl/RenegotiateTest.java | 137 +++ .../java/io/netty/handler/ssl/SSLEngineTest.java | 84 ++ microbench/pom.xml | 6 +- .../netty/microbench/buffer/ByteBufBenchmark.java | 80 ++ .../microbench/buffer/ByteBufUtilBenchmark.java | 21 +- .../microbench/buffer/HeapByteBufBenchmark.java | 103 ++ .../microbench/buffer/SlicedByteBufBenchmark.java | 76 ++ .../microbench/util/AbstractMicrobenchmark.java | 10 +- .../util/ResourceLeakDetectorBenchmark.java | 28 +- pom.xml | 6 +- tarball/pom.xml | 2 +- testsuite-osgi/pom.xml | 2 +- testsuite/pom.xml | 2 +- transport-native-epoll/pom.xml | 6 +- .../src/main/c/io_netty_channel_epoll_Native.c | 1184 ++------------------ .../src/main/c/io_netty_channel_epoll_Native.h | 54 +- .../src/main/c/io_netty_channel_unix_Errors.c | 191 ++++ .../src/main/c/io_netty_channel_unix_Errors.h | 31 + .../main/c/io_netty_channel_unix_FileDescriptor.c | 211 +++- .../main/c/io_netty_channel_unix_FileDescriptor.h | 15 +- .../src/main/c/io_netty_channel_unix_Socket.c | 715 ++++++++++++ .../src/main/c/io_netty_channel_unix_Socket.h | 56 + .../src/main/c/netty_unix_errors.h | 33 + ...ileDescriptor.h => netty_unix_filedescriptor.h} | 12 +- .../src/main/c/netty_unix_socket.h | 31 + .../netty/channel/epoll/AbstractEpollChannel.java | 80 +- .../channel/epoll/AbstractEpollServerChannel.java | 31 +- .../channel/epoll/AbstractEpollStreamChannel.java | 137 ++- .../main/java/io/netty/channel/epoll/Epoll.java | 18 +- .../netty/channel/epoll/EpollDatagramChannel.java | 64 +- .../channel/epoll/EpollDatagramChannelConfig.java | 8 +- .../channel/epoll/EpollDomainSocketChannel.java | 30 +- .../io/netty/channel/epoll/EpollEventLoop.java | 74 +- .../channel/epoll/EpollServerChannelConfig.java | 5 +- .../epoll/EpollServerDomainSocketChannel.java | 24 +- .../channel/epoll/EpollServerSocketChannel.java | 39 +- .../io/netty/channel/epoll/EpollSocketChannel.java | 41 +- .../channel/epoll/EpollSocketChannelConfig.java | 24 +- .../main/java/io/netty/channel/epoll/Native.java | 524 +-------- .../channel/epoll/NativeDatagramPacketArray.java | 3 +- .../netty/channel/unix/DatagramSocketAddress.java | 40 + .../main/java/io/netty/channel/unix/Errors.java | 134 +++ .../java/io/netty/channel/unix/FileDescriptor.java | 94 +- .../io/netty/channel/unix/NativeInetAddress.java | 107 ++ .../main/java/io/netty/channel/unix/Socket.java | 363 ++++++ .../channel/epoll/EpollSocketChannelTest.java | 109 ++ .../java/io/netty/channel/epoll/NativeTest.java | 6 +- transport-rxtx/pom.xml | 2 +- transport-sctp/pom.xml | 2 +- .../java/io/netty/channel/sctp/SctpMessage.java | 13 +- transport-udt/pom.xml | 2 +- transport/pom.xml | 2 +- .../java/io/netty/channel/AbstractChannel.java | 2 +- .../channel/AbstractChannelHandlerContext.java | 130 ++- .../netty/channel/DefaultMessageSizeEstimator.java | 4 +- .../io/netty/channel/embedded/EmbeddedChannel.java | 34 +- .../io/netty/channel/pool/FixedChannelPool.java | 42 +- .../io/netty/channel/PendingWriteQueueTest.java | 7 +- .../channel/embedded/EmbeddedChannelTest.java | 63 ++ .../netty/channel/pool/FixedChannelPoolTest.java | 36 + 138 files changed, 6179 insertions(+), 3291 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
