[netty] 01/04: Merge tag 'upstream/4.0.41'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Aug 30 06:56:56 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 0bfd9f53b3e354d29aef81938f05269c56e6716c
Merge: 1547585 b899523
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 30 00:28:14 2016 +0200

    Merge tag 'upstream/4.0.41'
    
    Upstream version 4.0.41

 all/pom.xml                                        |    2 +-
 buffer/pom.xml                                     |    2 +-
 .../main/java/io/netty/buffer/AbstractByteBuf.java |   80 +-
 .../buffer/AbstractReferenceCountedByteBuf.java    |   22 +-
 buffer/src/main/java/io/netty/buffer/ByteBuf.java  |    2 +-
 .../src/main/java/io/netty/buffer/ByteBufUtil.java |  103 +-
 .../java/io/netty/buffer/CompositeByteBuf.java     |   21 +-
 .../main/java/io/netty/buffer/PoolThreadCache.java |    2 +-
 buffer/src/main/java/io/netty/buffer/Unpooled.java |   21 +-
 .../netty/buffer/UnpooledUnsafeDirectByteBuf.java  |    8 +-
 .../WrappedUnpooledUnsafeDirectByteBuf.java}       |   16 +-
 .../java/io/netty/buffer/AbstractByteBufTest.java  |   23 +
 .../io/netty/buffer/AbstractPooledByteBufTest.java |   49 +-
 .../AbstractReferenceCountedByteBufTest.java       |  263 +++
 .../BigEndianUnsafeNoCleanerDirectByteBufTest.java |    3 +-
 ...ttleEndianUnsafeNoCleanerDirectByteBufTest.java |    3 +-
 .../test/java/io/netty/buffer/UnpooledTest.java    |   34 +-
 .../buffer/WrappedUnpooledUnsafeByteBufTest.java   |  114 ++
 codec-haproxy/pom.xml                              |    2 +-
 .../handler/codec/haproxy/HAProxyMessage.java      |    3 +-
 codec-http/pom.xml                                 |    2 +-
 .../io/netty/handler/codec/http/CookieDecoder.java |    5 +-
 .../handler/codec/http/HttpContentCompressor.java  |    5 +-
 .../io/netty/handler/codec/http/HttpHeaders.java   |    3 +-
 .../handler/codec/http/HttpObjectEncoder.java      |    2 +-
 .../handler/codec/http/HttpRequestEncoder.java     |    1 -
 .../handler/codec/http/HttpResponseEncoder.java    |    1 -
 .../handler/codec/http/cookie/DefaultCookie.java   |    4 +-
 .../netty/handler/codec/http/cors/CorsHandler.java |    1 -
 .../multipart/HttpPostMultipartRequestDecoder.java |    4 +-
 .../http/websocketx/WebSocketClientHandshaker.java |    3 +-
 .../http/websocketx/WebSocketServerHandshaker.java |    5 +-
 .../codec/http/cookie/ServerCookieDecoderTest.java |   25 +-
 .../handler/codec/http/cors/CorsHandlerTest.java   |    5 +
 codec-socks/pom.xml                                |    2 +-
 codec/pom.xml                                      |    2 +-
 common/pom.xml                                     |    2 +-
 .../io/netty/util/AbstractReferenceCounted.java    |   13 +-
 common/src/main/java/io/netty/util/Attribute.java  |   22 +-
 common/src/main/java/io/netty/util/Recycler.java   |  139 +-
 .../java/io/netty/util/ResourceLeakDetector.java   |    5 +-
 .../io/netty/util/collection/IntObjectHashMap.java |    1 +
 .../io/netty/util/concurrent/PromiseNotifier.java  |   21 +-
 .../util/concurrent/SingleThreadEventExecutor.java |    7 +-
 .../main/java/io/netty/util/internal/Cleaner0.java |   19 +-
 .../java/io/netty/util/internal/EmptyArrays.java   |   27 +-
 .../main/java/io/netty/util/internal/MathUtil.java |   20 +-
 .../netty/util/internal/NativeLibraryLoader.java   |  145 +-
 .../io/netty/util/internal/NativeLibraryUtil.java  |   45 +
 .../java/io/netty/util/internal/ObjectUtil.java    |   75 +
 .../io/netty/util/internal/PlatformDependent.java  |   90 +-
 .../io/netty/util/internal/PlatformDependent0.java |  207 ++-
 .../java/io/netty/util/internal/StringUtil.java    |  123 +-
 .../io/netty/util/internal/SystemPropertyUtil.java |   56 +-
 .../io/netty/util/internal/ThreadLocalRandom.java  |   11 +-
 .../java/io/netty/util/internal/UnstableApi.java   |   47 +
 .../netty/util/internal/logging/CommonsLogger.java |    4 +
 .../internal/logging/CommonsLoggerFactory.java     |    7 +-
 .../netty/util/AbstractReferenceCountedTest.java   |   72 +
 .../src/test/java/io/netty/util/RecyclerTest.java  |  125 +-
 .../io/netty/util/internal/StringUtilTest.java     |   31 +-
 example/pom.xml                                    |    2 +-
 .../http/file/HttpStaticFileServerHandler.java     |    9 +-
 .../example/proxy/HexDumpProxyFrontendHandler.java |    4 +-
 handler/pom.xml                                    |    2 +-
 .../main/java/io/netty/handler/ssl/OpenSsl.java    |   61 +
 .../io/netty/handler/ssl/OpenSslClientContext.java |  237 +--
 .../java/io/netty/handler/ssl/OpenSslContext.java  |  643 +------
 .../java/io/netty/handler/ssl/OpenSslEngine.java   | 1851 +-------------------
 .../io/netty/handler/ssl/OpenSslEngineMap.java     |    6 +-
 .../ssl/OpenSslExtendedKeyMaterialManager.java     |    5 +-
 .../handler/ssl/OpenSslKeyMaterialManager.java     |   92 +-
 .../io/netty/handler/ssl/OpenSslServerContext.java |  119 +-
 .../handler/ssl/OpenSslServerSessionContext.java   |    2 +-
 .../netty/handler/ssl/OpenSslSessionContext.java   |    4 +-
 .../io/netty/handler/ssl/OpenSslSessionStats.java  |    4 +-
 .../io/netty/handler/ssl/PemX509Certificate.java   |   25 +-
 .../ssl/ReferenceCountedOpenSslClientContext.java  |  300 ++++
 ...xt.java => ReferenceCountedOpenSslContext.java} |  190 +-
 ...ine.java => ReferenceCountedOpenSslEngine.java} |  399 +++--
 .../ssl/ReferenceCountedOpenSslServerContext.java  |  195 +++
 .../main/java/io/netty/handler/ssl/SniHandler.java |   17 +-
 .../main/java/io/netty/handler/ssl/SslContext.java |   33 +-
 .../io/netty/handler/ssl/SslContextBuilder.java    |    2 +
 .../main/java/io/netty/handler/ssl/SslHandler.java |   60 +-
 .../java/io/netty/handler/ssl/SslProvider.java     |   10 +-
 .../io/netty/handler/ssl/OpenSslEngineTest.java    |   34 +-
 .../java/io/netty/handler/ssl/PemEncodedTest.java  |   95 +
 .../ssl/ReferenceCountedOpenSslEngineTest.java     |   23 +-
 .../java/io/netty/handler/ssl/SSLEngineTest.java   |  117 +-
 .../java/io/netty/handler/ssl/SslHandlerTest.java  |   56 +-
 microbench/pom.xml                                 |    2 +-
 pom.xml                                            |   12 +-
 tarball/pom.xml                                    |    2 +-
 testsuite-osgi/pom.xml                             |    2 +-
 testsuite/pom.xml                                  |    2 +-
 .../socket/SocketChannelNotYetConnectedTest.java   |   56 +
 .../transport/socket/SocketConnectTest.java        |   43 +
 .../socket/SocketMultipleConnectTest.java          |   74 +
 transport-native-epoll/pom.xml                     |    2 +-
 .../src/main/c/netty_unix_errors.c                 |   15 +
 .../netty/channel/epoll/AbstractEpollChannel.java  |   17 +-
 .../channel/epoll/AbstractEpollStreamChannel.java  |    9 +-
 .../io/netty/channel/epoll/EpollSocketChannel.java |    8 +
 .../main/java/io/netty/channel/unix/Errors.java    |   34 +-
 .../unix/ErrorsStaticallyReferencedJniMethods.java |    3 +
 .../main/java/io/netty/channel/unix/Socket.java    |    6 +-
 .../io/netty/channel/epoll/EpollReuseAddrTest.java |    3 +-
 .../EpollSocketChannelNotYetConnectedTest.java     |   21 +-
 .../channel/epoll/EpollSocketChannelTest.java      |   10 +-
 .../epoll/EpollSocketMultipleConnectTest.java      |   43 +
 transport-rxtx/pom.xml                             |    2 +-
 transport-sctp/pom.xml                             |    2 +-
 .../channel/sctp/DefaultSctpChannelConfig.java     |    3 +
 .../sctp/DefaultSctpServerChannelConfig.java       |   26 +-
 .../netty/channel/sctp/SctpLimitStreamsTest.java   |   68 +
 .../channel/sctp/nio/NioSctpLimitStreamsTest.java  |   27 +-
 .../channel/sctp/oio/OioSctpLimitStreamsTest.java  |   27 +-
 transport-udt/pom.xml                              |    2 +-
 transport/pom.xml                                  |    2 +-
 .../java/io/netty/channel/AbstractChannel.java     |   63 +-
 .../main/java/io/netty/channel/ChannelConfig.java  |    4 +-
 .../java/io/netty/channel/ChannelInitializer.java  |   56 +-
 .../main/java/io/netty/channel/ChannelOption.java  |    2 +-
 .../io/netty/channel/ChannelOutboundBuffer.java    |    5 +-
 .../io/netty/channel/ChannelPromiseNotifier.java   |   12 +-
 .../java/io/netty/channel/PendingWriteQueue.java   |   87 +-
 .../io/netty/channel/embedded/EmbeddedChannel.java |    2 +-
 .../io/netty/channel/nio/AbstractNioChannel.java   |   10 +-
 .../java/io/netty/channel/nio/NioEventLoop.java    |   95 +-
 .../io/netty/channel/oio/AbstractOioChannel.java   |    7 +-
 .../channel/socket/nio/NioDatagramChannel.java     |   12 +-
 .../channel/socket/nio/NioServerSocketChannel.java |    7 +-
 .../netty/channel/socket/nio/NioSocketChannel.java |   38 +-
 .../io/netty/channel/AbstractEventLoopTest.java    |   21 +
 .../io/netty/channel/ChannelInitializerTest.java   |   83 +
 .../netty/channel/ChannelOutboundBufferTest.java   |   10 +-
 .../io/netty/channel/PendingWriteQueueTest.java    |   37 +
 138 files changed, 3807 insertions(+), 4021 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