[undertow] 02/05: Merge tag 'upstream/1.3.16'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository undertow.

commit b6e2abc0bdb93219800c078e849b9a3bb47e312b
Merge: 459c264 9bf9955
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jan 30 17:02:02 2016 +0100

    Merge tag 'upstream/1.3.16'
    
    Upstream version 1.3.16
    
    # gpg: Signature made Sat 30 Jan 2016 17:01:57 CET using RSA key ID 513B51E4
    # 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                                       |   4 +-
 core/src/main/java/io/undertow/UndertowLogger.java |   4 +
 .../main/java/io/undertow/UndertowMessages.java    |   3 +
 .../src/main/java/io/undertow/UndertowOptions.java |   5 +
 .../undertow/client/http/HttpClientConnection.java |   4 +-
 .../conduits/DeflatingStreamSinkConduit.java       |   1 +
 .../undertow/conduits/RangeStreamSinkConduit.java  |  11 ++
 .../undertow/protocols/ajp/AjpClientChannel.java   |   4 +
 .../AjpClientRequestClientStreamSinkChannel.java   |  10 +-
 .../io/undertow/protocols/http2/Http2Channel.java  |   8 +
 .../protocols/http2/Http2StreamSinkChannel.java    |   1 +
 .../io/undertow/protocols/spdy/SpdyChannel.java    |  10 +-
 .../spdy/SpdyStreamStreamSinkChannel.java          |   1 +
 .../java/io/undertow/protocols/ssl/SslConduit.java |  21 ++-
 .../undertow/server/ConnectionSSLSessionInfo.java  |   9 +-
 .../server/handlers/AccessControlListHandler.java  |  91 +++++++++++
 .../cache/ResponseCachingStreamSinkConduit.java    |  11 ++
 .../handlers/resource/PathResourceManager.java     |   2 +-
 .../handlers/sse/ServerSentEventConnection.java    |  89 +++++++---
 .../protocol/ajp/AjpServerResponseConduit.java     |   8 +-
 .../protocol/framed/AbstractFramedChannel.java     |  10 +-
 .../server/protocol/http/HttpReadListener.java     |  32 ++--
 .../server/protocol/http/HttpResponseConduit.java  |  32 +++-
 .../server/protocol/http/HttpTransferEncoding.java |   7 +
 .../server/session/InMemorySessionManager.java     |   8 +-
 .../java/io/undertow/util/ConnectionUtils.java     | 132 +++++++++++++++
 .../main/java/io/undertow/util/LocaleUtils.java    |   3 +
 .../io/undertow/util/ReferenceCountedPooled.java   |  10 ++
 ...undertow.server.handlers.builder.HandlerBuilder |   1 +
 .../server/handlers/ServerSentEventTestCAse.java   |   7 -
 .../handlers/file/PathResourceManagerTestCase.java |  27 ++++
 .../proxy/LoadBalancingProxyHTTP2TestCase.java     |   1 +
 .../handlers/sse/ServerSentEventTestCase.java      |  42 +++++
 .../io/undertow/server/ssl/SimpleSSLTestCase.java  |  33 ++++
 .../io/undertow/testutils/DebuggingSlicePool.java  |   2 +-
 .../java/io/undertow/util/LocaleUtilsTestCase.java |  13 ++
 core/src/test/resources/logging.properties         |   4 +-
 coverage-report/pom.xml                            |   2 +-
 dist/pom.xml                                       |   4 +-
 examples/pom.xml                                   |   4 +-
 http2-test-suite/pom.xml                           |   4 +-
 parser-generator/pom.xml                           |   4 +-
 pom.xml                                            | 179 ++++++++++++++++++++-
 servlet/pom.xml                                    |   4 +-
 .../servlet/core/DeploymentManagerImpl.java        |   8 +-
 .../ServletConfidentialityConstraintHandler.java   |  15 ++
 .../servlet/spec/HttpServletRequestImpl.java       |   2 +-
 .../servlet/spec/HttpServletResponseImpl.java      |   5 +-
 .../test/upgrade/SimpleUpgradeTestCase.java        |  46 +++---
 websockets-jsr/pom.xml                             |   4 +-
 .../io/undertow/websockets/jsr/FrameHandler.java   |  34 ++++
 .../websockets/jsr/ServerWebSocketContainer.java   |  11 +-
 .../undertow/websockets/jsr/UndertowSession.java   |   7 +-
 53 files changed, 855 insertions(+), 139 deletions(-)

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