[jetty9] 02/05: Merge tag 'upstream/9.2.20'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Jan 8 00:33:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty9.
commit 09457b41c5acabb031fff76fd3f9229dadd6a3df
Merge: 08452be 3c24512
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Jan 8 01:24:27 2017 +0100
Merge tag 'upstream/9.2.20'
Upstream version 9.2.20
Jenkinsfile | 77 ++++-
VERSION.txt | 15 +-
aggregates/jetty-all/pom.xml | 2 +-
apache-jsp/pom.xml | 9 +-
apache-jstl/pom.xml | 9 +-
examples/async-rest/async-rest-jar/pom.xml | 2 +-
examples/async-rest/async-rest-webapp/pom.xml | 2 +-
examples/async-rest/pom.xml | 2 +-
examples/embedded/pom.xml | 2 +-
examples/pom.xml | 2 +-
jetty-alpn/jetty-alpn-client/pom.xml | 2 +-
jetty-alpn/jetty-alpn-server/pom.xml | 2 +-
.../modules/protonego-impl/alpn-1.8.0_111.mod | 8 +
.../modules/protonego-impl/alpn-1.8.0_112.mod | 8 +
jetty-alpn/pom.xml | 2 +-
jetty-annotations/pom.xml | 2 +-
jetty-ant/pom.xml | 9 +-
jetty-cdi/pom.xml | 2 +-
jetty-client/pom.xml | 2 +-
.../eclipse/jetty/client/GZIPContentDecoder.java | 9 +-
.../org/eclipse/jetty/client/HttpReceiver.java | 11 +
jetty-continuation/pom.xml | 2 +-
jetty-deploy/pom.xml | 2 +-
.../jetty/deploy/providers/WebAppProvider.java | 2 +-
jetty-distribution/pom.xml | 2 +-
jetty-fcgi/fcgi-client/pom.xml | 2 +-
jetty-fcgi/fcgi-server/pom.xml | 2 +-
jetty-fcgi/pom.xml | 2 +-
jetty-http-spi/pom.xml | 9 +-
jetty-http/pom.xml | 2 +-
.../org/eclipse/jetty/http/HttpParserTest.java | 72 ++--
jetty-io/pom.xml | 2 +-
jetty-jaas/pom.xml | 2 +-
jetty-jaspi/pom.xml | 2 +-
jetty-jmx/pom.xml | 2 +-
jetty-jndi/pom.xml | 2 +-
jetty-jsp/pom.xml | 2 +-
jetty-jspc-maven-plugin/pom.xml | 9 +-
jetty-maven-plugin/pom.xml | 9 +-
jetty-monitor/pom.xml | 2 +-
jetty-nosql/pom.xml | 2 +-
jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot/pom.xml | 2 +-
jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +-
jetty-osgi/pom.xml | 9 +-
jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +-
jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +-
jetty-osgi/test-jetty-osgi/pom.xml | 2 +-
jetty-plus/pom.xml | 2 +-
jetty-proxy/pom.xml | 2 +-
jetty-quickstart/pom.xml | 2 +-
jetty-rewrite/pom.xml | 2 +-
jetty-runner/pom.xml | 2 +-
jetty-security/pom.xml | 2 +-
jetty-server/pom.xml | 2 +-
.../java/org/eclipse/jetty/server/HttpChannel.java | 5 +-
.../org/eclipse/jetty/server/HttpConnection.java | 27 ++
.../java/org/eclipse/jetty/server/HttpOutput.java | 8 +
.../eclipse/jetty/server/ProxyProtocolTest.java | 114 +++++++
jetty-servlet/pom.xml | 2 +-
jetty-servlets/pom.xml | 2 +-
jetty-spdy/pom.xml | 2 +-
jetty-spdy/spdy-alpn-tests/pom.xml | 2 +-
jetty-spdy/spdy-client/pom.xml | 2 +-
jetty-spdy/spdy-core/pom.xml | 2 +-
jetty-spdy/spdy-example-webapp/pom.xml | 2 +-
jetty-spdy/spdy-http-client-transport/pom.xml | 2 +-
jetty-spdy/spdy-http-common/pom.xml | 2 +-
jetty-spdy/spdy-http-server/pom.xml | 2 +-
jetty-spdy/spdy-server/pom.xml | 2 +-
jetty-spring/pom.xml | 9 +-
jetty-start/pom.xml | 2 +-
.../modules/protonego-impl/alpn-1.8.0_111.mod | 8 +
.../modules/protonego-impl/alpn-1.8.0_112.mod | 8 +
jetty-util-ajax/pom.xml | 2 +-
jetty-util/pom.xml | 2 +-
.../jetty/util/RolloverFileOutputStream.java | 62 ++--
jetty-webapp/pom.xml | 2 +-
.../javax-websocket-client-impl/pom.xml | 2 +-
.../javax-websocket-server-impl/pom.xml | 2 +-
.../jetty/websocket/jsr356/server/JsrCreator.java | 7 +-
.../jsr356/server/JsrHandshakeRequest.java | 2 +-
.../server/PathParamServerEndpointConfig.java | 6 +-
.../websocket/jsr356/server/ServerContainer.java | 43 ++-
.../WebSocketServerContainerInitializer.java | 155 +++++----
.../websocket/jsr356/server/AltFilterTest.java | 97 ++++++
.../websocket/jsr356/server/DummyCreator.java | 15 +-
.../server/ExtensionStackProcessingTest.java | 27 +-
.../jetty/websocket/jsr356/server/WSServer.java | 9 +-
.../BasicEchoEndpointConfigContextListener.java | 2 +-
.../src/test/resources/alt-filter-web.xml | 23 ++
jetty-websocket/pom.xml | 2 +-
jetty-websocket/websocket-api/pom.xml | 2 +-
jetty-websocket/websocket-client/pom.xml | 2 +-
jetty-websocket/websocket-common/pom.xml | 2 +-
jetty-websocket/websocket-server/pom.xml | 14 +-
.../websocket/server/MappedWebSocketCreator.java | 41 ++-
.../server/NativeWebSocketConfiguration.java | 171 ++++++++++
...NativeWebSocketServletContainerInitializer.java | 48 +++
.../websocket/server/WebSocketServerFactory.java | 32 +-
.../websocket/server/WebSocketUpgradeFilter.java | 366 ++++++++++++---------
.../server/WebSocketUpgradeHandlerWrapper.java | 49 ++-
.../websocket/server/pathmap/PathMappings.java | 2 +
.../javax.servlet.ServletContainerInitializer | 1 +
.../server/InfoContextAttributeListener.java | 49 +++
.../websocket/server/InfoContextListener.java | 50 +++
.../jetty/websocket/server/InfoServlet.java | 47 +++
.../jetty/websocket/server/InfoSocket.java} | 31 +-
.../eclipse/jetty/websocket}/server/WSServer.java | 11 +-
.../server/WebSocketUpgradeFilterTest.java | 291 ++++++++++++++++
.../test/resources/wsuf-config-via-listener.xml | 22 ++
.../resources/wsuf-config-via-servlet-init.xml | 24 ++
jetty-websocket/websocket-servlet/pom.xml | 2 +-
jetty-xml/pom.xml | 2 +-
pom.xml | 84 ++++-
tests/pom.xml | 2 +-
tests/test-continuation/pom.xml | 2 +-
tests/test-integration/pom.xml | 2 +-
tests/test-jmx/jmx-webapp-it/pom.xml | 2 +-
tests/test-jmx/jmx-webapp/pom.xml | 2 +-
tests/test-jmx/pom.xml | 2 +-
tests/test-loginservice/pom.xml | 2 +-
tests/test-quickstart/pom.xml | 2 +-
tests/test-sessions/pom.xml | 2 +-
tests/test-sessions/test-hash-sessions/pom.xml | 2 +-
tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +-
tests/test-sessions/test-mongodb-sessions/pom.xml | 2 +-
tests/test-sessions/test-sessions-common/pom.xml | 2 +-
tests/test-webapps/pom.xml | 9 +-
tests/test-webapps/test-jaas-webapp/pom.xml | 2 +-
tests/test-webapps/test-jetty-webapp/pom.xml | 2 +-
tests/test-webapps/test-jndi-webapp/pom.xml | 2 +-
tests/test-webapps/test-mock-resources/pom.xml | 2 +-
tests/test-webapps/test-proxy-webapp/pom.xml | 2 +-
tests/test-webapps/test-servlet-spec/pom.xml | 2 +-
.../test-container-initializer/pom.xml | 2 +-
.../test-servlet-spec/test-spec-webapp/pom.xml | 2 +-
.../test-servlet-spec/test-web-fragment/pom.xml | 2 +-
tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +-
141 files changed, 1880 insertions(+), 530 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list