This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository undertow.
commit 768df4cfc8e6e426254a18ddf8218714aa7c4167 Merge: f4bb671 9482cb8 Author: Markus Koschany <[email protected]> Date: Sun Apr 10 00:09:45 2016 +0200 Merge tag 'upstream/1.3.21' Upstream version 1.3.21 # gpg: Signature made Sun 10 Apr 2016 00:09:40 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] core/pom.xml | 4 +- core/src/main/java/io/undertow/Undertow.java | 2 +- core/src/main/java/io/undertow/UndertowLogger.java | 9 + .../main/java/io/undertow/UndertowMessages.java | 4 +- .../channels/DetachableStreamSinkChannel.java | 2 +- .../channels/DetachableStreamSourceChannel.java | 2 +- .../io/undertow/client/ALPNClientSelector.java | 75 +++++++ .../io/undertow/client/JDK9ALPNClientProvider.java | 133 +++++++++++ .../undertow/client/JettyALPNClientProvider.java | 182 +++++++++++++++ .../io/undertow/client/ajp/AjpClientExchange.java | 2 +- .../http/ClientFixedLengthStreamSinkConduit.java | 2 +- .../undertow/client/http/HttpClientConnection.java | 4 +- .../undertow/client/http/HttpClientExchange.java | 2 +- .../undertow/client/http/HttpClientProvider.java | 42 ++-- .../undertow/client/http/ResponseParseState.java | 2 +- .../client/http2/Http2ClearClientProvider.java | 4 +- .../undertow/client/http2/Http2ClientProvider.java | 194 +++------------- .../undertow/client/spdy/SpdyClientProvider.java | 199 +++-------------- .../java/io/undertow/conduits/ChunkReader.java | 2 +- .../undertow/conduits/HeadStreamSinkConduit.java | 16 +- .../io/undertow/conduits/IdleTimeoutConduit.java | 2 +- .../java/io/undertow/predicate/AndPredicate.java | 2 +- .../predicate/MaxContentSizePredicate.java | 2 +- .../predicate/MinContentSizePredicate.java | 2 +- .../java/io/undertow/predicate/NotPredicate.java | 2 +- .../java/io/undertow/predicate/OrPredicate.java | 2 +- .../io/undertow/predicate/PathMatchPredicate.java | 2 +- .../io/undertow/predicate/PathPrefixPredicate.java | 2 +- .../io/undertow/predicate/PathSuffixPredicate.java | 2 +- .../ajp/AjpClientResponseStreamSourceChannel.java | 18 ++ .../io/undertow/protocols/http2/Http2Channel.java | 3 + .../protocols/http2/Http2DataFrameParser.java | 2 +- .../protocols/http2/Http2FrameHeaderParser.java | 2 +- .../protocols/http2/Http2FramePriority.java | 2 +- .../protocols/http2/Http2HeaderBlockParser.java | 2 +- .../protocols/http2/Http2HeadersParser.java | 2 +- .../undertow/protocols/http2/Http2PingParser.java | 2 +- .../protocols/http2/Http2PriorityParser.java | 2 +- .../protocols/http2/Http2PushPromiseParser.java | 2 +- .../protocols/http2/Http2RstStreamParser.java | 2 +- .../protocols/http2/Http2SettingsParser.java | 2 +- .../protocols/http2/Http2StreamSourceChannel.java | 4 +- .../protocols/http2/Http2WindowUpdateParser.java | 2 +- .../undertow/protocols/spdy/SpdyFramePriority.java | 4 + .../protocols/spdy/SpdyHeaderBlockParser.java | 2 +- .../undertow/protocols/spdy/SpdyHeadersParser.java | 2 +- .../io/undertow/protocols/spdy/SpdyPingParser.java | 2 +- .../protocols/spdy/SpdyRstStreamParser.java | 2 +- .../protocols/spdy/SpdySettingsParser.java | 2 +- .../protocols/spdy/SpdySynReplyParser.java | 2 +- .../protocols/spdy/SpdySynStreamParser.java | 2 +- .../protocols/spdy/SpdyWindowUpdateParser.java | 2 +- .../java/io/undertow/protocols/ssl/SslConduit.java | 55 +++-- .../protocols/ssl/UndertowAcceptingSslChannel.java | 2 +- .../io/undertow/protocols/ssl/UndertowXnioSsl.java | 2 +- .../security/api/AuthenticatedSessionManager.java | 2 +- .../security/api/AuthenticationMechanism.java | 4 +- .../io/undertow/security/idm/DigestAlgorithm.java | 2 +- .../security/impl/AuthenticationInfoToken.java | 2 +- .../security/impl/DigestAuthorizationToken.java | 2 +- .../java/io/undertow/security/impl/DigestQop.java | 2 +- .../security/impl/DigestWWWAuthenticateToken.java | 2 +- .../undertow/security/impl/SimpleNonceManager.java | 2 +- .../impl/SingleSignOnAuthenticationMechanism.java | 2 + .../io/undertow/server/DefaultByteBufferPool.java | 2 +- .../io/undertow/server/HttpServerExchange.java | 6 +- .../undertow/server/handlers/ByteRangeHandler.java | 66 +++--- .../undertow/server/handlers/ExceptionHandler.java | 2 +- .../server/handlers/LocalNameResolvingHandler.java | 2 +- .../server/handlers/PeerNameResolvingHandler.java | 2 +- .../handlers/StuckThreadDetectionHandler.java | 4 +- .../accesslog/DefaultAccessLogReceiver.java | 2 +- .../accesslog/ExtendedAccessLogParser.java | 2 +- .../handlers/builder/PredicatedHandlersParser.java | 12 +- .../server/handlers/cache/ResponseCache.java | 2 +- .../handlers/proxy/LoadBalancingProxyClient.java | 24 +- .../server/handlers/proxy/ProxyHandler.java | 47 ++-- .../server/handlers/proxy/mod_cluster/Context.java | 2 +- .../handlers/proxy/mod_cluster/MCMPHandler.java | 2 +- .../handlers/proxy/mod_cluster/MCMPWebManager.java | 2 +- .../handlers/proxy/mod_cluster/NodePingUtil.java | 2 +- .../server/handlers/resource/CachedResource.java | 2 +- .../handlers/resource/PathResourceManager.java | 47 ++-- .../server/handlers/resource/ResourceHandler.java | 49 ++-- .../protocol/framed/AbstractFramedChannel.java | 25 ++- .../framed/AbstractFramedStreamSourceChannel.java | 5 +- .../server/protocol/http/AlpnOpenListener.java | 192 ++-------------- ...OpenListener.java => JDK9AlpnOpenListener.java} | 164 ++++++-------- ...penListener.java => JettyAlpnOpenListener.java} | 57 ++--- .../undertow/server/protocol/http/ParseState.java | 2 +- .../server/protocol/http2/Http2SslSessionInfo.java | 2 +- .../server/protocol/spdy/SpdySslSessionInfo.java | 2 +- core/src/main/java/io/undertow/util/ALPN.java | 68 ++++++ core/src/main/java/io/undertow/util/ByteRange.java | 98 +++++++- core/src/main/java/io/undertow/util/FileUtils.java | 3 +- .../io/undertow/util/ReferenceCountedPooled.java | 11 + .../main/java/io/undertow/util/SecureHashMap.java | 38 +--- .../websockets/client/WebSocketClient.java | 2 +- .../websockets/core/AbstractReceiveListener.java | 2 +- .../websockets/core/protocol/version07/Base64.java | 8 +- .../WebSocket07CloseFrameSourceChannel.java | 2 +- .../server/handlers/RangeRequestTestCase.java | 91 ++++++-- .../handlers/file/PathResourceManagerTestCase.java | 10 + .../io/undertow/server/handlers/file/subdir/a.txt | 1 + .../proxy/AbstractLoadBalancingProxyTestCase.java | 52 ++--- .../proxy/LoadBalancingProxyAJPTestCase.java | 2 +- .../proxy/LoadBalancingProxyHTTP2TestCase.java | 4 +- .../LoadBalancingProxyHTTP2ViaUpgradeTestCase.java | 4 +- .../proxy/LoadBalancingProxyHttpsTestCase.java | 4 +- .../proxy/LoadBalancingProxySPDYTestCase.java | 4 +- .../handlers/proxy/LoadBalancingProxyTestCase.java | 4 +- ...lancingProxyWithCustomHostSelectorTestCase.java | 2 +- .../proxy/ProxyHandlerXForwardedForTestCase.java | 2 +- .../handlers/sse/ServerSentEventTestCase.java | 4 +- .../protocol/http2/HTTP2ViaUpgradeTestCase.java | 6 +- .../io/undertow/testutils/DebuggingSlicePool.java | 2 +- .../java/io/undertow/testutils/DefaultServer.java | 16 +- .../websockets/utils/WebSocketTestClient.java | 2 +- core/src/test/resources/logging.properties | 3 +- coverage-report/pom.xml | 2 +- dist/pom.xml | 4 +- examples/pom.xml | 4 +- .../security/basic/MapIdentityManager.java | 2 +- http2-test-suite/pom.xml | 197 ---------------- .../alpn/ALPNConnectionEstablishmentTestCase.java | 49 ---- .../http2/tests/framework/Http2Client.java | 142 ------------ .../http2/tests/framework/Http2TestRunner.java | 247 --------------------- .../http2/tests/framework/HttpResponse.java | 53 ----- .../http2/tests/framework/ServerController.java | 35 --- .../http2/tests/framework/TestCategory.java | 54 ----- .../http2/tests/framework/TestEnvironment.java | 68 ------ .../http2/tests/framework/UndertowTestHandler.java | 32 --- .../http2/tests/framework/UndertowTestServer.java | 100 --------- http2-test-suite/src/main/resources/ca.crt | 17 -- .../src/main/resources/client.keystore | Bin 2179 -> 0 bytes .../src/main/resources/client.truststore | Bin 885 -> 0 bytes .../src/main/resources/server.keystore | Bin 2176 -> 0 bytes http2-test-suite/src/main/resources/server.pem | 47 ---- .../src/main/resources/server.truststore | Bin 935 -> 0 bytes parser-generator/pom.xml | 4 +- pom.xml | 59 +---- servlet/pom.xml | 4 +- .../io/undertow/servlet/UndertowServletLogger.java | 23 +- .../io/undertow/servlet/api/DeploymentManager.java | 2 +- .../java/io/undertow/servlet/api/FilterInfo.java | 8 +- .../io/undertow/servlet/api/FilterMappingInfo.java | 2 +- .../java/io/undertow/servlet/api/ListenerInfo.java | 7 + .../io/undertow/servlet/api/ServletContainer.java | 2 +- .../java/io/undertow/servlet/api/ServletInfo.java | 9 + .../undertow/servlet/api/ServletStackTraces.java | 2 +- .../servlet/api/SessionPersistenceManager.java | 2 +- .../servlet/core/DeploymentManagerImpl.java | 6 +- .../io/undertow/servlet/core/ManagedFilter.java | 12 +- .../io/undertow/servlet/core/ManagedListener.java | 7 + .../io/undertow/servlet/core/ManagedServlet.java | 12 +- .../undertow/servlet/core/MetricsChainHandler.java | 2 +- .../undertow/servlet/handlers/DefaultServlet.java | 66 ++---- .../servlet/handlers/ServletPathMatch.java | 2 +- .../servlet/handlers/ServletPathMatches.java | 2 +- .../servlet/handlers/ServletPathMatchesData.java | 4 +- .../handlers/security/SecurityPathMatches.java | 2 +- .../servlet/spec/HttpServletResponseImpl.java | 2 +- .../servlet/spec/RequestDispatcherImpl.java | 6 + .../defaultservlet/DefaultServletTestCase.java | 94 +++++++- .../undertow/servlet/test/defaultservlet/range.txt | 1 + .../test/path/FilterPathMappingTestCase.java | 7 + .../test/streams/AsyncInputStreamServlet.java | 2 +- .../servlet/test/util/TestResourceLoader.java | 2 +- servlet/src/test/resources/logging.properties | 4 +- websockets-jsr/pom.xml | 4 +- .../java/io/undertow/websockets/jsr/Bootstrap.java | 13 +- .../websockets/jsr/EndpointSessionHandler.java | 12 +- .../websockets/jsr/JsrWebSocketFilter.java | 1 + .../websockets/jsr/JsrWebSocketLogger.java | 5 + .../jsr/JsrWebSocketProtocolHandshakeHandler.java | 2 +- .../websockets/jsr/SendHandlerAdapter.java | 2 +- .../websockets/jsr/ServerWebSocketContainer.java | 2 +- .../websockets/jsr/UndertowContainerProvider.java | 4 +- .../jsr/WebSocketSessionRemoteEndpoint.java | 2 +- .../jsr/annotated/AnnotatedEndpointFactory.java | 6 +- .../websockets/jsr/annotated/BoundMethod.java | 2 +- .../websockets/jsr/handshake/HandshakeUtil.java | 2 + .../test/security/WebsocketBasicAuthTestCase.java | 231 +++++++++++++++++++ .../jsr/test/stress/WebsocketStressTestCase.java | 2 +- 184 files changed, 1709 insertions(+), 2210 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
