diff options
| author | Péter Dimitrov <peterdmv@erlang.org> | 2019-09-12 15:54:43 +0200 |
|---|---|---|
| committer | Péter Dimitrov <peterdmv@erlang.org> | 2019-09-12 15:54:43 +0200 |
| commit | f879b3390893cc4e6c8fa2b518363dda38f5cd4d (patch) | |
| tree | ddbcee4dd175e56ce49eb7c30d3447823fb9da6b | |
| parent | f1da650ed1b01c0d997e4fe932510658227829e1 (diff) | |
| parent | ff20c7611aaeb389a4b8310917d2e31d9e13e33f (diff) | |
| download | erlang-f879b3390893cc4e6c8fa2b518363dda38f5cd4d.tar.gz | |
Merge branch 'peterdmv/ssl/fix-option-handling' into maint
* peterdmv/ssl/fix-option-handling:
ssl: Fix option handling
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index c6c94ee853..0d6501b5ee 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1609,7 +1609,9 @@ handle_options(Opts0, Role, Host) -> proplists:delete(Key, PropList) end, Opts, ?SSL_OPTIONS ++ [ssl_imp, %% TODO: remove ssl_imp - client_preferred_next_protocols]), %% next_protocol_selector + client_preferred_next_protocols, %% next_protocol_selector + log_alert, + cb_info]), {Sock, Emulated} = emulated_options(Protocol, SockOpts), ConnetionCb = connection_cb(Opts), |