[netty-3.9] 02/18: Merge tag 'upstream/3.9.2.Final'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jan 10 00:47:39 UTC 2017
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 d8438397d365ecd88da64058db5c7adb8b74face
Merge: 0c59dc4 85e05c8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jan 10 00:29:26 2017 +0100
Merge tag 'upstream/3.9.2.Final'
Upstream version 3.9.2.Final
.gitignore | 42 +-
NOTICE.txt | 25 +-
license/LICENSE.bouncycastle.txt | 23 +
pom.xml | 89 +-
run-example.sh | 87 ++
.../jboss/netty/example/discard/DiscardClient.java | 86 +-
.../example/discard/DiscardClientHandler.java | 21 +-
.../jboss/netty/example/discard/DiscardServer.java | 50 +-
.../example/discard/DiscardServerHandler.java | 13 +-
.../org/jboss/netty/example/echo/EchoClient.java | 89 +-
.../netty/example/echo/EchoClientHandler.java | 31 +-
.../org/jboss/netty/example/echo/EchoServer.java | 54 +-
.../netty/example/echo/EchoServerHandler.java | 20 +-
.../netty/example/factorial/BigIntegerDecoder.java | 10 +-
.../netty/example/factorial/FactorialClient.java | 81 +-
.../example/factorial/FactorialClientHandler.java | 53 +-
.../factorial/FactorialClientPipelineFactory.java | 23 +-
.../netty/example/factorial/FactorialServer.java | 40 +-
.../example/factorial/FactorialServerHandler.java | 34 +-
.../factorial/FactorialServerPipelineFactory.java | 20 +-
.../netty/example/factorial/NumberEncoder.java | 7 +-
.../example/http/file/HttpStaticFileServer.java | 40 +-
.../http/file/HttpStaticFileServerHandler.java | 35 +-
.../file/HttpStaticFileServerPipelineFactory.java | 25 +-
.../http/helloworld/HttpHelloWorldServer.java | 35 +-
.../helloworld/HttpHelloWorldServerHandler.java | 5 +-
.../HttpHelloWorldServerPipelineFactory.java | 18 +-
.../netty/example/http/snoop/HttpSnoopClient.java | 89 +-
.../example/http/snoop/HttpSnoopClientHandler.java | 26 +-
.../http/snoop/HttpSnoopClientPipelineFactory.java | 29 +-
.../netty/example/http/snoop/HttpSnoopServer.java | 35 +-
.../example/http/snoop/HttpSnoopServerHandler.java | 25 +-
.../http/snoop/HttpSnoopServerPipelineFactory.java | 22 +-
.../http/tunnel/HttpTunnelingClientExample.java | 129 +-
.../example/http/upload/HttpUploadClient.java | 294 ++--
.../http/upload/HttpUploadClientHandler.java | 28 +-
.../upload/HttpUploadClientPipelineFactory.java | 29 +-
.../example/http/upload/HttpUploadServer.java | 44 +-
.../http/upload/HttpUploadServerHandler.java | 201 +--
.../upload/HttpUploadServerPipelineFactory.java | 27 +-
.../http/websocketx/autobahn/AutobahnServer.java | 33 +-
.../websocketx/autobahn/AutobahnServerHandler.java | 24 +-
.../autobahn/AutobahnServerPipelineFactory.java | 6 +-
.../http/websocketx/client/WebSocketClient.java | 97 +-
.../websocketx/client/WebSocketClientHandler.java | 26 +-
.../websocketx/html5/CustomTextFrameHandler.java | 33 -
.../http/websocketx/html5/WebSocketServer.java | 79 -
.../html5/WebSocketServerPipelineFactory.java | 38 -
.../http/websocketx/server/WebSocketServer.java | 42 +-
.../websocketx/server/WebSocketServerHandler.java | 25 +-
.../server/WebSocketServerPipelineFactory.java | 19 +-
.../websocketx/sslserver/WebSocketSslServer.java | 87 --
.../sslserver/WebSocketSslServerHandler.java | 152 --
.../WebSocketSslServerPipelineFactory.java | 46 -
.../sslserver/WebSocketSslServerSslContext.java | 102 --
.../http/websocketx/sslserver/package-info.java | 36 -
.../jboss/netty/example/local/LocalExample.java | 123 +-
.../example/local/LocalExampleMultithreaded.java | 105 --
.../example/local/LocalServerPipelineFactory.java | 78 -
.../netty/example/localtime/LocalTimeClient.java | 115 +-
.../example/localtime/LocalTimeClientHandler.java | 27 +-
.../localtime/LocalTimeClientPipelineFactory.java | 16 +-
.../netty/example/localtime/LocalTimeProtocol.java | 1638 ++++++++++++++------
.../netty/example/localtime/LocalTimeServer.java | 40 +-
.../example/localtime/LocalTimeServerHandler.java | 24 +-
.../localtime/LocalTimeServerPipelineFactory.java | 16 +-
.../netty/example/objectecho/ObjectEchoClient.java | 85 +-
.../objectecho/ObjectEchoClientHandler.java | 35 +-
.../netty/example/objectecho/ObjectEchoServer.java | 49 +-
.../objectecho/ObjectEchoServerHandler.java | 28 +-
.../portunification/PortUnificationServer.java | 36 +-
.../PortUnificationServerHandler.java | 25 +-
.../jboss/netty/example/proxy/HexDumpProxy.java | 54 +-
.../example/proxy/HexDumpProxyInboundHandler.java | 46 +-
.../example/proxy/HexDumpProxyPipelineFactory.java | 18 +-
.../netty/example/qotm/QuoteOfTheMomentClient.java | 111 +-
.../qotm/QuoteOfTheMomentClientHandler.java | 6 +-
.../netty/example/qotm/QuoteOfTheMomentServer.java | 38 +-
.../qotm/QuoteOfTheMomentServerHandler.java | 10 +-
.../netty/example/securechat/SecureChatClient.java | 111 +-
.../securechat/SecureChatClientHandler.java | 34 +-
.../SecureChatClientPipelineFactory.java | 29 +-
.../example/securechat/SecureChatKeyStore.java | 313 ----
.../netty/example/securechat/SecureChatServer.java | 33 +-
.../securechat/SecureChatServerHandler.java | 34 +-
.../SecureChatServerPipelineFactory.java | 34 +-
.../securechat/SecureChatSslContextFactory.java | 106 --
.../securechat/SecureChatTrustManagerFactory.java | 74 -
.../jboss/netty/example/telnet/TelnetClient.java | 126 +-
.../netty/example/telnet/TelnetClientHandler.java | 22 +-
.../telnet/TelnetClientPipelineFactory.java | 20 +-
.../jboss/netty/example/telnet/TelnetServer.java | 40 +-
.../netty/example/telnet/TelnetServerHandler.java | 33 +-
.../telnet/TelnetServerPipelineFactory.java | 20 +-
.../jboss/netty/example/uptime/UptimeClient.java | 55 +-
.../netty/example/uptime/UptimeClientHandler.java | 12 +-
.../handler/codec/http/HttpResponseStatus.java | 24 +
.../multipart/HttpPostMultipartRequestDecoder.java | 42 +-
.../http/multipart/HttpPostRequestDecoder.java | 7 +
.../codec/socks/SocksAuthRequestDecoder.java | 4 +
.../codec/socks/SocksAuthResponseDecoder.java | 4 +
.../codec/socks/SocksCmdRequestDecoder.java | 4 +
.../codec/socks/SocksCmdResponseDecoder.java | 4 +
.../codec/socks/SocksInitRequestDecoder.java | 4 +
.../codec/socks/SocksInitResponseDecoder.java | 4 +
.../handler/codec/socks/SocksMessageEncoder.java | 4 +
.../codec/spdy/SpdyHeaderBlockRawDecoder.java | 25 +
.../codec/spdy/SpdyHeaderBlockZlibDecoder.java | 2 +-
.../netty/handler/ssl/JdkSslClientContext.java | 184 +++
.../org/jboss/netty/handler/ssl/JdkSslContext.java | 186 +++
.../netty/handler/ssl/JdkSslServerContext.java | 189 +++
.../jboss/netty/handler/ssl/JettyNpnSslEngine.java | 274 ++++
.../netty/handler/ssl/JettyNpnSslSession.java | 149 ++
.../java/org/jboss/netty/handler/ssl/OpenSsl.java | 84 +
.../org/jboss/netty/handler/ssl/OpenSslEngine.java | 842 ++++++++++
.../netty/handler/ssl/OpenSslServerContext.java | 359 +++++
.../netty/handler/ssl/OpenSslSessionStats.java | 122 ++
.../org/jboss/netty/handler/ssl/PemReader.java | 137 ++
.../org/jboss/netty/handler/ssl/SslBufferPool.java | 142 +-
.../org/jboss/netty/handler/ssl/SslContext.java | 482 ++++++
.../org/jboss/netty/handler/ssl/SslHandler.java | 136 +-
.../org/jboss/netty/handler/ssl/SslProvider.java} | 31 +-
.../util/BouncyCastleSelfSignedCertGenerator.java | 61 +
.../ssl/util/FingerprintTrustManagerFactory.java | 203 +++
.../ssl/util/InsecureTrustManagerFactory.java | 70 +
.../ssl/util/OpenJdkSelfSignedCertGenerator.java | 81 +
.../handler/ssl/util/SelfSignedCertificate.java | 207 +++
.../ssl/util/SimpleTrustManagerFactory.java | 132 ++
.../ssl/util/ThreadLocalInsecureRandom.java | 100 ++
.../jboss/netty/handler/ssl/util/package-info.java | 20 +
.../org/jboss/netty/util/HashedWheelTimer.java | 428 +++--
.../org/jboss/netty/util/internal/EmptyArrays.java | 38 +
.../netty/util/internal/NativeLibraryLoader.java | 235 +++
.../netty/util/internal/ThreadLocalRandom.java | 4 +-
.../http/multipart/HttpPostRequestDecoderTest.java | 73 +
.../codec/spdy/SpdyHeaderBlockRawDecoderTest.java | 28 +-
.../codec/spdy/SpdyHeaderBlockZlibDecoderTest.java | 1 +
.../netty/handler/ssl/NioNioSocketSslEchoTest.java | 36 -
.../handler/ssl/NioNioSocketSslGreetingTest.java | 36 -
.../netty/handler/ssl/NioOioSocketSslEchoTest.java | 36 -
.../netty/handler/ssl/OioNioSocketSslEchoTest.java | 36 -
.../netty/handler/ssl/OioOioSocketSslEchoTest.java | 40 -
...cketSslEchoTest.java => SocketSslEchoTest.java} | 53 +-
...reetingTest.java => SocketSslGreetingTest.java} | 35 +-
.../org/jboss/netty/handler/ssl/SslCloseTest.java | 31 +-
.../jboss/netty/handler/ssl/SslHandlerTest.java | 45 -
...keRaceTester.java => SslHandshakeRaceTest.java} | 76 +-
.../java/org/jboss/netty/handler/ssl/SslTest.java | 120 ++
src/test/resources/websocketx/html5/css/socket.css | 4 -
src/test/resources/websocketx/html5/js/socket.js | 53 -
src/test/resources/websocketx/html5/websocket.html | 18 -
151 files changed, 7851 insertions(+), 4592 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-3.9.git
More information about the pkg-java-commits
mailing list