[undertow] branch master updated (97e8d1b -> 5d3981c)

Markus Koschany apo at moszumanska.debian.org
Fri Aug 5 10:42:33 UTC 2016


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

apo pushed a change to branch master
in repository undertow.

      from  97e8d1b   Do not export JAVA_HOME. No longer necessary with latest versions
      adds  cffc31f   Imported Upstream version 1.4.0
       new  95c02d2   Merge tag 'upstream/1.4.0'
       new  5d3981c   Update changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/pom.xml                                       |   38 +-
 core/src/main/java/io/undertow/Undertow.java       |  148 ++-
 core/src/main/java/io/undertow/UndertowLogger.java |    1 +
 .../main/java/io/undertow/UndertowMessages.java    |   40 +-
 .../src/main/java/io/undertow/UndertowOptions.java |    8 +
 .../undertow/attribute/ResponseTimeAttribute.java  |    2 +-
 .../channels/DelegatingStreamSinkChannel.java      |  157 ---
 .../channels/DelegatingStreamSourceChannel.java    |  138 ---
 .../undertow/channels/GatedStreamSinkChannel.java  |  297 ------
 .../channels/GatedStreamSourceChannel.java         |  284 -----
 .../channels/ReadTimeoutStreamSourceChannel.java   |  159 ---
 .../channels/WriteTimeoutStreamSinkChannel.java    |  189 ----
 .../io/undertow/client/ALPNClientSelector.java     |    9 +-
 .../java/io/undertow/client/ClientConnection.java  |    7 +
 ...ovider.java => JDK8HackALPNClientProvider.java} |   74 +-
 .../io/undertow/client/JDK9ALPNClientProvider.java |    3 +
 .../undertow/client/JettyALPNClientProvider.java   |    3 +
 .../undertow/client/ajp/AjpClientConnection.java   |   11 +
 .../undertow/client/http/HttpClientConnection.java |   18 +
 .../undertow/client/http/HttpClientProvider.java   |    8 +-
 .../client/http2/Http2ClientConnection.java        |   14 +-
 .../undertow/client/spdy/SpdyClientConnection.java |  336 ------
 .../undertow/client/spdy/SpdyClientExchange.java   |  140 ---
 .../undertow/client/spdy/SpdyClientProvider.java   |  231 -----
 .../conduits/DeflatingStreamSinkConduit.java       |   18 +-
 .../undertow/conduits/GzipStreamSinkConduit.java   |   27 +-
 .../java/io/undertow/connector/ByteBufferPool.java |   13 +
 .../java/io/undertow/io/BlockingReceiverImpl.java  |   49 +-
 .../java/io/undertow/io/BlockingSenderImpl.java    |   29 +-
 .../io/undertow/protocols/http2/Http2Channel.java  |   16 +-
 .../protocols/http2/Http2StreamSourceChannel.java  |    8 +-
 .../io/undertow/protocols/spdy/SpdyChannel.java    |  673 ------------
 .../spdy/SpdyControlFrameStreamSinkChannel.java    |   76 --
 .../undertow/protocols/spdy/SpdyFramePriority.java |   75 --
 .../undertow/protocols/spdy/SpdyGoAwayParser.java  |   54 -
 .../spdy/SpdyGoAwayStreamSinkChannel.java          |   57 --
 .../spdy/SpdyGoAwayStreamSourceChannel.java        |   47 -
 .../protocols/spdy/SpdyHeaderBlockParser.java      |  248 -----
 .../undertow/protocols/spdy/SpdyHeadersParser.java |   45 -
 .../io/undertow/protocols/spdy/SpdyPingParser.java |   48 -
 .../protocols/spdy/SpdyPingStreamSinkChannel.java  |   49 -
 .../spdy/SpdyPingStreamSourceChannel.java          |   41 -
 .../undertow/protocols/spdy/SpdyProtocolUtils.java |  234 -----
 .../protocols/spdy/SpdyPushBackParser.java         |   89 --
 .../protocols/spdy/SpdyRstStreamParser.java        |   49 -
 .../protocols/spdy/SpdyRstStreamSinkChannel.java   |   53 -
 .../spdy/SpdyRstStreamStreamSourceChannel.java     |   41 -
 .../io/undertow/protocols/spdy/SpdySetting.java    |   61 --
 .../protocols/spdy/SpdySettingsParser.java         |   83 --
 .../spdy/SpdySettingsStreamSourceChannel.java      |   46 -
 .../protocols/spdy/SpdyStreamSinkChannel.java      |   38 -
 .../protocols/spdy/SpdyStreamSourceChannel.java    |   64 --
 .../spdy/SpdyStreamStreamSinkChannel.java          |  270 -----
 .../spdy/SpdyStreamStreamSourceChannel.java        |  182 ----
 .../protocols/spdy/SpdySynReplyParser.java         |   45 -
 .../spdy/SpdySynReplyStreamSinkChannel.java        |  160 ---
 .../spdy/SpdySynReplyStreamSourceChannel.java      |   32 -
 .../protocols/spdy/SpdySynStreamParser.java        |   77 --
 .../spdy/SpdySynStreamStreamSinkChannel.java       |  136 ---
 .../spdy/SpdySynStreamStreamSourceChannel.java     |   47 -
 .../protocols/spdy/SpdyWindowUpdateParser.java     |   49 -
 .../spdy/SpdyWindowUpdateStreamSinkChannel.java    |   53 -
 .../protocols/spdy/StreamErrorException.java       |   49 -
 .../ssl/ALPNHackClientByteArrayOutputStream.java   |   89 ++
 .../protocols/ssl/ALPNHackClientHelloExplorer.java |  439 ++++++++
 .../undertow/protocols/ssl/ALPNHackSSLEngine.java  |  448 ++++++++
 .../ssl/ALPNHackServerByteArrayOutputStream.java   |   75 ++
 .../protocols/ssl/ALPNHackServerHelloExplorer.java |  338 ++++++
 .../java/io/undertow/protocols/ssl/SslConduit.java |   10 +-
 .../protocols/ssl/UndertowSslConnection.java       |    3 +
 .../io/undertow/protocols/ssl/UndertowXnioSsl.java |    4 +
 .../handlers/AbstractConfidentialityHandler.java   |    2 +-
 .../handlers/AuthenticationConstraintHandler.java  |    2 +
 .../handlers/AuthenticationMechanismsHandler.java  |   10 +-
 .../security/impl/AbstractSecurityContext.java     |    2 +
 .../impl/BasicAuthenticationMechanism.java         |    9 +-
 .../impl/DigestAuthenticationMechanism.java        |    4 +
 .../security/impl/FormAuthenticationMechanism.java |    8 +-
 .../impl/GSSAPIAuthenticationMechanism.java        |    6 +
 .../security/impl/SecurityContextImpl.java         |   41 +-
 .../impl/SingleSignOnAuthenticationMechanism.java  |    2 +
 .../server/AggregateConnectorStatistics.java       |   42 +-
 .../io/undertow/server/BasicSSLSessionInfo.java    |    5 +
 .../undertow/server/ConnectionSSLSessionInfo.java  |    6 +
 .../io/undertow/server/ConnectorStatistics.java    |   24 +
 .../undertow/server/ConnectorStatisticsImpl.java   |   55 +-
 .../main/java/io/undertow/server/Connectors.java   |    1 +
 .../io/undertow/server/DefaultByteBufferPool.java  |   17 +
 .../undertow/server/DefaultResponseListener.java   |    8 +
 .../io/undertow/server/HttpServerExchange.java     |   19 +-
 .../java/io/undertow/server/SSLSessionInfo.java    |    7 +
 .../io/undertow/server/XnioByteBufferPool.java     |   20 +
 .../server/handlers/LearningPushHandler.java       |   10 +-
 .../server/handlers/ProxyPeerAddressHandler.java   |   21 +-
 .../handlers/builder/PredicatedHandlersParser.java |    2 +-
 .../handlers/encoding/DeflateEncodingProvider.java |    2 +
 .../handlers/encoding/GzipEncodingProvider.java    |    2 +
 .../handlers/error/SimpleErrorPageHandler.java     |   38 +-
 .../handlers/form/FormEncodedDataDefinition.java   |    1 +
 .../handlers/form/MultiPartParserDefinition.java   |   13 +-
 .../server/handlers/proxy/ProxyHandler.java        |   64 +-
 .../server/handlers/resource/CachedResource.java   |    1 +
 .../handlers/resource/PathResourceManager.java     |    2 +-
 .../handlers/sse/ServerSentEventConnection.java    |    9 +-
 .../handlers/sse/ServerSentEventHandler.java       |    2 +
 .../server/protocol/ajp/AjpOpenListener.java       |   12 +
 .../protocol/framed/AbstractFramedChannel.java     |   21 +
 .../framed/AbstractFramedStreamSinkChannel.java    |    7 +
 .../server/protocol/http/AlpnOpenListener.java     |   10 +
 .../server/protocol/http/HttpOpenListener.java     |    5 +-
 .../server/protocol/http/HttpReadListener.java     |   10 +
 .../server/protocol/http/HttpServerConnection.java |    6 +-
 ...Listener.java => JDK8HackAlpnOpenListener.java} |   52 +-
 .../server/protocol/http/JDK9AlpnOpenListener.java |    4 +-
 .../server/protocol/http2/Http2OpenListener.java   |   12 +-
 .../server/protocol/http2/Http2SslSessionInfo.java |    6 +
 .../server/protocol/spdy/SpdyOpenListener.java     |  152 ---
 .../protocol/spdy/SpdyPlainOpenListener.java       |  135 ---
 .../server/protocol/spdy/SpdyReceiveListener.java  |  154 ---
 .../server/protocol/spdy/SpdyServerConnection.java |  374 -------
 .../server/protocol/spdy/SpdySslSessionInfo.java   |   92 --
 .../server/session/InMemorySessionManager.java     |   31 +-
 .../server/session/PathParameterSessionConfig.java |    5 +
 .../server/session/SessionCookieConfig.java        |    4 +
 .../undertow/server/session/SslSessionConfig.java  |    9 +-
 core/src/main/java/io/undertow/util/ALPN.java      |    4 +
 core/src/main/java/io/undertow/util/Cookies.java   |    6 +-
 core/src/main/java/io/undertow/util/Headers.java   |   37 +
 .../src/main/java/io/undertow/util/HttpString.java |    4 +
 .../java/io/undertow/util/MultipartParser.java     |    6 +-
 .../main/java/io/undertow/util/PathMatcher.java    |    5 +
 .../main/java/io/undertow/util/PathTemplate.java   |   36 +-
 .../java/io/undertow/util/PipeliningExecutor.java  |    1 +
 .../main/java/io/undertow/util/SecureHashMap.java  | 1080 --------------------
 .../WebSocketProtocolHandshakeHandler.java         |    2 +
 .../websockets/client/WebSocketClient.java         |   27 +-
 .../websockets/core/StreamSourceFrameChannel.java  |    5 +-
 .../undertow/websockets/core/WebSocketChannel.java |   51 -
 .../undertow/websockets/core/WebSocketUtils.java   |  207 +---
 .../io/undertow/websockets/core/WebSockets.java    |  445 ++++++--
 .../version07/WebSocket07FrameSinkChannel.java     |   12 +-
 .../extensions/CompositeExtensionFunction.java     |    9 +-
 .../websockets/extensions/ExtensionFunction.java   |    8 +-
 .../extensions/NoopExtensionFunction.java          |    7 +-
 .../extensions/PerMessageDeflateFunction.java      |   46 +-
 .../extensions/PerMessageDeflateHandshake.java     |    1 +
 .../services/io.undertow.client.ClientProvider     |    3 +-
 .../undertow/client/http/HttpClientTestCase.java   |    7 +-
 .../handlers/ChunkedRequestTrailersTestCase.java   |    2 +-
 .../HttpContinueAcceptingHandlerTestCase.java      |    2 +-
 ...HttpContinueConduitWrappingHandlerTestCase.java |    2 +-
 .../server/handlers/RoutingHandlerTestCase.java    |   21 +
 .../proxy/AbstractLoadBalancingProxyTestCase.java  |   19 +
 .../proxy/LoadBalancingProxySPDYTestCase.java      |   93 --
 .../mod_cluster/AbstractModClusterTestBase.java    |    5 -
 .../handlers/sse/ServerSentEventTestCase.java      |    6 +-
 .../protocol/http2/HTTP2ViaUpgradeTestCase.java    |    1 +
 .../io/undertow/testutils/DebuggingSlicePool.java  |   17 +
 .../java/io/undertow/testutils/DefaultServer.java  |   69 +-
 .../java/io/undertow/util/CookiesTestCase.java     |    5 +
 .../java/io/undertow/util/HeaderOrderTestCase.java |    2 +-
 .../io/undertow/util/PathTemplateTestCase.java     |   13 +
 .../io/undertow/util/SecureHashMapTestCase.java    |   61 --
 coverage-report/pom.xml                            |    2 +-
 debian/changelog                                   |    6 +
 dist/pom.xml                                       |    4 +-
 examples/pom.xml                                   |   32 +-
 parser-generator/pom.xml                           |    4 +-
 .../AbstractParserGenerator.java                   |   10 +-
 .../HttpParserAnnotationProcessor.java             |    8 +-
 .../RequestParserGenerator.java                    |    4 +-
 .../ResponseParserGenerator.java                   |    4 +-
 pom.xml                                            |  267 +----
 servlet/pom.xml                                    |   38 +-
 .../java/io/undertow/servlet/api/Deployment.java   |    6 +-
 .../io/undertow/servlet/api/DeploymentInfo.java    |   40 +-
 .../LegacyThreadSetupActionWrapper.java}           |   31 +-
 .../io/undertow/servlet/api/ThreadSetupAction.java |    1 +
 ...ManagerFactory.java => ThreadSetupHandler.java} |   12 +-
 ...aleAttribute.java => ServletNameAttribute.java} |   32 +-
 .../servlet/core/ApplicationListeners.java         |   24 +-
 .../servlet/core/CompositeThreadSetupAction.java   |   83 --
 .../core/ContextClassLoaderSetupAction.java        |   20 +-
 .../servlet/core/DefaultAuthorizationManager.java  |    2 +-
 .../io/undertow/servlet/core/DeploymentImpl.java   |   43 +-
 .../servlet/core/DeploymentManagerImpl.java        |  414 ++++----
 .../io/undertow/servlet/core/ManagedServlet.java   |   23 +-
 .../io/undertow/servlet/core/SecurityActions.java  |   20 +-
 .../ServletRequestContextThreadSetupAction.java    |   29 +-
 .../servlet/core/ServletUpgradeListener.java       |   75 +-
 .../servlet/core/SessionListenerBridge.java        |   87 +-
 .../undertow/servlet/handlers/DefaultServlet.java  |    3 +
 .../servlet/handlers/ServletInitialHandler.java    |  178 ++--
 .../ServletFormAuthenticationMechanism.java        |   35 +-
 ...ervletSingleSignOnAuthenticationMechainism.java |   23 +-
 ...ervletSingleSignOnAuthenticationMechanism.java} |    4 +-
 .../io/undertow/servlet/spec/AsyncContextImpl.java |  240 ++---
 .../servlet/spec/HttpServletRequestImpl.java       |    2 +-
 .../servlet/spec/HttpServletResponseImpl.java      |    4 +-
 .../servlet/spec/RequestDispatcherImpl.java        |  378 +++----
 .../undertow/servlet/spec/ServletContextImpl.java  |   90 ++
 .../servlet/spec/ServletInputStreamImpl.java       |   61 +-
 .../servlet/spec/ServletOutputStreamImpl.java      |   77 +-
 .../io.undertow.attribute.ExchangeAttributeBuilder |    3 +-
 .../servlet/test/HandlerListingTestCase.java       |  159 +++
 .../SecurityConstraintUrlMappingTestCase.java      |   49 +-
 .../CrossContextServletSessionTestCase.java        |   67 +-
 .../test/upgrade/SimpleUpgradeTestCase.java        |    2 +-
 .../servlet/test/upgrade/SslUpgradeTestCase.java   |    2 +-
 websockets-jsr/pom.xml                             |    4 +-
 .../java/io/undertow/websockets/jsr/Bootstrap.java |   11 +-
 .../websockets/jsr/ConfiguredServerEndpoint.java   |   25 +-
 .../websockets/jsr/ServerWebSocketContainer.java   |   52 +-
 .../websockets/jsr/UndertowContainerProvider.java  |   46 +-
 .../jsr/WebSocketSessionRemoteEndpoint.java        |    6 +-
 .../jsr/annotated/AnnotatedEndpoint.java           |    7 +
 .../websockets/jsr/handshake/HandshakeUtil.java    |    2 +-
 .../jsr/test/JsrWebSocketServer07Test.java         |   46 +-
 .../jsr/test/annotated/AnnotatedEndpointTest.java  |   26 +
 219 files changed, 4401 insertions(+), 9559 deletions(-)
 delete mode 100644 core/src/main/java/io/undertow/channels/DelegatingStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/channels/DelegatingStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/channels/GatedStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/channels/GatedStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/channels/ReadTimeoutStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/channels/WriteTimeoutStreamSinkChannel.java
 copy core/src/main/java/io/undertow/client/{JDK9ALPNClientProvider.java => JDK8HackALPNClientProvider.java} (61%)
 delete mode 100644 core/src/main/java/io/undertow/client/spdy/SpdyClientConnection.java
 delete mode 100644 core/src/main/java/io/undertow/client/spdy/SpdyClientExchange.java
 delete mode 100644 core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyControlFrameStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyFramePriority.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyGoAwayParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyGoAwayStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyGoAwayStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyHeaderBlockParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyHeadersParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyPingParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyPingStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyPingStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyProtocolUtils.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyPushBackParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyRstStreamParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyRstStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyRstStreamStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySetting.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySettingsParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySettingsStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyStreamStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyStreamStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynReplyParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynReplyStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynReplyStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynStreamParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynStreamStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdySynStreamStreamSourceChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyWindowUpdateParser.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/SpdyWindowUpdateStreamSinkChannel.java
 delete mode 100644 core/src/main/java/io/undertow/protocols/spdy/StreamErrorException.java
 create mode 100644 core/src/main/java/io/undertow/protocols/ssl/ALPNHackClientByteArrayOutputStream.java
 create mode 100644 core/src/main/java/io/undertow/protocols/ssl/ALPNHackClientHelloExplorer.java
 create mode 100644 core/src/main/java/io/undertow/protocols/ssl/ALPNHackSSLEngine.java
 create mode 100644 core/src/main/java/io/undertow/protocols/ssl/ALPNHackServerByteArrayOutputStream.java
 create mode 100644 core/src/main/java/io/undertow/protocols/ssl/ALPNHackServerHelloExplorer.java
 copy core/src/main/java/io/undertow/server/protocol/http/{JDK9AlpnOpenListener.java => JDK8HackAlpnOpenListener.java} (82%)
 delete mode 100644 core/src/main/java/io/undertow/server/protocol/spdy/SpdyOpenListener.java
 delete mode 100644 core/src/main/java/io/undertow/server/protocol/spdy/SpdyPlainOpenListener.java
 delete mode 100644 core/src/main/java/io/undertow/server/protocol/spdy/SpdyReceiveListener.java
 delete mode 100644 core/src/main/java/io/undertow/server/protocol/spdy/SpdyServerConnection.java
 delete mode 100644 core/src/main/java/io/undertow/server/protocol/spdy/SpdySslSessionInfo.java
 delete mode 100644 core/src/main/java/io/undertow/util/SecureHashMap.java
 delete mode 100644 core/src/test/java/io/undertow/server/handlers/proxy/LoadBalancingProxySPDYTestCase.java
 delete mode 100644 core/src/test/java/io/undertow/util/SecureHashMapTestCase.java
 copy servlet/src/main/java/io/undertow/servlet/{core/ContextClassLoaderSetupAction.java => api/LegacyThreadSetupActionWrapper.java} (50%)
 copy servlet/src/main/java/io/undertow/servlet/api/{SessionManagerFactory.java => ThreadSetupHandler.java} (76%)
 copy servlet/src/main/java/io/undertow/servlet/attribute/{ServletRequestLocaleAttribute.java => ServletNameAttribute.java} (66%)
 delete mode 100644 servlet/src/main/java/io/undertow/servlet/core/CompositeThreadSetupAction.java
 copy servlet/src/main/java/io/undertow/servlet/handlers/security/{ServletSingleSignOnAuthenticationMechainism.java => ServletSingleSignOnAuthenticationMechanism.java} (90%)
 create mode 100644 servlet/src/test/java/io/undertow/servlet/test/HandlerListingTestCase.java

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



More information about the pkg-java-commits mailing list