diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:21:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-05 09:21:52 +0100 |
| commit | ccbf6811b1e0379df30e35bd6265f9221632732c (patch) | |
| tree | ad1439f0720651c794935f1abb877faff5a7750c /lib/ssl/src/ssl_internal.hrl | |
| parent | ac82610a03c8b17b6bcae91aa4252a1930c51e85 (diff) | |
| parent | 549785976441514377e1da14c5c1e7fb289456e0 (diff) | |
| download | otp-ccbf6811b1e0379df30e35bd6265f9221632732c.tar.gz otp-ccbf6811b1e0379df30e35bd6265f9221632732c.tar.bz2 otp-ccbf6811b1e0379df30e35bd6265f9221632732c.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_cipher.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 3cf6020169..560e24f5ce 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -121,7 +121,8 @@ %% Should the server prefer its own cipher order over the one provided by %% the client? honor_cipher_order = false, - padding_check = true + padding_check = true, + fallback = false }). -record(socket_options, |