infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-18 23:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8171443: (spec) An ALPN callback function may also ignore ALPN

Browse Source 
Reviewed-by: xuelei, wetmore
This commit is contained in:
Vinnie Ryan 2016-12-22 17:15:33 +00:00
parent 3312369cf5
commit 7c3de194b5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java
View File

@ -1338,7 +1338,7 @@ public abstract class SSLEngine {
/**
* Registers a callback function that selects an application protocol
* value for a SSL/TLS/DTLS handshake.
* The function overrides any values set using
* The function overrides any values supplied using
* {@link SSLParameters#setApplicationProtocols
* SSLParameters.setApplicationProtocols} and it supports the following
* type parameters:
@ -1354,6 +1354,8 @@ public abstract class SSLEngine {
* <dt> {@code String}
* <dd> The function's result is an application protocol name, or null to
* indicate that none of the advertised names are acceptable.
* If the return value is an empty {@code String} then application
* protocol indications will not be used.
* If the return value is null (no value chosen) or is a value that
* was not advertised by the peer, the underlying protocol will
* determine what action to take. (For example, ALPN will send a

4
jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
View File

@ -749,7 +749,7 @@ public abstract class SSLSocket extends Socket
/**
* Registers a callback function that selects an application protocol
* value for a SSL/TLS/DTLS handshake.
* The function overrides any values set using
* The function overrides any values supplied using
* {@link SSLParameters#setApplicationProtocols
* SSLParameters.setApplicationProtocols} and it supports the following
* type parameters:
@ -765,6 +765,8 @@ public abstract class SSLSocket extends Socket
* <dt> {@code String}
* <dd> The function's result is an application protocol name, or null to
* indicate that none of the advertised names are acceptable.
* If the return value is an empty {@code String} then application
* protocol indications will not be used.
* If the return value is null (no value chosen) or is a value that
* was not advertised by the peer, the underlying protocol will
* determine what action to take. (For example, ALPN will send a