[undertow] 01/03: Merge tag 'upstream/1.4.1'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository undertow.

commit 2cedcdf425b111471afdc220f76543486d16afa8
Merge: 5d3981c 1ba68ba
Author: Markus Koschany <apo at debian.org>
Date:   Fri Sep 9 02:20:53 2016 +0200

    Merge tag 'upstream/1.4.1'
    
    Upstream version 1.4.1
    
    # gpg: Signature made Fri 09 Sep 2016 02:20:52 CEST
    # gpg:                using RSA key D9AD14B9513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 core/pom.xml                                       |  83 ++++++-
 core/src/main/java/io/undertow/Undertow.java       |   2 +-
 .../undertow/attribute/QueryStringAttribute.java   |  12 +-
 .../io/undertow/client/ALPNClientSelector.java     | 127 ++++++++---
 .../client/JDK8HackALPNClientProvider.java         | 127 -----------
 .../io/undertow/client/JDK9ALPNClientProvider.java | 136 -----------
 .../undertow/client/JettyALPNClientProvider.java   | 185 ---------------
 .../undertow/client/http/HttpClientConnection.java |   2 +-
 .../undertow/client/http/HttpRequestConduit.java   |   2 +-
 .../client/http2/Http2ClearClientProvider.java     |   2 +-
 .../client/http2/Http2ClientConnection.java        |  17 +-
 .../undertow/client/http2/Http2ClientProvider.java |   4 +-
 .../http2/Http2PriorKnowledgeClientProvider.java   |   4 +-
 .../conduits/DeflatingStreamSinkConduit.java       |   1 +
 .../io/undertow/conduits/IdleTimeoutConduit.java   |   9 +-
 .../io/undertow/protocols/alpn/ALPNManager.java    |  61 +++++
 .../io/undertow/protocols/alpn/ALPNProvider.java   |  59 +++++
 .../protocols/alpn/JDK8HackAlpnProvider.java       |  55 +++++
 .../alpn/JDK9AlpnProvider.java}                    |  45 +++-
 .../undertow/protocols/alpn/JettyAlpnProvider.java | 145 ++++++++++++
 .../protocols/alpn/OpenSSLAlpnProvider.java        | 106 +++++++++
 .../http2/AbstractHttp2StreamSourceChannel.java    |   2 +-
 .../io/undertow/protocols/http2/Http2Channel.java  |  14 +-
 .../protocols/http2/Http2RstStreamParser.java      |   2 +-
 .../ssl/ALPNHackClientByteArrayOutputStream.java   |   2 +-
 .../undertow/protocols/ssl/ALPNHackSSLEngine.java  |  13 +-
 .../java/io/undertow/protocols/ssl/SslConduit.java |  14 +-
 .../io/undertow/protocols/ssl/UndertowXnioSsl.java |  14 +-
 .../main/java/io/undertow/server/Connectors.java   |   9 +
 .../io/undertow/server/handlers/RequestLimit.java  |  91 ++++----
 .../accesslog/ExtendedAccessLogParser.java         |   5 +-
 .../handlers/form/FormEncodedDataDefinition.java   |  12 +-
 .../handlers/proxy/mod_cluster/MCMPWebManager.java |   2 +-
 .../server/protocol/ajp/AjpOpenListener.java       |   3 +-
 .../protocol/framed/AbstractFramedChannel.java     |  24 +-
 .../framed/AbstractFramedStreamSourceChannel.java  | 152 +++++++------
 .../server/protocol/http/AlpnOpenListener.java     | 209 ++++++++++++++---
 .../protocol/http/JDK8HackAlpnOpenListener.java    | 237 -------------------
 .../server/protocol/http/JDK9AlpnOpenListener.java | 245 --------------------
 .../protocol/http/JettyAlpnOpenListener.java       | 250 ---------------------
 .../protocol/http2/Http2ReceiveListener.java       |  34 ++-
 .../server/session/InMemorySessionManager.java     |  41 ++--
 .../main/java/io/undertow/util/MimeMappings.java   |   7 +
 core/src/main/java/io/undertow/util/URLUtils.java  |  88 ++++----
 .../websockets/client/WebSocketClient.java         |  35 +--
 .../undertow/websockets/core/WebSocketChannel.java |   2 +-
 .../io.undertow.protocols.alpn.ALPNProvider        |  22 ++
 .../server/handlers/QueryParametersTestCase.java   |  24 +-
 .../proxy/AbstractLoadBalancingProxyTestCase.java  |   3 +-
 .../proxy/LoadBalancingProxyAJPTestCase.java       |  17 +-
 .../proxy/LoadBalancingProxyHTTP2TestCase.java     |   2 -
 .../proxy/LoadBalancingProxyHttpsTestCase.java     |   5 +-
 .../handlers/proxy/LoadBalancingProxyTestCase.java |  13 +-
 .../proxy/ProxyHandlerXForwardedForTestCase.java   |  46 ++--
 .../java/io/undertow/testutils/DefaultServer.java  | 172 ++++++++------
 coverage-report/pom.xml                            |   2 +-
 dist/pom.xml                                       |   4 +-
 examples/pom.xml                                   |   4 +-
 .../io/undertow/examples/http2/Http2Server.java    |   2 -
 parser-generator/pom.xml                           |   4 +-
 pom.xml                                            |  32 +--
 servlet/pom.xml                                    |  26 ++-
 .../servlet/core/DeploymentManagerImpl.java        |   7 +-
 .../handlers/security/SecurityPathMatches.java     |   4 +-
 websockets-jsr/pom.xml                             |  22 +-
 .../undertow/websockets/jsr/SessionContainer.java  |   5 +-
 66 files changed, 1461 insertions(+), 1646 deletions(-)

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