[netty-3.9] 08/18: Merge tag 'upstream/3.9.3.Final'

[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-3.9.

commit 6b8306e26fe80965d360a0989fa5abade3c40be5
Merge: 38f9799 b270d15
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:12:26 2017 +0100

    Merge tag 'upstream/3.9.3.Final'
    
    Upstream version 3.9.3.Final

 pom.xml                                            |   6 +-
 .../jboss/netty/channel/DefaultChannelFuture.java  |   4 +
 .../jboss/netty/channel/DefaultExceptionEvent.java |   3 -
 .../channel/socket/nio/AbstractNioWorker.java      |   1 +
 .../netty/channel/socket/nio/NioClientBoss.java    |  10 +-
 .../handler/codec/http/HttpContentEncoder.java     |  15 +-
 .../handler/codec/http/HttpMessageDecoder.java     |  34 ++-
 .../handler/codec/http/HttpRequestEncoder.java     |  19 +-
 .../handler/codec/http/QueryStringDecoder.java     |   2 +-
 .../http/websocketx/WebSocketClientHandshaker.java |  22 ++
 .../websocketx/WebSocketClientHandshaker00.java    |   5 +-
 .../websocketx/WebSocketClientHandshaker07.java    |   7 +-
 .../websocketx/WebSocketClientHandshaker08.java    |   5 +-
 .../websocketx/WebSocketClientHandshaker13.java    |   5 +-
 .../codec/http/websocketx/package-info.java        |  11 +-
 .../netty/handler/codec/spdy/SpdyHttpDecoder.java  |  11 +-
 .../netty/handler/codec/spdy/SpdySession.java      |  42 +--
 .../OrderedMemoryAwareThreadPoolExecutor.java      |   2 +-
 .../netty/handler/ssl/JdkSslServerContext.java     |  53 +++-
 .../org/jboss/netty/handler/ssl/SslHandler.java    |  50 ++--
 .../jboss/netty/logging/InternalLoggerFactory.java |  78 +-----
 .../netty/util/internal/StackTraceSimplifier.java  |  86 -------
 .../codec/http/HttpContentCompressorTest.java      | 259 ++++++++++++++++++-
 .../handler/codec/http/HttpContentEncoderTest.java | 285 +++++++++++++++++++++
 .../handler/codec/http/HttpRequestEncoderTest.java |   9 +
 .../codec/http/HttpResponseDecoderTest.java        |  95 +++++++
 .../netty/handler/ssl/JdkSslServerContextTest.java |  42 +++
 .../netty/logging/InternalLoggerFactoryTest.java   |   6 -
 .../util/internal/StackTraceSimplifierTest.java    | 118 ---------
 .../resources/org/jboss/netty/handler/ssl/test.crt |  19 ++
 .../org/jboss/netty/handler/ssl/test_encrypted.pem |  29 +++
 .../jboss/netty/handler/ssl/test_unencrypted.pem   |  24 ++
 32 files changed, 979 insertions(+), 378 deletions(-)

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