Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #7266 - preserve old runtime.feature.alpn property 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2021-12-14 12:50:31 +11:00
parent 65f135cf1a
commit 28b0128500
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-16.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

2
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
View File

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

3
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -1502,7 +1502,8 @@ public class StartArgs
properties.setProperty("java.version.micro", Integer.toString(ver.getMicro()), "Deprecated"); properties.setProperty("java.version.micro", Integer.toString(ver.getMicro()), "Deprecated");
// ALPN feature exists // ALPN feature exists
properties.setProperty("runtime.feature.alpn", Boolean.toString(ver.getPlatform() >= 9), source); properties.setProperty("runtime.feature.alpn", Boolean.toString(isMethodAvailable(javax.net.ssl.SSLParameters.class, "getApplicationProtocols", null)), source);
properties.setProperty("at.least.java9", Boolean.toString(ver.getPlatform() >= 9), source);
} }
catch (Throwable x) catch (Throwable x)
{ {