Merge branch '3.5.x'

Closes gh-46770
This commit is contained in:
Stéphane Nicoll 2025-08-11 11:14:27 +02:00
commit 759b8b11f7
1 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@ public interface SslOptions {
}
/**
* Return the ciphers that can be used or an empty set. The cipher names in this set
* Return the ciphers that can be used or {@code null}. The cipher names in this set
* should be compatible with those supported by
* {@link SSLEngine#getSupportedCipherSuites()}.
* @return the ciphers that can be used or {@code null}
@ -59,7 +59,7 @@ public interface SslOptions {
String @Nullable [] getCiphers();
/**
* Return the protocols that should be enabled or an empty set. The protocols names in
* Return the protocols that should be enabled or {@code null}. The protocols names in
* this set should be compatible with those supported by
* {@link SSLEngine#getSupportedProtocols()}.
* @return the protocols to enable or {@code null}