diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-09-27 10:38:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-09-27 10:38:08 +0200 |
| commit | 3ea4a5934c104aada07a8c971c0a2fd74d1e26f8 (patch) | |
| tree | d683ded0ccb33525808617a55e737bdee6b79607 /lib/ssl/src/ssl_internal.hrl | |
| parent | 69bf3ed7ca0545fa350b3b95b650d79de59b85cd (diff) | |
| parent | f421eabde4f5cbb0d4c718f2f07628626ab69c6a (diff) | |
| download | otp-3ea4a5934c104aada07a8c971c0a2fd74d1e26f8.tar.gz otp-3ea4a5934c104aada07a8c971c0a2fd74d1e26f8.tar.bz2 otp-3ea4a5934c104aada07a8c971c0a2fd74d1e26f8.zip | |
Merge branch 'ia/ssl/npn/OTP-10361'
* ia/ssl/npn/OTP-10361:
ssl: Shorten test case names to workaround ct shortcomings on windows
ssl: SSL 3.0 does not support next protocol negotiation
ssl: Dialyzer fixes and code cleaning
ssl: Changed default behaviour of next protocol negotiation to make more "sense" (be true to the specification).
ssl: Update SSL docs for SSL Next Protocol Support
ssl: Support for SSL Next Protocol Negotiation * http://technotes.googlecode.com/git/nextprotoneg.html
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index b8f2ae3b51..a5db2dcee7 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -106,7 +106,9 @@ % after which ssl_connection will % go into hibernation %% This option should only be set to true by inet_tls_dist - erl_dist = false + erl_dist = false, + next_protocols_advertised = undefined, %% [binary()], + next_protocol_selector = undefined %% fun([binary()]) -> binary()) }). -record(socket_options, |