Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

VERSION.txt

@@ -99,6 +99,17 @@ jetty-9.3.25.v20180904 - 04 September 2018
  + 2860 Leakage of HttpDestinations in HttpClient
  + 2871 Server reads -1 after client resets HTTP/2 stream
 
+jetty-9.2.26.v20180806 - 06 August 2018
+ + 2777 Workaround for Conscrypt's ssl == null
+
+jetty-9.2.25.v20180606 - 06 June 2018
+ + 2114 Fix NPE in JettyHttpServerProvider
+ + 2135 Android 8.1 needs direct buffers for SSL/TLS to work
+ + 2529 HttpParser cleanup
+ + 2603 WebSocket ByteAccumulator initialized with wrong maximum
+ + 2604 WebSocket ByteAccumulator should report sizes in
+   MessageTooLargeException
+
 jetty-9.4.11.v20180605 - 05 June 2018
  + 1785 Support for vhost@connectorname syntax of virtual hosts
  + 2346 Revert stack trace logging for HTTPChannel.onException

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Selects an ALPN (Application Layer Protocol Negotiation) implementation by java version.
-
-[depend]
-alpn-impl/alpn-${java.version.platform}

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod

@@ -5,7 +5,7 @@ Enables the ALPN (Application Layer Protocol Negotiation) TLS extension.
 
 [depend]
 ssl
-alpn-impl
+alpn-impl/alpn-${java.version.platform}
 
 [lib]
 lib/jetty-alpn-client-${jetty.version}.jar