diff --git a/VERSION.txt b/VERSION.txt index 0f1ed9a5ef3..5050bd7e022 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,8 @@ jetty-9.3.23-SNAPSHOT +jetty-9.2.24.v20180105 - 05 January 2018 + + 2065 Backport #347 to Jetty 9.2.x + jetty-9.2.23.v20171218 - 18 December 2017 + 1556 Remove a timing channel in Password matching + 1685 Update ALPN support for Java 8u141 diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java index 2232bab091e..82575efa6c2 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java @@ -18,6 +18,10 @@ package org.eclipse.jetty.http.spi; +import com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsServer; +import com.sun.net.httpserver.spi.HttpServerProvider; + import java.io.IOException; import java.net.InetSocketAddress; @@ -29,10 +33,6 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ThreadPool; -import com.sun.net.httpserver.HttpServer; -import com.sun.net.httpserver.HttpsServer; -import com.sun.net.httpserver.spi.HttpServerProvider; - /** * Jetty implementation of Java HTTP Server SPI */ @@ -66,7 +66,8 @@ public class JettyHttpServerProvider extends HttpServerProvider } JettyHttpServer jettyHttpServer = new JettyHttpServer(server, shared); - jettyHttpServer.bind(addr, backlog); + if (addr != null) + jettyHttpServer.bind(addr, backlog); return jettyHttpServer; }