[netty] 03/04: Merge tag 'upstream/4.0.36'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty.

commit f545a28161a452382fdacd05cad09407001bc9b6
Merge: 29e81f5 97a576c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 20 18:06:50 2016 +0200

    Merge tag 'upstream/4.0.36'
    
    Upstream version 4.0.36

 all/pom.xml                                        |   2 +-
 buffer/pom.xml                                     |   2 +-
 .../java/io/netty/buffer/UnsafeByteBufUtil.java    |   2 +-
 .../io/netty/buffer/UnsafeByteBufUtilTest.java     |  38 ++++++
 codec-haproxy/pom.xml                              |   2 +-
 codec-http/pom.xml                                 |   2 +-
 .../codec/http/cookie/ClientCookieEncoder.java     |   4 +-
 .../handler/codec/http/cookie/CookieUtil.java      |  51 +++++--
 .../handler/codec/http/cookie/DefaultCookie.java   |  61 +++------
 .../multipart/HttpPostMultipartRequestDecoder.java |   3 +-
 .../codec/http/cookie/ServerCookieEncoderTest.java |  31 ++++-
 codec-socks/pom.xml                                |   2 +-
 codec/pom.xml                                      |   2 +-
 common/pom.xml                                     |   2 +-
 .../src/main/java/io/netty/util/IntSupplier.java   |  29 ++++
 .../util/internal/InternalThreadLocalMap.java      |  45 ++++---
 .../java/io/netty/util/internal/StringUtil.java    |   5 +-
 .../internal/UnpaddedInternalThreadLocalMap.java   |   6 +-
 example/pom.xml                                    |   2 +-
 .../server/WebSocketServerInitializer.java         |   2 +
 handler/pom.xml                                    |   2 +-
 .../handler/ssl/IdentityCipherSuiteFilter.java     |   5 +-
 .../io/netty/handler/ssl/JdkSslClientContext.java  |  34 ++---
 .../io/netty/handler/ssl/JdkSslServerContext.java  |  37 +++---
 .../io/netty/handler/ssl/OpenSslClientContext.java |  15 ++-
 .../java/io/netty/handler/ssl/OpenSslEngine.java   |   4 +-
 .../io/netty/handler/ssl/OpenSslServerContext.java |  32 ++---
 .../main/java/io/netty/handler/ssl/PemReader.java  |   3 +-
 .../main/java/io/netty/handler/ssl/SslContext.java |  38 +++---
 .../io/netty/handler/ssl/SslContextBuilder.java    |  27 ++--
 .../main/java/io/netty/handler/ssl/SslHandler.java |  30 ++++-
 .../handler/ssl/SupportedCipherSuiteFilter.java    |   7 +-
 .../ssl/util/FingerprintTrustManagerFactory.java   |   6 +-
 .../handler/ssl/SslContextTrustManagerTest.java    | 147 +++++++++++++++++++++
 .../java/io/netty/handler/ssl/SslHandlerTest.java  |  50 +++++++
 .../io/netty/handler/ssl/tm_test_ca_1a.pem         |  19 +++
 .../io/netty/handler/ssl/tm_test_ca_1b.pem         |  19 +++
 .../io/netty/handler/ssl/tm_test_ca_2.pem          |  19 +++
 .../io/netty/handler/ssl/tm_test_eec_1.pem         |  19 +++
 .../io/netty/handler/ssl/tm_test_eec_2.pem         |  19 +++
 .../io/netty/handler/ssl/tm_test_eec_3.pem         |  19 +++
 microbench/pom.xml                                 |   2 +-
 ....java => FastThreadLocalFastPathBenchmark.java} |  12 +-
 ....java => FastThreadLocalSlowPathBenchmark.java} |  18 +--
 .../microbench/util/AbstractMicrobenchmark.java    | 102 +++++---------
 ...chmark.java => AbstractMicrobenchmarkBase.java} |  87 ++++++------
 pom.xml                                            |   6 +-
 tarball/pom.xml                                    |   2 +-
 testsuite-osgi/pom.xml                             |   2 +-
 testsuite/pom.xml                                  |   2 +-
 transport-native-epoll/pom.xml                     |   2 +-
 .../src/main/c/netty_unix_socket.c                 |   2 +-
 .../channel/epoll/AbstractEpollServerChannel.java  |   1 +
 .../channel/epoll/AbstractEpollStreamChannel.java  |  25 +++-
 .../io/netty/channel/epoll/EpollChannelOption.java |   2 +-
 .../io/netty/channel/epoll/EpollEventLoop.java     | 102 +++++++-------
 .../netty/channel/epoll/EpollEventLoopGroup.java   |  41 +++++-
 .../channel/epoll/EpollServerSocketChannel.java    |   2 +-
 .../java/io/netty/channel/unix/FileDescriptor.java |  14 +-
 .../main/java/io/netty/channel/unix/Socket.java    |  19 ++-
 .../channel/epoll/EpollSocketChannelTest.java      |   7 +-
 transport-rxtx/pom.xml                             |   2 +-
 transport-sctp/pom.xml                             |   2 +-
 transport-udt/pom.xml                              |   2 +-
 transport/pom.xml                                  |   2 +-
 .../java/io/netty/channel/ChannelInitializer.java  |   2 +-
 .../io/netty/channel/DefaultSelectStrategy.java    |  32 +++++
 .../channel/DefaultSelectStrategyFactory.java      |  30 +++++
 .../main/java/io/netty/channel/SelectStrategy.java |  48 +++++++
 .../io/netty/channel/SelectStrategyFactory.java    |  27 ++++
 .../io/netty/channel/embedded/EmbeddedChannel.java |  93 ++++++++++++-
 .../java/io/netty/channel/nio/NioEventLoop.java    |  99 ++++++++------
 .../io/netty/channel/nio/NioEventLoopGroup.java    |  12 +-
 .../io/netty/channel/ChannelInitializerTest.java   | 108 +++++++++++++++
 .../channel/embedded/EmbeddedChannelTest.java      | 137 +++++++++++++++++++
 75 files changed, 1426 insertions(+), 464 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git