diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-08 09:37:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-08 09:37:50 +0100 |
| commit | 88f654aa94e7a51681ad5774a0677bfa2fba77bd (patch) | |
| tree | 70dcaddaf422c25e41efe1b8df0cdc95df30152a /lib/ssl/src | |
| parent | 9bc4a096025254aed157e4753743be61ce1f7489 (diff) | |
| parent | 0ff4a42e31e4ef8d190e3be866315a774b590745 (diff) | |
| download | otp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.tar.gz otp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.tar.bz2 otp-88f654aa94e7a51681ad5774a0677bfa2fba77bd.zip | |
Merge branch 'ingela/ssl/no-automated-fallback/OTP-14789'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 0b035d31be..82f62b51b9 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -843,7 +843,7 @@ handle_options(Opts0, Role, Host) -> %% Server side option reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun), reuse_sessions = handle_option(reuse_sessions, Opts, true), - secure_renegotiate = handle_option(secure_renegotiate, Opts, false), + secure_renegotiate = handle_option(secure_renegotiate, Opts, true), client_renegotiation = handle_option(client_renegotiation, Opts, default_option_role(server, true, Role), server, Role), |