[netty] 01/03: Merge tag 'upstream/4.0.32'

[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 e790d7020aea92c29275cf4f40c01f528648be39
Merge: 2210be0 a74da25
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 3 01:06:55 2015 +0200

    Merge tag 'upstream/4.0.32'
    
    Upstream version 4.0.32

 all/pom.xml                                        |   4 +-
 buffer/pom.xml                                     |   2 +-
 .../main/java/io/netty/buffer/AbstractByteBuf.java |  10 +-
 .../main/java/io/netty/buffer/PooledByteBuf.java   |  13 +-
 .../java/io/netty/buffer/PooledDirectByteBuf.java  |   3 +-
 .../java/io/netty/buffer/PooledHeapByteBuf.java    |   3 +-
 .../io/netty/buffer/PooledUnsafeDirectByteBuf.java |   3 +-
 .../io/netty/buffer/AbstractPooledByteBufTest.java |  13 +-
 codec-haproxy/pom.xml                              |   2 +-
 codec-http/pom.xml                                 |   2 +-
 .../handler/codec/http/DefaultHttpHeaders.java     |   6 +
 .../websocketx/WebSocketServerProtocolHandler.java |  11 +-
 .../WebSocketServerProtocolHandshakeHandler.java   |   2 +-
 .../netty/handler/codec/spdy/SpdyHttpHeaders.java  |  16 +-
 .../netty/handler/codec/http/HttpHeadersTest.java  |  12 ++
 .../WebSocketServerProtocolHandlerTest.java        |   2 +-
 codec-socks/pom.xml                                |   2 +-
 codec/pom.xml                                      |   2 +-
 .../netty/handler/codec/ByteToMessageDecoder.java  |  22 +++
 common/pom.xml                                     |   2 +-
 example/pom.xml                                    |   4 +-
 handler/pom.xml                                    |   4 +-
 .../main/java/io/netty/handler/ssl/ClientAuth.java |  38 ++++
 .../io/netty/handler/ssl/JdkSslClientContext.java  |   4 +-
 .../java/io/netty/handler/ssl/JdkSslContext.java   |  35 ++--
 .../io/netty/handler/ssl/JdkSslServerContext.java  |   7 +-
 .../io/netty/handler/ssl/OpenSslClientContext.java |   6 +-
 .../java/io/netty/handler/ssl/OpenSslContext.java  |  17 +-
 .../java/io/netty/handler/ssl/OpenSslEngine.java   |  96 ++++-----
 .../io/netty/handler/ssl/OpenSslServerContext.java |   8 +-
 .../netty/handler/ssl/OpenSslSessionContext.java   |  17 ++
 .../netty/handler/ssl/OpenSslSessionTicketKey.java |  78 ++++++++
 .../main/java/io/netty/handler/ssl/SslContext.java |  11 +-
 .../io/netty/handler/ssl/SslContextBuilder.java    |  11 +-
 .../main/java/io/netty/handler/ssl/SslHandler.java |  35 ++--
 .../util/BouncyCastleSelfSignedCertGenerator.java  |   8 +-
 .../ssl/util/OpenJdkSelfSignedCertGenerator.java   |   6 +-
 .../handler/ssl/util/SelfSignedCertificate.java    |  49 ++++-
 .../netty/handler/ssl/SslContextBuilderTest.java   |  34 +++-
 microbench/pom.xml                                 |   2 +-
 pom.xml                                            |  19 +-
 tarball/pom.xml                                    |   2 +-
 testsuite-osgi/pom.xml                             |   2 +-
 testsuite/pom.xml                                  |   4 +-
 .../socket/SocketSslClientRenegotiateTest.java     |   2 +-
 .../transport/socket/SocketSslGreetingTest.java    |  33 ++++
 .../socket/SocketSslSessionReuseTest.java          | 217 +++++++++++++++++++++
 transport-native-epoll/pom.xml                     |   6 +-
 .../src/main/c/io_netty_channel_epoll_Native.c     |  90 +++++++++
 .../src/main/c/io_netty_channel_epoll_Native.h     |   5 +
 .../netty/channel/epoll/AbstractEpollChannel.java  |  18 +-
 .../channel/epoll/AbstractEpollStreamChannel.java  |  22 ++-
 .../io/netty/channel/epoll/EpollChannelOption.java |   6 +
 .../channel/epoll/EpollServerChannelConfig.java    |  41 +++-
 .../channel/epoll/EpollServerSocketChannel.java    |  16 ++
 .../epoll/EpollServerSocketChannelConfig.java      |  15 ++
 .../io/netty/channel/epoll/EpollSocketChannel.java |  13 ++
 .../channel/epoll/EpollSocketChannelConfig.java    |  18 +-
 .../main/java/io/netty/channel/epoll/Native.java   |  14 ++
 .../java/io/netty/channel/epoll/TcpMd5Util.java    |  76 ++++++++
 .../netty/channel/epoll/EpollSocketTcpMd5Test.java | 114 +++++++++++
 .../channel/epoll/EpollSocketTestPermutation.java  |  86 ++++++--
 transport-rxtx/pom.xml                             |   2 +-
 transport-sctp/pom.xml                             |   2 +-
 transport-udt/pom.xml                              |   2 +-
 transport/pom.xml                                  |   2 +-
 .../java/io/netty/channel/AbstractChannel.java     |  33 ++--
 .../netty/channel/nio/AbstractNioByteChannel.java  |  11 +-
 68 files changed, 1256 insertions(+), 217 deletions(-)

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