Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Joakim Erdfelt 2018-02-08 09:22:35 -06:00
commit 06e1252a6f
2 changed files with 4 additions and 1 deletions

View File

@ -171,6 +171,9 @@ jetty-9.4.7.v20170914 - 14 September 2017
+ 475546 ClosedChannelException when connection to HTTPS over HTTP proxy with
CONNECT
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

View File

@ -67,7 +67,7 @@ public class JettyHttpServerProvider extends HttpServerProvider
JettyHttpServer jettyHttpServer = new JettyHttpServer(server, shared);
if (addr != null)
jettyHttpServer.bind(addr, backlog);
jettyHttpServer.bind(addr, backlog);
return jettyHttpServer;
}