diff options
author | Jan Bartel | 2015-10-12 21:35:50 +0000 |
---|---|---|
committer | Jan Bartel | 2015-10-12 21:35:50 +0000 |
commit | 73de40921c586d661e151d8141f6b657840afb46 (patch) | |
tree | 7253ebadca1996ac5e404dc39ceface73591c855 | |
parent | 71c2d79daa6f74b437412d63c994b162c0c6c2d0 (diff) | |
parent | 422be53960e02053c690953201cf9282932329ef (diff) | |
download | org.eclipse.jetty.project-gcloud-session-manager.tar.gz org.eclipse.jetty.project-gcloud-session-manager.tar.xz org.eclipse.jetty.project-gcloud-session-manager.zip |
Merge branch 'jetty-9.3.x' into gcloud-session-managergcloud-session-manager
119 files changed, 476 insertions, 125 deletions
diff --git a/VERSION.txt b/VERSION.txt index c41a182d65..6d974ca283 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,49 @@ -jetty-9.3.4-SNAPSHOT +jetty-9.3.4.v20151007 - 07 October 2015 + + 428474 Expose batch mode in the Jetty WebSocket API + + 472082 isOpen returns true on CLOSING Connection + + 474936 WebSocketSessions are not always cleaned out from openSessions + + 475209 WebSocketServerFactory should not hand null object to + DecoratedObjectFactory + + 476023 Incorrect trimming of WebSocket close reason + + 476049 When using WebSocket Session.close() there should be no status code + or reason sent + + 476170 Support servers that close connections without sending Connection: + close header. + + 476720 getTrustStoreResource fixed + + 477087 Enforce that the preface contains a SETTINGS frame. + + 477123 AsyncListener callbacks need context scope + + 477270 Add ability to send a single PRIORITY frame. + + 477278 Refactored DefaultServlet for cached Gzip & Etags + + 477385 Make jetty osgi manifests only resolve jetty packages against a + single distro version + + 477641 ALPN classes exposed to webapps - fixed typo + + 477680 Encode merged query parameters + + 477737 Improve handling of etags with dynamic and static gzip + + 477757 Null args in TypeUtil .call & .construct result in confusing + exceptions + + 477817 Fixed memory leak in QueuedThreadPool + + 477878 HttpClient over HTTP/2 doesn't close upload stream. + + 477885 Jetty HTTP2 client fails to connect with Netty server - HTTP2 client + preface missing or corrupt. + + 477890 Overwhelmed HTTP/2 server discards data. + + 477895 Prevent leak of handles to deleted files after redeploy + + 477900 Increase client authentication default max content size + + 478008 Do not reset current value of CounterStatistics + + 478021 Client sending Connection: close does not shutdown output. + + 478105 prependFilterMapping check for null FilterHolder + + 478239 Remove pointless synchronize in infinispan scavenging + + 478247 WebappClassLoader pinned after redeploy + + 478275 Priority information in HEADERS frame is not sent. + + 478280 property file in temp directory + + 478372 JavaUtilLog setSourceClass and setSourceMethod + + 478434 Priority weights should be between 1 and 256 inclusive. + + 478752 Clarify support for HttpServletRequest.upgrade() + + 478757 DebugHandler thread name is mangled + + 478829 WebsocketSession not cleaned up / memory leak + + 478862 Update to jstl 1.2.5 + + 478923 threads stuck at SharedBlockingCallback$Blocker.block + + 479026 Wrong CONNECT request idle timeout. + + 479277 HttpClient with HTTP/2 transport does not work for "https" URLs. jetty-9.3.3.v20150827 - 27 August 2015 + 470311 Introduce a proxy-protocol module. diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 0e2c674eb9..6bcd747518 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.1-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 4ce3ad4bf8..3d91f94353 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 7267c80a59..1be0a7dcc8 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>apache-jsp</artifactId> diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 4d21ada6b0..f7979ee24f 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>apache-jstl</artifactId> diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 447d2c1d16..7cb63e14d6 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/examples/async-rest/async-rest-jar/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>example-async-rest</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jetty.example-async-rest</groupId> diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index a4b5301b36..db5ae31a52 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>example-async-rest</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jetty.example-async-rest</groupId> diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 46ac32d248..3107fb5855 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.examples</groupId> <artifactId>examples-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 0ec8639270..ba6c1c8acd 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.examples</groupId> <artifactId>examples-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/examples/pom.xml b/examples/pom.xml index 69bc2c27f9..7f68a9a0d8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.jetty.examples</groupId> diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index e25c280081..a8fed2b7d8 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-alpn-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-alpn-client</artifactId> diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 3465055281..289f04e2d5 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-alpn-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-alpn-server</artifactId> diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 1c9efdddf6..00300a4ce1 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-alpn-parent</artifactId> diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 88ebfd7121..81ba9e3c92 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-annotations</artifactId> diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index f1c72ce1b9..f9c412aeaa 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-ant</artifactId> diff --git a/jetty-cdi/cdi-core/pom.xml b/jetty-cdi/cdi-core/pom.xml index cfcd1baea9..2edfa973f3 100644 --- a/jetty-cdi/cdi-core/pom.xml +++ b/jetty-cdi/cdi-core/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.cdi</groupId> <artifactId>jetty-cdi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cdi-core</artifactId> diff --git a/jetty-cdi/cdi-full-servlet/pom.xml b/jetty-cdi/cdi-full-servlet/pom.xml index c02720ffba..016c0dfb37 100644 --- a/jetty-cdi/cdi-full-servlet/pom.xml +++ b/jetty-cdi/cdi-full-servlet/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.cdi</groupId> <artifactId>jetty-cdi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cdi-full-servlet</artifactId> diff --git a/jetty-cdi/cdi-servlet/pom.xml b/jetty-cdi/cdi-servlet/pom.xml index e1265a295a..000af40c61 100644 --- a/jetty-cdi/cdi-servlet/pom.xml +++ b/jetty-cdi/cdi-servlet/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.cdi</groupId> <artifactId>jetty-cdi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cdi-servlet</artifactId> diff --git a/jetty-cdi/cdi-websocket/pom.xml b/jetty-cdi/cdi-websocket/pom.xml index 27e5eff8c4..e07b649268 100644 --- a/jetty-cdi/cdi-websocket/pom.xml +++ b/jetty-cdi/cdi-websocket/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.cdi</groupId> <artifactId>jetty-cdi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cdi-websocket</artifactId> diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 279de82909..7f2729e515 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jetty.cdi</groupId> diff --git a/jetty-cdi/test-cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml index 4410043056..2e440a20a7 100644 --- a/jetty-cdi/test-cdi-webapp/pom.xml +++ b/jetty-cdi/test-cdi-webapp/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.cdi</groupId> <artifactId>jetty-cdi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-cdi-webapp</artifactId> diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index dd194530d1..1b6857e888 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index ecb449e63a..2233e8b655 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-continuation</artifactId> diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 99c00e5d49..ce25cb4a53 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-deploy</artifactId> diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 2ccee1e2d4..c472bd4246 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>jetty-distribution</artifactId> <name>Jetty :: Distribution Assemblies</name> diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh index 8cbb41ce17..043d205177 100755 --- a/jetty-distribution/src/main/resources/bin/jetty.sh +++ b/jetty-distribution/src/main/resources/bin/jetty.sh @@ -445,7 +445,7 @@ case "$ACTION" in exit 1 fi - if [ -n "$JETTY_USER" ] + if [ -n "$JETTY_USER" ] && [ `whoami` != "$JETTY_USER" ] then unset SU_SHELL if [ "$JETTY_SHELL" ] diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index ecce8fd865..d1559cf687 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.fcgi</groupId> <artifactId>fcgi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index cbad4c07f2..ffe8e5e807 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.fcgi</groupId> <artifactId>fcgi-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index cb0d2a093a..3d4984e622 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index b88be85af6..ddae60c936 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-http-spi</artifactId> diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 150c4b9f8d..0f2e6991f4 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-http</artifactId> diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 0a33193c26..3ceacbfbaa 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 866225ded3..6308b3fbb1 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java index 62a0608abf..7bc4179f31 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java @@ -51,7 +51,7 @@ public class AbstractTest protected ServerConnector connector; protected String servletPath = "/test"; protected HTTP2Client client; - private Server server; + protected Server server; protected void start(HttpServlet servlet) throws Exception { @@ -71,19 +71,19 @@ public class AbstractTest protected void start(ServerSessionListener listener) throws Exception { - prepareServer(new RawHTTP2ServerConnectionFactory(new HttpConfiguration(),listener)); + prepareServer(new RawHTTP2ServerConnectionFactory(new HttpConfiguration(), listener)); server.start(); prepareClient(); client.start(); } - private void prepareServer(ConnectionFactory connectionFactory) + protected void prepareServer(ConnectionFactory... connectionFactories) { QueuedThreadPool serverExecutor = new QueuedThreadPool(); serverExecutor.setName("server"); server = new Server(serverExecutor); - connector = new ServerConnector(server, 1,1, connectionFactory); + connector = new ServerConnector(server, 1, 1, connectionFactories); server.addConnector(connector); } diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/PrefaceTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/PrefaceTest.java index 31623f8705..9f353ad158 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/PrefaceTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/PrefaceTest.java @@ -18,19 +18,41 @@ package org.eclipse.jetty.http2.client; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; +import java.nio.charset.StandardCharsets; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Queue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.http.HttpFields; +import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http2.ErrorCode; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.api.server.ServerSessionListener; import org.eclipse.jetty.http2.frames.HeadersFrame; +import org.eclipse.jetty.http2.frames.PingFrame; +import org.eclipse.jetty.http2.frames.PrefaceFrame; import org.eclipse.jetty.http2.frames.SettingsFrame; +import org.eclipse.jetty.http2.generator.Generator; +import org.eclipse.jetty.http2.parser.Parser; +import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; +import org.eclipse.jetty.io.ByteBufferPool; +import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.io.MappedByteBufferPool; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; import org.junit.Assert; @@ -39,7 +61,7 @@ import org.junit.Test; public class PrefaceTest extends AbstractTest { @Test - public void testServerPrefaceBeforeClientPreface() throws Exception + public void testServerPrefaceReplySentAfterClientPreface() throws Exception { start(new ServerSessionListener.Adapter() { @@ -95,4 +117,211 @@ public class PrefaceTest extends AbstractTest Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); } + + @Test + public void testClientPrefaceReplySentAfterServerPreface() throws Exception + { + start(new ServerSessionListener.Adapter() + { + @Override + public Map<Integer, Integer> onPreface(Session session) + { + Map<Integer, Integer> settings = new HashMap<>(); + settings.put(SettingsFrame.MAX_CONCURRENT_STREAMS, 128); + return settings; + } + + @Override + public void onPing(Session session, PingFrame frame) + { + session.close(ErrorCode.NO_ERROR.code, null, Callback.NOOP); + } + }); + + ByteBufferPool byteBufferPool = client.getByteBufferPool(); + try (SocketChannel socket = SocketChannel.open()) + { + socket.connect(new InetSocketAddress("localhost", connector.getLocalPort())); + + Generator generator = new Generator(byteBufferPool); + ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool); + generator.control(lease, new PrefaceFrame()); + Map<Integer, Integer> clientSettings = new HashMap<>(); + clientSettings.put(SettingsFrame.ENABLE_PUSH, 0); + generator.control(lease, new SettingsFrame(clientSettings, false)); + // The PING frame just to make sure the client stops reading. + generator.control(lease, new PingFrame(true)); + + List<ByteBuffer> buffers = lease.getByteBuffers(); + socket.write(buffers.toArray(new ByteBuffer[buffers.size()])); + + Queue<SettingsFrame> settings = new ArrayQueue<>(); + Parser parser = new Parser(byteBufferPool, new Parser.Listener.Adapter() + { + @Override + public void onSettings(SettingsFrame frame) + { + settings.offer(frame); + } + }, 4096, 8192); + + ByteBuffer buffer = byteBufferPool.acquire(1024, true); + while (true) + { + int read = socket.read(buffer); + buffer.flip(); + if (read < 0) + break; + parser.parse(buffer); + buffer.clear(); + } + + Assert.assertEquals(2, settings.size()); + SettingsFrame frame1 = settings.poll(); + Assert.assertFalse(frame1.isReply()); + SettingsFrame frame2 = settings.poll(); + Assert.assertTrue(frame2.isReply()); + } + } + + @Test + public void testOnPrefaceNotifiedForStandardUpgrade() throws Exception + { + Integer maxConcurrentStreams = 128; + AtomicReference<CountDownLatch> serverPrefaceLatch = new AtomicReference<>(new CountDownLatch(1)); + AtomicReference<CountDownLatch> serverSettingsLatch = new AtomicReference<>(new CountDownLatch(1)); + HttpConfiguration config = new HttpConfiguration(); + prepareServer(new HttpConnectionFactory(config), new HTTP2CServerConnectionFactory(config) + { + @Override + protected ServerSessionListener newSessionListener(Connector connector, EndPoint endPoint) + { + return new ServerSessionListener.Adapter() + { + @Override + public Map<Integer, Integer> onPreface(Session session) + { + Map<Integer, Integer> serverSettings = new HashMap<>(); + serverSettings.put(SettingsFrame.MAX_CONCURRENT_STREAMS, maxConcurrentStreams); + serverPrefaceLatch.get().countDown(); + return serverSettings; + } + + @Override + public void onSettings(Session session, SettingsFrame frame) + { + serverSettingsLatch.get().countDown(); + } + + @Override + public Stream.Listener onNewStream(Stream stream, HeadersFrame frame) + { + MetaData.Response response = new MetaData.Response(HttpVersion.HTTP_2, HttpStatus.OK_200, new HttpFields()); + stream.headers(new HeadersFrame(stream.getId(), response, null, true), Callback.NOOP); + return null; + } + }; + } + }); + server.start(); + + ByteBufferPool byteBufferPool = new MappedByteBufferPool(); + try (SocketChannel socket = SocketChannel.open()) + { + socket.connect(new InetSocketAddress("localhost", connector.getLocalPort())); + + String upgradeRequest = "" + + "GET /one HTTP/1.1\r\n" + + "Host: localhost\r\n" + + "Connection: Upgrade, HTTP2-Settings\r\n" + + "Upgrade: h2c\r\n" + + "HTTP2-Settings: \r\n" + + "\r\n"; + ByteBuffer upgradeBuffer = ByteBuffer.wrap(upgradeRequest.getBytes(StandardCharsets.ISO_8859_1)); + socket.write(upgradeBuffer); + + // Make sure onPreface() is called on server. + Assert.assertTrue(serverPrefaceLatch.get().await(5, TimeUnit.SECONDS)); + Assert.assertTrue(serverSettingsLatch.get().await(5, TimeUnit.SECONDS)); + + // The 101 response is the reply to the client preface SETTINGS frame. + ByteBuffer buffer = byteBufferPool.acquire(1024, true); + http1: while (true) + { + buffer.clear(); + int read = socket.read(buffer); + buffer.flip(); + if (read < 0) + Assert.fail(); + + int crlfs = 0; + while (buffer.hasRemaining()) + { + byte b = buffer.get(); + if (b == '\r' || b == '\n') + ++crlfs; + else + crlfs = 0; + if (crlfs == 4) + break http1; + } + } + + // Reset the latches on server. + serverPrefaceLatch.set(new CountDownLatch(1)); + serverSettingsLatch.set(new CountDownLatch(1)); + + // After the 101, the client must send the connection preface. + Generator generator = new Generator(byteBufferPool); + ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool); + generator.control(lease, new PrefaceFrame()); + Map<Integer, Integer> clientSettings = new HashMap<>(); + clientSettings.put(SettingsFrame.ENABLE_PUSH, 1); + generator.control(lease, new SettingsFrame(clientSettings, false)); + List<ByteBuffer> buffers = lease.getByteBuffers(); + socket.write(buffers.toArray(new ByteBuffer[buffers.size()])); + + // However, we should not call onPreface() again. + Assert.assertFalse(serverPrefaceLatch.get().await(1, TimeUnit.SECONDS)); + // Although we should notify of the SETTINGS frame. + Assert.assertTrue(serverSettingsLatch.get().await(5, TimeUnit.SECONDS)); + + CountDownLatch clientSettingsLatch = new CountDownLatch(1); + AtomicBoolean responded = new AtomicBoolean(); + Parser parser = new Parser(byteBufferPool, new Parser.Listener.Adapter() + { + @Override + public void onSettings(SettingsFrame frame) + { + if (frame.isReply()) + return; + Assert.assertEquals(maxConcurrentStreams, frame.getSettings().get(SettingsFrame.MAX_CONCURRENT_STREAMS)); + clientSettingsLatch.countDown(); + } + + @Override + public void onHeaders(HeadersFrame frame) + { + if (frame.isEndStream()) + responded.set(true); + } + }, 4096, 8192); + + // HTTP/2 parsing. + while (true) + { + parser.parse(buffer); + if (responded.get()) + break; + + buffer.clear(); + int read = socket.read(buffer); + buffer.flip(); + if (read < 0) + Assert.fail(); + } + + Assert.assertTrue(clientSettingsLatch.await(5, TimeUnit.SECONDS)); + } + } } diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index d8c95cb0e0..3dd4e31d0b 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java index b8ffbcb56b..cfc27e43c0 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java @@ -197,6 +197,11 @@ public class Parser return headerParser.getFrameType(); } + protected boolean hasFlag(int bit) + { + return headerParser.hasFlag(bit); + } + protected void notifyConnectionFailure(int error, String reason) { try diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java index f5d1718de7..c5843481ea 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.http2.parser; import java.nio.ByteBuffer; import org.eclipse.jetty.http2.ErrorCode; +import org.eclipse.jetty.http2.Flags; import org.eclipse.jetty.http2.frames.FrameType; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; @@ -34,6 +35,7 @@ public class ServerParser extends Parser private final Listener listener; private final PrefaceParser prefaceParser; private State state = State.PREFACE; + private boolean notifyPreface = true; public ServerParser(ByteBufferPool byteBufferPool, Listener listener, int maxDynamicTableSize, int maxHeaderSize) { @@ -61,6 +63,16 @@ public class ServerParser extends Parser prefaceParser.directUpgrade(); } + /** + * <p>The standard HTTP/1.1 upgrade path.</p> + */ + public void standardUpgrade() + { + if (state != State.PREFACE) + throw new IllegalStateException(); + notifyPreface = false; + } + @Override public void parse(ByteBuffer buffer) { @@ -77,6 +89,8 @@ public class ServerParser extends Parser { if (!prefaceParser.parse(buffer)) return; + if (notifyPreface) + onPreface(); state = State.SETTINGS; break; } @@ -84,7 +98,7 @@ public class ServerParser extends Parser { if (!parseHeader(buffer)) return; - if (getFrameType() != FrameType.SETTINGS.getType()) + if (getFrameType() != FrameType.SETTINGS.getType() || hasFlag(Flags.ACK)) { BufferUtil.clear(buffer); notifyConnectionFailure(ErrorCode.PROTOCOL_ERROR.code, "invalid_preface"); @@ -92,7 +106,6 @@ public class ServerParser extends Parser } if (!parseBody(buffer)) return; - onPreface(); state = State.FRAMES; break; } diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index be48bf6311..dc5bffa837 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index df28dd82e0..b6a8f423d6 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 631320252a..7a226a7844 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java index 07ffd987ad..68dd541bc4 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java @@ -19,6 +19,8 @@ package org.eclipse.jetty.http2.server; import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; import java.util.Queue; import java.util.concurrent.Executor; @@ -33,7 +35,9 @@ import org.eclipse.jetty.http2.ISession; import org.eclipse.jetty.http2.IStream; import org.eclipse.jetty.http2.api.server.ServerSessionListener; import org.eclipse.jetty.http2.frames.DataFrame; +import org.eclipse.jetty.http2.frames.Frame; import org.eclipse.jetty.http2.frames.HeadersFrame; +import org.eclipse.jetty.http2.frames.PrefaceFrame; import org.eclipse.jetty.http2.frames.SettingsFrame; import org.eclipse.jetty.http2.parser.ServerParser; import org.eclipse.jetty.http2.parser.SettingsBodyParser; @@ -53,7 +57,7 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection private final Queue<HttpChannelOverHTTP2> channels = new ConcurrentArrayQueue<>(); private final ServerSessionListener listener; private final HttpConfiguration httpConfig; - private HeadersFrame upgradeRequest; + private final List<Frame> upgradeFrames = new ArrayList<>(); public HTTP2ServerConnection(ByteBufferPool byteBufferPool, Executor executor, EndPoint endPoint, HttpConfiguration httpConfig, ServerParser parser, ISession session, int inputBufferSize, ServerSessionListener listener) { @@ -79,10 +83,10 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection @Override public void onOpen() { - super.onOpen(); notifyAccept(getSession()); - if (upgradeRequest != null) - getSession().onFrame(upgradeRequest); + for (Frame frame : upgradeFrames) + getSession().onFrame(frame); + super.onOpen(); } private void notifyAccept(ISession session) @@ -172,10 +176,12 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection throw new BadMessageException(); } - getSession().onFrame(settingsFrame); + getParser().standardUpgrade(); + upgradeFrames.add(new PrefaceFrame()); + upgradeFrames.add(settingsFrame); // Remember the request to send a response from onOpen(). - upgradeRequest = new HeadersFrame(1, request, null, true); + upgradeFrames.add(new HeadersFrame(1, request, null, true)); } return true; } diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java index 7d53e206af..59fede564c 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java @@ -112,6 +112,9 @@ public class HTTP2ServerSession extends HTTP2Session implements ServerParser.Lis { switch (frame.getType()) { + case PREFACE: + onPreface(); + break; case SETTINGS: // SPEC: the required reply to this SETTINGS frame is the 101 response. onSettings((SettingsFrame)frame, false); diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index eb1aee60b2..bf3f586c43 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index b8f74181da..4c3b03e94c 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-infinispan</artifactId> diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 1d99e18127..75d647b22e 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-io</artifactId> diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 9e15407a07..c21564b9e2 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jaas</artifactId> diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 8234017523..6b00476d55 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jaspi</artifactId> diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 675b4354b7..ea8357d6ca 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jmx</artifactId> diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 4eec4c1b61..ec13a6e1c4 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jndi</artifactId> diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index e26851d72e..b2dba33b3a 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jspc-maven-plugin</artifactId> diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 9362b8bf5d..09ba486f60 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-maven-plugin</artifactId> diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index a5142f459d..2777e66ad6 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-monitor</artifactId> diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 7b1be588e7..5ec653ee70 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-nosql</artifactId> diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 71a7d002e4..cab9f30701 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-osgi-alpn</artifactId> diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 9905190de8..0e44c1d9d7 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-osgi-boot-jsp</artifactId> diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index f26246f62e..80aa0f4053 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index c2dcea6a03..3bae565227 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-osgi-boot</artifactId> diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index b4240dcdc9..bfa8944d77 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-httpservice</artifactId> diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 9984754f64..f030614a85 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 787f33b344..4021587027 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-jetty-osgi-context</artifactId> diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 93b022a1e5..4334b7bd1c 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4dbb0398d7..b89eb649ff 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index a470764e6c..101255dc3a 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-plus</artifactId> diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index e8b65b11a9..028ea44ec2 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-proxy</artifactId> diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 5cf47c97ce..05745a4a46 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jetty</groupId> diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 50a6a7febd..3c90c67a11 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-rewrite</artifactId> diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 63bcbb88e2..d8bdf093b8 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-runner</artifactId> diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index ae58c00078..0bb5573bc2 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-security</artifactId> diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index aaa3ac13be..24535cc953 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-server</artifactId> diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index ebdcdf734e..693988b6a4 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-servlet</artifactId> diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9697084606..5f30ba5313 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-servlets</artifactId> diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 681e37c2b9..69d21c8a9e 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-spring</artifactId> diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 57cf112b39..acc6fd204d 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-start</artifactId> diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 5165b935bb..e07ebf78b3 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-util-ajax</artifactId> diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index e226b0126e..5e420bf7d5 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-util</artifactId> diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 60df7c0496..f2d9c2f576 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-webapp</artifactId> diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java index 8a2c54ebd3..5ee01be945 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java @@ -146,6 +146,10 @@ public interface Ordering @Override public List<Resource> order(List<Resource> jars) { + _beforeOthers.clear(); + _afterOthers.clear(); + _noOthers.clear(); + //for each jar, put it into the ordering according to the fragment ordering for (Resource jar:jars) { @@ -157,17 +161,17 @@ public interface Ordering { case None: { - ((RelativeOrdering)_metaData.getOrdering()).addNoOthers(jar); + addNoOthers(jar); break; } case Before: { - ((RelativeOrdering)_metaData.getOrdering()).addBeforeOthers(jar); + addBeforeOthers(jar); break; } case After: { - ((RelativeOrdering)_metaData.getOrdering()).addAfterOthers(jar); + addAfterOthers(jar); break; } } @@ -175,7 +179,7 @@ public interface Ordering else { //jar fragment has no descriptor, but there is a relative ordering in place, so it must be part of the others - ((RelativeOrdering)_metaData.getOrdering()).addNoOthers(jar); + addNoOthers(jar); } } diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java index 0f5829c9a3..7aca0ead12 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java @@ -18,6 +18,7 @@ package org.eclipse.jetty.webapp; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -505,6 +506,22 @@ public class OrderingTest } @Test + public void testOrderFragments() throws Exception + { + final MetaData metadata = new MetaData(); + final Resource jarResource = new TestResource("A"); + + metadata.setOrdering(new Ordering.RelativeOrdering(metadata)); + metadata.addWebInfJar(jarResource); + metadata.orderFragments(); + assertEquals(1, metadata.getOrderedWebInfJars().size()); + metadata.orderFragments(); + assertEquals(1, metadata.getOrderedWebInfJars().size()); + } + + + + @Test public void testCircular1 () throws Exception { diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml index 705b2276e6..f86be3dfa6 100644 --- a/jetty-websocket/javax-websocket-client-impl/pom.xml +++ b/jetty-websocket/javax-websocket-client-impl/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index 080e5313c2..de4cfd3c01 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 519995e9b4..9cee3dd922 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 1096c6fd5d..31641806ee 100644 --- a/jetty-websocket/websocket-api/pom.xml +++ b/jetty-websocket/websocket-api/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 6e6a0889f0..ee4d09306b 100644 --- a/jetty-websocket/websocket-client/pom.xml +++ b/jetty-websocket/websocket-client/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java index 310980c8e2..dbe4faee41 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java @@ -315,6 +315,7 @@ public class UpgradeConnection extends AbstractConnection implements Connection. SessionFactory sessionFactory = connectPromise.getClient().getSessionFactory(); WebSocketSession session = sessionFactory.createSession(request.getRequestURI(),websocket,connection); session.setPolicy(policy); + session.setUpgradeRequest(request); session.setUpgradeResponse(response); connection.addListener(session); connectPromise.setSession(session); diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java index 606b5b9dcf..6f4110ef51 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.websocket.client; import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.io.IOException; import java.net.ConnectException; @@ -111,6 +112,25 @@ public class ClientConnectTest } @Test + public void testUpgradeRequest() throws Exception + { + JettyTrackingSocket wsocket = new JettyTrackingSocket(); + + URI wsUri = server.getWsUri(); + Future<Session> future = client.connect(wsocket,wsUri); + + IBlockheadServerConnection connection = server.accept(); + connection.upgrade(); + + Session sess = future.get(500,TimeUnit.MILLISECONDS); + + sess.close(); + + assertThat("Connect.UpgradeRequest", wsocket.connectUpgradeRequest, notNullValue()); + assertThat("Connect.UpgradeResponse", wsocket.connectUpgradeResponse, notNullValue()); + } + + @Test public void testBadHandshake() throws Exception { JettyTrackingSocket wsocket = new JettyTrackingSocket(); diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/JettyTrackingSocket.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/JettyTrackingSocket.java index cbb5e59786..bb14d87be2 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/JettyTrackingSocket.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/JettyTrackingSocket.java @@ -30,6 +30,8 @@ import org.eclipse.jetty.toolchain.test.EventQueue; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.UpgradeRequest; +import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.api.WebSocketAdapter; import org.junit.Assert; @@ -42,6 +44,8 @@ public class JettyTrackingSocket extends WebSocketAdapter public int closeCode = -1; public Exchanger<String> messageExchanger; + public UpgradeRequest connectUpgradeRequest; + public UpgradeResponse connectUpgradeResponse; public StringBuilder closeMessage = new StringBuilder(); public CountDownLatch openLatch = new CountDownLatch(1); public CountDownLatch closeLatch = new CountDownLatch(1); @@ -124,6 +128,8 @@ public class JettyTrackingSocket extends WebSocketAdapter public void onWebSocketConnect(Session session) { super.onWebSocketConnect(session); + connectUpgradeRequest = session.getUpgradeRequest(); + connectUpgradeResponse = session.getUpgradeResponse(); openLatch.countDown(); } diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index ab69ef254f..c595e69d23 100644 --- a/jetty-websocket/websocket-common/pom.xml +++ b/jetty-websocket/websocket-common/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index d55ef0aefd..393c034b8b 100644 --- a/jetty-websocket/websocket-server/pom.xml +++ b/jetty-websocket/websocket-server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ManyConnectionsCleanupTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ManyConnectionsCleanupTest.java index 03a8a7602c..2950c73b60 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ManyConnectionsCleanupTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ManyConnectionsCleanupTest.java @@ -51,11 +51,13 @@ import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** * Tests various close scenarios that should result in Open Session cleanup */ +@Ignore public class ManyConnectionsCleanupTest { static class AbstractCloseSocket extends WebSocketAdapter diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index c5062c1138..be46d6ea0f 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index a067e6e81a..4f9f5b9d48 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-xml</artifactId> @@ -6,7 +6,7 @@ <version>25</version> </parent> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <name>Jetty :: Project</name> <url>http://www.eclipse.org/jetty</url> <packaging>pom</packaging> @@ -17,7 +17,7 @@ <slf4j-version>1.6.6</slf4j-version> <jetty-test-policy-version>1.2</jetty-test-policy-version> <alpn.api.version>1.1.2.v20150522</alpn.api.version> - <jsp.version>8.0.23.M1</jsp.version> + <jsp.version>8.0.27</jsp.version> <!-- default values are unsupported, but required to be defined for reactor sanity reasons --> <alpn.version>undefined</alpn.version> </properties> diff --git a/tests/pom.xml b/tests/pom.xml index 49f5d165f4..826ed2c9a9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.jetty.tests</groupId> diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index dcd4e25120..c061ce6c13 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 5913b35443..4f747c19ac 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 70bcf5437a..3f957f9921 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration</artifactId> diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 56a2d61a36..cf4abd25b2 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-jmx-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jmx-webapp-it</artifactId> diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 5437e4f15d..981c3144ee 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-jmx-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>jmx-webapp</artifactId> <packaging>war</packaging> diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 6b1a2083ca..3bca95166a 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-jmx-parent</artifactId> diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 52c25d44d1..88eba5ed15 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-loginservice</artifactId> <name>Jetty Tests :: Login Service</name> diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 370c2d1309..9904363b65 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 2853eec205..23fed9a0b4 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-sessions-parent</artifactId> <name>Jetty Tests :: Sessions :: Parent</name> diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 46aba7ca3a..0152a52385 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-hash-sessions</artifactId> <name>Jetty Tests :: Sessions :: Hash</name> diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 10e0b758c2..2fef32d14c 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-infinispan-sessions</artifactId> <name>Jetty Tests :: Sessions :: Infinispan</name> diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index f32fe6d175..79136f6779 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-jdbc-sessions</artifactId> <name>Jetty Tests :: Sessions :: JDBC</name> diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 5702acdbe7..a6a979fcad 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-mongodb-sessions</artifactId> <name>Jetty Tests :: Sessions :: Mongo</name> diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index b26f873647..b369f685e1 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-sessions-common</artifactId> <name>Jetty Tests :: Sessions :: Common</name> diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 0736706de1..429f8b0ba8 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>test-webapps-parent</artifactId> diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 197f94c27c..6af435fe45 100644 --- a/tests/test-webapps/test-jaas-webapp/pom.xml +++ b/tests/test-webapps/test-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-jaas-webapp</artifactId> <name>Jetty Tests :: WebApp :: JAAS</name> diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index de3071d50b..12103139d6 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml index 8694731900..c33739a573 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/tests/test-webapps/test-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-jndi-webapp</artifactId> <name>Jetty Tests :: WebApp :: JNDI</name> diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index 8c16bcb4f4..e3fa2f5b3b 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <name>Jetty Tests :: WebApp :: Mock Resources</name> <artifactId>test-mock-resources</artifactId> diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 6ed0d03ca5..a852e0ee2f 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tests/test-webapps/test-servlet-spec/pom.xml b/tests/test-webapps/test-servlet-spec/pom.xml index 9cb0aea888..c21592a54d 100644 --- a/tests/test-webapps/test-servlet-spec/pom.xml +++ b/tests/test-webapps/test-servlet-spec/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-servlet-spec-parent</artifactId> <name>Jetty Tests :: Spec Test WebApp :: Parent</name> diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml index 18bbd9d88a..9db6855e03 100644 --- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-servlet-spec-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-container-initializer</artifactId> <packaging>jar</packaging> diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml index 05c6927995..fdc35c0eda 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-servlet-spec-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <name>Jetty Tests :: Webapps :: Spec Webapp</name> <artifactId>test-spec-webapp</artifactId> diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index b7b9008e4c..4582d98551 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-servlet-spec-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <name>Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar</name> <groupId>org.eclipse.jetty.tests</groupId> diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index c26b5d92b6..ad0d485c83 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>9.3.4-SNAPSHOT</version> + <version>9.3.5-SNAPSHOT</version> </parent> <artifactId>test-webapp-rfc2616</artifactId> <name>Jetty Tests :: WebApp :: RFC2616</name> |