diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:31:47 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:31:47 +0200 |
| commit | cefaaa6eddafbd3fd418eec5551819a82935e3b3 (patch) | |
| tree | 36990f0931083fb6703bc97706b47b264bb2f388 /lib/ssl/src/tls.erl | |
| parent | 7fcb9c4b3df1ec2edfdb187635ea8dcd856dc65d (diff) | |
| parent | fa5cc308af8c073832cc7b58dd52fa2f523582cc (diff) | |
| download | otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.gz otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.bz2 otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls.erl')
| -rw-r--r-- | lib/ssl/src/tls.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/src/tls.erl b/lib/ssl/src/tls.erl index bb02695c12..b220a48f73 100644 --- a/lib/ssl/src/tls.erl +++ b/lib/ssl/src/tls.erl @@ -663,7 +663,8 @@ handle_options(Opts0, _Role) -> handle_option(next_protocols_advertised, Opts, undefined), next_protocol_selector = make_next_protocol_selector( - handle_option(client_preferred_next_protocols, Opts, undefined)) + handle_option(client_preferred_next_protocols, Opts, undefined)), + log_alert = handle_option(log_alert, Opts, true) }, CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}), @@ -675,7 +676,7 @@ handle_options(Opts0, _Role) -> reuse_session, reuse_sessions, ssl_imp, cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist, next_protocols_advertised, - client_preferred_next_protocols], + client_preferred_next_protocols, log_alert], SockOpts = lists:foldl(fun(Key, PropList) -> proplists:delete(Key, PropList) @@ -840,6 +841,9 @@ validate_option(client_preferred_next_protocols = Opt, {Precedence, PreferredPro validate_option(client_preferred_next_protocols, undefined) -> undefined; +validate_option(log_alert, Value) when Value == true; + Value == false -> + Value; validate_option(next_protocols_advertised = Opt, Value) when is_list(Value) -> case tls_record:highest_protocol_version([]) of {3,0} -> |