This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository undertow.
commit 9ebd805f800f55ad5f7e88cfe81ea2c710a7aab4 Merge: 44bf50d d64262f Author: Markus Koschany <[email protected]> Date: Fri Oct 30 18:10:32 2015 +0100 Merge tag 'upstream/1.3.4' Upstream version 1.3.4 # gpg: Signature made Fri 30 Oct 2015 18:10:28 CET 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 | 11 +- core/src/main/java/io/undertow/Undertow.java | 10 +- core/src/main/java/io/undertow/UndertowLogger.java | 113 ++- .../main/java/io/undertow/UndertowMessages.java | 25 +- .../src/main/java/io/undertow/UndertowOptions.java | 26 +- ...va => AuthenticationTypeExchangeAttribute.java} | 34 +- .../io/undertow/attribute/BytesSentAttribute.java | 16 +- .../io/undertow/attribute/DateTimeAttribute.java | 34 +- .../io/undertow/attribute/ExchangeAttributes.java | 7 +- .../attribute/QuotingExchangeAttribute.java | 80 ++ ...teIPAttribute.java => RemoteHostAttribute.java} | 21 +- .../io/undertow/attribute/RemoteIPAttribute.java | 3 +- ...entAttribute.java => RequestPathAttribute.java} | 50 +- ...deAttribute.java => ResolvedPathAttribute.java} | 24 +- .../undertow/attribute/ResponseCodeAttribute.java | 4 +- .../undertow/attribute/ResponseTimeAttribute.java | 16 +- ...Attribute.java => SecureExchangeAttribute.java} | 32 +- .../undertow/attribute/SubstituteEmptyWrapper.java | 36 +- .../java/io/undertow/client/ClientConnection.java | 11 +- .../java/io/undertow/client/ClientProvider.java | 11 +- .../java/io/undertow/client/ClientRequest.java | 8 + .../java/io/undertow/client/ClientStatistics.java} | 20 +- .../java/io/undertow/client/UndertowClient.java | 35 +- .../undertow/client/ajp/AjpClientConnection.java | 18 +- .../io/undertow/client/ajp/AjpClientProvider.java | 65 +- .../undertow/client/http/HttpClientConnection.java | 86 +- .../undertow/client/http/HttpClientProvider.java | 15 +- .../undertow/client/http/HttpRequestConduit.java | 20 +- .../client/http2/Http2ClearClientProvider.java | 95 ++- .../client/http2/Http2ClientConnection.java | 17 +- .../undertow/client/http2/Http2ClientProvider.java | 73 +- .../http2/Http2PriorKnowledgeClientProvider.java | 68 +- .../undertow/client/spdy/SpdyClientConnection.java | 15 +- .../undertow/client/spdy/SpdyClientProvider.java | 83 +- .../conduits/AbstractFramedStreamSinkConduit.java | 18 +- .../conduits/ChunkedStreamSinkConduit.java | 34 +- .../conduits/ChunkedStreamSourceConduit.java | 29 +- .../conduits/DeflatingStreamSinkConduit.java | 20 +- .../undertow/conduits/GzipStreamSinkConduit.java | 2 +- .../conduits/ReadDataStreamSourceConduit.java | 14 +- .../io/undertow/connector/ByteBufferPool.java} | 16 +- .../io/undertow/connector/PooledByteBuffer.java} | 17 +- .../java/io/undertow/io/AsyncReceiverImpl.java | 623 ++++++++++++++ .../main/java/io/undertow/io/AsyncSenderImpl.java | 39 +- .../java/io/undertow/io/BlockingReceiverImpl.java | 300 +++++++ core/src/main/java/io/undertow/io/Receiver.java | 226 +++++ .../java/io/undertow/io/UndertowInputStream.java | 37 +- .../java/io/undertow/io/UndertowOutputStream.java | 31 +- .../io/undertow/predicate/ContainsPredicate.java | 12 +- .../io/undertow/predicate/PredicateParser.java | 533 +----------- .../io/undertow/predicate/PredicatesHandler.java | 211 ++++- .../ajp/AbstractAjpClientStreamSourceChannel.java | 5 +- .../undertow/protocols/ajp/AjpClientChannel.java | 18 +- .../AjpClientRequestClientStreamSinkChannel.java | 13 +- .../ajp/AjpClientResponseStreamSourceChannel.java | 12 +- .../http2/AbstractHttp2StreamSourceChannel.java | 5 +- .../java/io/undertow/protocols/http2/Hpack.java | 7 + .../io/undertow/protocols/http2/HpackDecoder.java | 20 +- .../io/undertow/protocols/http2/HpackEncoder.java | 2 +- .../io/undertow/protocols/http2/Http2Channel.java | 50 +- .../http2/Http2DataStreamSinkChannel.java | 31 +- .../protocols/http2/Http2FrameHeaderParser.java | 15 + .../http2/Http2GoAwayStreamSinkChannel.java | 4 +- .../http2/Http2GoAwayStreamSourceChannel.java | 5 +- .../protocols/http2/Http2HeaderBlockParser.java | 2 +- .../http2/Http2PingStreamSinkChannel.java | 4 +- .../http2/Http2PrefaceStreamSinkChannel.java | 4 +- .../http2/Http2PushPromiseStreamSourceChannel.java | 6 +- .../protocols/http2/Http2RstStreamSinkChannel.java | 4 +- .../http2/Http2RstStreamStreamSourceChannel.java | 5 +- .../http2/Http2SettingsStreamSinkChannel.java | 6 +- .../http2/Http2SettingsStreamSourceChannel.java | 5 +- .../protocols/http2/Http2StreamSinkChannel.java | 14 +- .../protocols/http2/Http2StreamSourceChannel.java | 4 +- .../http2/Http2WindowUpdateStreamSinkChannel.java | 4 +- .../io/undertow/protocols/spdy/SpdyChannel.java | 25 +- .../undertow/protocols/spdy/SpdyGoAwayParser.java | 4 +- .../spdy/SpdyGoAwayStreamSinkChannel.java | 4 +- .../spdy/SpdyGoAwayStreamSourceChannel.java | 6 +- .../protocols/spdy/SpdyHeaderBlockParser.java | 23 +- .../undertow/protocols/spdy/SpdyHeadersParser.java | 6 +- .../io/undertow/protocols/spdy/SpdyPingParser.java | 3 +- .../protocols/spdy/SpdyPingStreamSinkChannel.java | 4 +- .../spdy/SpdyPingStreamSourceChannel.java | 6 +- .../protocols/spdy/SpdyRstStreamParser.java | 4 +- .../protocols/spdy/SpdyRstStreamSinkChannel.java | 4 +- .../spdy/SpdyRstStreamStreamSourceChannel.java | 5 +- .../spdy/SpdySettingsStreamSourceChannel.java | 5 +- .../protocols/spdy/SpdyStreamSourceChannel.java | 5 +- .../spdy/SpdyStreamStreamSinkChannel.java | 40 +- .../spdy/SpdyStreamStreamSourceChannel.java | 4 +- .../protocols/spdy/SpdySynReplyParser.java | 6 +- .../spdy/SpdySynReplyStreamSinkChannel.java | 26 +- .../spdy/SpdySynReplyStreamSourceChannel.java | 6 +- .../protocols/spdy/SpdySynStreamParser.java | 6 +- .../spdy/SpdySynStreamStreamSinkChannel.java | 26 +- .../spdy/SpdySynStreamStreamSourceChannel.java | 5 +- .../spdy/SpdyWindowUpdateStreamSinkChannel.java | 4 +- .../java/io/undertow/protocols/ssl/SslConduit.java | 110 +-- .../protocols/ssl/UndertowAcceptingSslChannel.java | 23 +- .../protocols/ssl/UndertowSslConnection.java | 7 +- .../io/undertow/protocols/ssl/UndertowXnioSsl.java | 34 +- .../api/AuthenticationMechanismContext.java | 38 + .../io/undertow/security/api/SecurityContext.java | 4 + .../security/api/SecurityContextFactory.java | 2 + .../handlers/AbstractConfidentialityHandler.java | 4 +- .../AbstractSecurityContextAssociationHandler.java | 48 ++ .../handlers/AuthenticationMechanismsHandler.java | 6 +- .../security/handlers/SecurityInitialHandler.java | 16 +- .../security/impl/AbstractSecurityContext.java | 157 ++++ .../security/impl/FormAuthenticationMechanism.java | 6 +- .../impl/GSSAPIAuthenticationMechanism.java | 4 +- .../security/impl/InMemorySingleSignOnManager.java | 4 +- .../security/impl/SecurityContextImpl.java | 144 +--- .../impl/SingleSignOnAuthenticationMechanism.java | 16 +- .../security/impl/SingleSignOnManager.java | 2 +- .../undertow/server/AbstractServerConnection.java | 32 +- .../io/undertow/server/BasicSSLSessionInfo.java | 20 +- .../io/undertow/server/BlockingHttpExchange.java | 7 + .../undertow/server/ConnectionSSLSessionInfo.java | 34 +- .../undertow/server/ConnectorStatisticsImpl.java | 2 +- .../main/java/io/undertow/server/Connectors.java | 29 +- .../io/undertow/server/DefaultByteBufferPool.java | 241 ++++++ .../io/undertow/server/DelegateOpenListener.java | 6 +- .../io/undertow/server/HttpServerExchange.java | 205 +++-- .../main/java/io/undertow/server/OpenListener.java | 6 +- .../java/io/undertow/server/ServerConnection.java | 8 + .../io/undertow/server/XnioBufferPoolAdaptor.java | 66 ++ .../io/undertow/server/XnioByteBufferPool.java | 77 ++ .../server/handlers/AccessControlListHandler.java | 2 +- .../server/handlers/AllowedMethodsHandler.java | 6 +- .../undertow/server/handlers/ByteRangeHandler.java | 4 +- .../undertow/server/handlers/ConnectHandler.java | 12 +- .../server/handlers/DisallowedMethodsHandler.java | 2 +- .../server/handlers/GracefulShutdownHandler.java | 2 +- .../server/handlers/HttpContinueReadHandler.java | 12 +- .../handlers/IPAddressAccessControlHandler.java | 2 +- .../undertow/server/handlers/JDBCLogHandler.java | 4 +- .../server/handlers/LearningPushHandler.java | 2 +- .../server/handlers/NameVirtualHostHandler.java | 15 +- .../io/undertow/server/handlers/PathHandler.java | 2 +- .../server/handlers/PathTemplateHandler.java | 21 +- .../undertow/server/handlers/RedirectHandler.java | 2 +- .../server/handlers/RequestDumpingHandler.java | 3 +- .../server/handlers/ResponseCodeHandler.java | 2 +- .../undertow/server/handlers/SSLHeaderHandler.java | 4 +- .../undertow/server/handlers/SetHeaderHandler.java | 7 + .../handlers/accesslog/AccessLogHandler.java | 28 +- .../accesslog/DefaultAccessLogReceiver.java | 156 +++- .../accesslog/ExtendedAccessLogParser.java | 503 +++++++++++ .../accesslog/LogFileHeaderGenerator.java} | 16 +- .../server/handlers/builder/HandlerParser.java | 357 +------- .../server/handlers/builder/PredicatedHandler.java | 10 + .../handlers/builder/PredicatedHandlersParser.java | 925 ++++++++++++++++++++- .../server/handlers/cache/CachedHttpRequest.java | 2 +- .../undertow/server/handlers/cache/LRUCache.java | 17 +- .../handlers/cache/LimitedBufferSlicePool.java | 2 +- .../server/handlers/cache/ResponseCache.java | 6 +- .../handlers/cache/ResponseCachingSender.java | 4 +- .../cache/ResponseCachingStreamSinkConduit.java | 6 +- .../handlers/encoding/AllowedContentEncodings.java | 4 +- .../encoding/ContentEncodedResourceManager.java | 27 +- .../handlers/error/FileErrorPageHandler.java | 40 +- .../handlers/error/SimpleErrorPageHandler.java | 4 +- .../io/undertow/server/handlers/form/FormData.java | 17 +- .../handlers/form/FormEncodedDataDefinition.java | 8 +- .../handlers/form/MultiPartParserDefinition.java | 70 +- .../server/handlers/proxy/ProxyConnectionPool.java | 72 +- .../server/handlers/proxy/ProxyHandler.java | 158 ++-- .../handlers/proxy/SimpleProxyClientProvider.java | 2 +- .../handlers/proxy/mod_cluster/MCMPHandler.java | 16 +- .../handlers/proxy/mod_cluster/MCMPInfoUtil.java | 6 +- .../handlers/proxy/mod_cluster/MCMPWebManager.java | 8 +- .../handlers/proxy/mod_cluster/ModCluster.java | 32 + .../proxy/mod_cluster/ModClusterContainer.java | 383 ++++++++- .../proxy/mod_cluster/ModClusterController.java} | 13 +- .../proxy/mod_cluster/ModClusterStatus.java | 157 ++++ .../server/handlers/proxy/mod_cluster/Node.java | 35 +- .../handlers/proxy/mod_cluster/NodeConfig.java | 11 +- .../handlers/proxy/mod_cluster/NodePingUtil.java | 11 +- .../handlers/proxy/mod_cluster/NodeStats.java | 38 - .../mod_cluster/NodeStatus.java} | 21 +- .../server/handlers/resource/CachedResource.java | 84 +- .../server/handlers/resource/DirectoryUtils.java | 6 +- .../server/handlers/resource/FileResource.java | 262 +----- .../handlers/resource/FileResourceManager.java | 255 +----- .../{FileResource.java => PathResource.java} | 134 +-- ...sourceManager.java => PathResourceManager.java} | 130 ++- .../server/handlers/resource/Resource.java | 14 + .../handlers/resource/ResourceChangeEvent.java | 2 +- .../server/handlers/resource/ResourceHandler.java | 32 +- .../server/handlers/resource/URLResource.java | 36 +- .../handlers/sse/ServerSentEventConnection.java | 137 ++- .../sse/ServerSentEventConnectionCallback.java | 2 +- .../handlers/sse/ServerSentEventHandler.java | 8 + .../server/protocol/ajp/AjpOpenListener.java | 27 +- .../server/protocol/ajp/AjpReadListener.java | 12 +- .../server/protocol/ajp/AjpServerConnection.java | 6 +- .../protocol/ajp/AjpServerResponseConduit.java | 44 +- .../protocol/framed/AbstractFramedChannel.java | 197 +++-- .../framed/AbstractFramedStreamSinkChannel.java | 185 +++-- .../framed/AbstractFramedStreamSourceChannel.java | 134 +-- .../server/protocol/framed/SendFrameHeader.java | 14 +- .../server/protocol/http/AlpnOpenListener.java | 53 +- .../server/protocol/http/HttpContinue.java | 8 +- .../server/protocol/http/HttpOpenListener.java | 30 +- .../server/protocol/http/HttpReadListener.java | 30 +- .../server/protocol/http/HttpResponseConduit.java | 45 +- .../server/protocol/http/HttpServerConnection.java | 26 +- .../server/protocol/http/HttpTransferEncoding.java | 13 +- .../http/PipeliningBufferingStreamSinkConduit.java | 38 +- .../server/protocol/http2/Http2OpenListener.java | 31 +- .../protocol/http2/Http2ServerConnection.java | 16 +- .../server/protocol/http2/Http2UpgradeHandler.java | 17 +- .../server/protocol/spdy/SpdyOpenListener.java | 36 +- .../protocol/spdy/SpdyPlainOpenListener.java | 30 +- .../server/protocol/spdy/SpdyReceiveListener.java | 5 + .../server/protocol/spdy/SpdyServerConnection.java | 14 +- .../server/session/InMemorySessionManager.java | 65 +- .../session/SecureRandomSessionIdGenerator.java | 6 +- .../io/undertow/server/session/SessionManager.java | 5 + .../server/session/SessionManagerStatistics.java | 2 +- .../main/java/io/undertow/util/CopyOnWriteMap.java | 2 +- .../undertow/util/FastConcurrentDirectDeque.java | 55 +- core/src/main/java/io/undertow/util/FileUtils.java | 90 +- core/src/main/java/io/undertow/util/HeaderMap.java | 12 +- .../java/io/undertow/util/HeaderTokenParser.java | 17 +- .../main/java/io/undertow/util/HeaderValues.java | 15 +- .../ImmediatePooledByteBuffer.java} | 30 +- .../main/java/io/undertow/util/MimeMappings.java | 4 +- .../java/io/undertow/util/MultipartParser.java | 30 +- .../PooledAdaptor.java} | 40 +- .../util/PortableConcurrentDirectDeque.java | 51 +- .../io/undertow/util/ReferenceCountedPooled.java | 72 +- .../undertow/util/StringReadChannelListener.java | 20 +- .../main/java/io/undertow/util/SubstringMap.java | 2 +- core/src/main/java/io/undertow/util/Transfer.java | 30 +- .../client/WebSocket13ClientHandshake.java | 14 +- .../websockets/client/WebSocketClient.java | 35 +- .../client/WebSocketClientHandshake.java | 6 +- .../websockets/core/AbstractReceiveListener.java | 13 +- .../websockets/core/BufferedBinaryMessage.java | 62 +- .../websockets/core/BufferedTextMessage.java | 20 +- .../websockets/core/StreamSourceFrameChannel.java | 112 +-- .../undertow/websockets/core/WebSocketChannel.java | 72 +- .../websockets/core/WebSocketMessages.java | 7 +- .../undertow/websockets/core/WebSocketUtils.java | 27 +- .../io/undertow/websockets/core/WebSockets.java | 125 +-- .../websockets/core/protocol/Handshake.java | 9 +- .../websockets/core/protocol/version07/Base64.java | 25 +- .../core/protocol/version07/Hybi07Handshake.java | 7 +- .../WebSocket07BinaryFrameSinkChannel.java | 4 +- .../WebSocket07BinaryFrameSourceChannel.java | 8 +- .../protocol/version07/WebSocket07Channel.java | 35 +- .../WebSocket07CloseFrameSinkChannel.java | 4 +- .../WebSocket07CloseFrameSourceChannel.java | 8 +- .../version07/WebSocket07FrameSinkChannel.java | 571 +------------ .../version07/WebSocket07PingFrameSinkChannel.java | 8 +- .../WebSocket07PingFrameSourceChannel.java | 8 +- .../version07/WebSocket07PongFrameSinkChannel.java | 4 +- .../WebSocket07PongFrameSourceChannel.java | 8 +- .../version07/WebSocket07TextFrameSinkChannel.java | 4 +- .../WebSocket07TextFrameSourceChannel.java | 8 +- .../core/protocol/version08/Hybi08Handshake.java | 7 +- .../protocol/version08/WebSocket08Channel.java | 9 +- .../core/protocol/version13/Hybi13Handshake.java | 7 +- .../protocol/version13/WebSocket13Channel.java | 9 +- .../extensions/CompositeExtensionFunction.java | 78 ++ .../websockets/extensions/ExtensionByteBuffer.java | 334 -------- .../websockets/extensions/ExtensionFunction.java | 116 +-- .../extensions/NoopExtensionFunction.java | 35 + .../extensions/PerMessageDeflateFunction.java | 274 +++--- .../extensions/PerMessageDeflateHandshake.java | 2 +- .../spi/AsyncWebSocketHttpServerExchange.java | 18 +- .../websockets/spi/WebSocketHttpExchange.java | 7 +- .../io.undertow.attribute.ExchangeAttributeBuilder | 7 +- ...undertow.server.handlers.builder.HandlerBuilder | 4 +- .../undertow/client/http/HttpClientTestCase.java | 9 +- .../http2/HpackSpecExamplesUnitTestCase.java | 86 +- .../server/ConnectionTerminationTestCase.java | 2 +- .../server/handlers/BadRequestTestCase.java | 2 +- .../handlers/ChunkedRequestTrailersTestCase.java | 2 +- .../ChunkedRequestTransferCodingTestCase.java | 2 +- .../handlers/FixedLengthRequestTestCase.java | 4 +- .../handlers/HttpTunnelingViaConnectTestCase.java | 2 +- .../handlers/PredicatedHandlersProxyTestCase.java | 105 +++ .../handlers/PredicatedHandlersTestCase.java | 41 +- .../server/handlers/RangeRequestTestCase.java | 14 +- .../undertow/server/handlers/ReceiverTestCase.java | 218 +++++ .../handlers/RequestLimitingHandlerTestCase.java | 2 +- .../undertow/server/handlers/SenderTestCase.java | 34 +- .../server/handlers/ServerSentEventTestCAse.java | 7 + .../handlers/accesslog/AccessLogFileTestCase.java | 56 +- .../accesslog/ExtendedAccessLogFileTestCase.java | 109 +++ .../builder/PredicatedHandlersParserTestCase.java | 184 ++++ .../error/FileErrorPageHandlerTestCase.java | 8 +- .../file/ContentEncodedResourceTestCase.java | 46 +- .../handlers/file/FileHandlerIndexTestCase.java | 15 +- .../handlers/file/FileHandlerStressTestCase.java | 10 +- .../handlers/file/FileHandlerSymlinksTestCase.java | 166 ++-- .../server/handlers/file/FileHandlerTestCase.java | 47 +- .../handlers/form/FormDataParserTestCase.java | 2 +- .../form/MultipartFormDataParserTestCase.java | 12 +- .../server/handlers/path/PathTestCase.java | 1 + .../proxy/AbstractLoadBalancingProxyTestCase.java | 19 +- .../proxy/LoadBalancingProxyAJPTestCase.java | 38 +- .../proxy/LoadBalancingProxyHTTP2TestCase.java | 14 +- .../LoadBalancingProxyHTTP2ViaUpgradeTestCase.java | 16 +- .../proxy/LoadBalancingProxyHttpsTestCase.java | 14 +- .../proxy/LoadBalancingProxySPDYTestCase.java | 39 +- .../handlers/proxy/LoadBalancingProxyTestCase.java | 15 +- .../handlers/sse/ServerSentEventTestCase.java | 124 +++ .../protocol/http/ContentOverrunTestCase.java | 97 +++ .../protocol/http2/HTTP2ViaUpgradeTestCase.java | 379 +++++++++ .../security/ClientCertRenegotiationTestCase.java | 9 +- .../undertow/server/security/KerberosKDCUtil.java | 31 +- .../io/undertow/server/ssl/ComplexSSLTestCase.java | 10 +- .../io/undertow/testutils/DebuggingSlicePool.java | 55 +- .../java/io/undertow/testutils/DefaultServer.java | 53 +- .../io/undertow/util/MimeDecodingTestCase.java | 18 +- ...sTestCase.java => NodeStatusCodesTestCase.java} | 2 +- .../version13/WebSocketClient13TestCase.java | 24 +- .../core/protocol/AbstractWebSocketServerTest.java | 6 +- .../core/protocol/WebSocket07ServerTest.java | 4 +- .../protocol/server/AutobahnWebSocketServer.java | 8 +- .../AutobahnExtensionCustomReceiverServer.java | 8 +- .../extensions/AutobahnExtensionsServer.java | 5 +- .../extensions/DebugExtensionsListener.java | 2 +- .../WebSocketExtensionBasicTestCase.java | 53 +- .../websockets/utils/WebSocketTestClient.java | 1 + core/src/test/resources/logging.properties | 3 +- coverage-report/pom.xml | 2 +- dist/pom.xml | 4 +- examples/pom.xml | 4 +- .../undertow/examples/fileserving/FileServer.java | 6 +- .../io/undertow/examples/http2/Http2Server.java | 21 +- .../examples/jsrwebsockets/JSRWebSocketServer.java | 5 +- .../examples/sessionhandling/SessionServer.java | 4 +- .../examples/sse/ServerSentEventsServer.java | 2 +- http2-test-suite/pom.xml | 4 +- .../http2/tests/framework/Http2TestRunner.java | 10 +- .../http2/tests/framework/UndertowTestServer.java | 5 +- mac-jdk-fix/jdk7/KQueueArrayWrapper.java | 2 +- parser-generator/pom.xml | 6 +- .../HttpParserAnnotationProcessor.java | 2 +- pom.xml | 61 +- servlet/pom.xml | 4 +- .../main/java/io/undertow/servlet/Servlets.java | 26 +- .../undertow/servlet/UndertowServletMessages.java | 6 +- .../io/undertow/servlet/api/DeploymentInfo.java | 70 +- .../java/io/undertow/servlet/api/FilterInfo.java | 6 +- .../java/io/undertow/servlet/api/ListenerInfo.java | 6 +- .../api/ServletContainerInitializerInfo.java | 17 + ...Attribute.java => ServletContextAttribute.java} | 45 +- ... ServletRequestCharacterEncodingAttribute.java} | 39 +- ...ute.java => ServletRequestLocaleAttribute.java} | 39 +- ....java => ServletRequestParameterAttribute.java} | 42 +- .../attribute/ServletRequestURLAttribute.java | 14 +- ...ava => ServletRequestedSessionIdAttribute.java} | 42 +- ...vletRequestedSessionIdFromCookieAttribute.java} | 42 +- ...> ServletRequestedSessionIdValidAttribute.java} | 42 +- .../servlet/core/ApplicationListeners.java | 63 +- .../servlet/core/DeploymentManagerImpl.java | 6 + .../core/InMemorySessionManagerFactory.java | 2 +- .../io/undertow/servlet/core/ManagedListener.java | 6 +- .../io/undertow/servlet/core/ManagedServlet.java | 11 +- .../servlet/core/ServletBlockingHttpExchange.java | 7 + .../ServletRequestContextThreadSetupAction.java | 15 +- .../servlet/core/ServletUpgradeListener.java | 2 +- .../undertow/servlet/handlers/FilterHandler.java | 3 +- .../servlet/handlers/ServletDebugPageHandler.java | 11 +- .../undertow/servlet/handlers/ServletHandler.java | 13 +- .../servlet/handlers/ServletInitialHandler.java | 30 +- .../servlet/handlers/ServletPathMatches.java | 8 +- .../servlet/handlers/ServletRequestContext.java | 9 + .../CachedAuthenticatedSessionHandler.java | 2 +- .../security/ServletAuthenticationCallHandler.java | 4 +- .../ServletAuthenticationConstraintHandler.java | 4 + .../ServletFormAuthenticationMechanism.java | 22 +- .../servlet/predicate/DirectoryPredicate.java | 70 +- .../undertow/servlet/predicate/FilePredicate.java | 70 +- .../io/undertow/servlet/spec/AsyncContextImpl.java | 6 +- .../servlet/spec/HttpServletRequestImpl.java | 13 +- .../servlet/spec/HttpServletResponseImpl.java | 20 +- .../java/io/undertow/servlet/spec/PartImpl.java | 41 +- .../servlet/spec/RequestDispatcherImpl.java | 2 +- .../undertow/servlet/spec/ServletContextImpl.java | 24 +- .../servlet/spec/ServletInputStreamImpl.java | 42 +- .../servlet/spec/ServletOutputStreamImpl.java | 36 +- .../servlet/spec/UpgradeServletInputStream.java | 44 +- .../undertow/servlet/spec/WebConnectionImpl.java | 5 +- .../io/undertow/servlet/sse/ServerSentEvent.java | 46 + .../undertow/servlet/sse/ServerSentEventSCI.java | 97 +++ .../io/undertow/servlet/util/SavedRequest.java | 4 +- .../websockets/ServletWebSocketHttpExchange.java | 12 +- .../io.undertow.attribute.ExchangeAttributeBuilder | 9 +- .../io.undertow.predicate.PredicateBuilder | 4 +- .../javax.servlet.ServletContainerInitializer | 1 + .../DefaultServletCachingTestCase.java | 57 +- .../ServletContextListenerTestCase.java | 3 + .../test/listener/servletcontext/TestSci.java | 59 ++ .../servlet/test/multipart/MultiPartTestCase.java | 11 +- .../servlet/test/path/RealPathTestCase.java | 7 +- .../servlet/test/proprietry/TransferTestCase.java | 11 +- .../security/form/ServletFormAuthTestCase.java | 4 +- .../test/servletcontext/GetResourceTestCase.java | 28 +- .../test/session/RequestedSessionIdServlet.java | 7 + ...estCase.java => SessionIdHandlingTestCase.java} | 34 +- .../test/streams/EarlyCloseClientServlet.java | 79 ++ .../servlet/test/streams/ResetBufferServlet.java | 45 + ...letInputStreamEarlyCloseClientSideTestCase.java | 85 ++ .../test/streams/ServletOutputStreamTestCase.java | 23 +- .../io/undertow/servlet/test/util/TXServlet.java | 5 +- .../servlet/test/util/TestClassIntrospector.java | 8 +- .../servlet/test/util/TestResourceLoader.java | 11 + websockets-jsr/pom.xml | 4 +- .../java/io/undertow/websockets/jsr/Bootstrap.java | 5 +- .../websockets/jsr/ConfiguredClientEndpoint.java | 6 +- .../websockets/jsr/ConfiguredServerEndpoint.java | 12 +- .../java/io/undertow/websockets/jsr/Encoding.java | 2 +- .../websockets/jsr/EndpointSessionHandler.java | 11 +- .../io/undertow/websockets/jsr/FrameHandler.java | 27 +- .../websockets/jsr/JsrWebSocketFilter.java | 53 +- .../websockets/jsr/JsrWebSocketMessages.java | 3 + .../websockets/jsr/ServerWebSocketContainer.java | 303 ++++++- .../undertow/websockets/jsr/SessionContainer.java | 87 ++ .../websockets/jsr/UndertowContainerProvider.java | 8 +- .../undertow/websockets/jsr/UndertowSession.java | 34 +- .../websockets/jsr/WebSocketDeploymentInfo.java | 11 +- .../jsr/annotated/AnnotatedEndpoint.java | 14 +- .../jsr/annotated/AnnotatedEndpointFactory.java | 16 +- .../jsr/handshake/JsrHybi07Handshake.java | 5 +- .../jsr/handshake/JsrHybi08Handshake.java | 5 +- .../jsr/handshake/JsrHybi13Handshake.java | 5 +- .../websockets/jsr/test/BinaryEndpointTest.java | 8 +- .../jsr/test/JsrWebSocketServer07Test.java | 31 +- .../jsr/test/ProgramaticLazyEndpointTest.java | 3 +- .../jsr/test/TestMessagesReceivedInOrder.java | 5 +- .../jsr/test/annotated/AnnotatedEndpointTest.java | 59 +- .../annotated/AnnotatedGenericClientEndpoint.java | 56 ++ .../annotated/GenericWebSocketClientEndpoint.java | 6 + .../jsr/test/annotated/RootContextEndpoint.java | 14 +- .../AnnotatedAutobahnExtensionsServer.java | 7 +- .../jsr/test/autobahn/AnnotatedAutobahnServer.java | 8 +- .../test/autobahn/ProgramaticAutobahnServer.java | 7 +- .../jsr/test/dynamicupgrade/DoUpgradeServlet.java | 86 ++ .../test/dynamicupgrade/DynamicEndpointTest.java | 105 +++ .../EchoEndpoint.java} | 12 +- .../reconnect/ClientEndpointReconnectTestCase.java | 4 +- .../websockets/jsr/test/stress/StressEndpoint.java | 30 + .../jsr/test/stress/WebsocketStressTestCase.java | 184 +++- .../SuspendResumeEndpoint.java} | 10 +- .../test/suspendresume/SuspendResumeTestCase.java | 190 +++++ 453 files changed, 12289 insertions(+), 6414 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
