aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-06-12 08:31:19 +0200
committerIngela Anderton Andin <[email protected]>2019-06-12 08:31:19 +0200
commit4adcdcf3f60995657f03aa98e3ba268e59da54c1 (patch)
treee1d58d994919faa4904d3d2bb12dd5cf6397d242
parent8ff68249905b367b4b7179aa4c600511bfec5b87 (diff)
parent3faa598e44f95db1521102cebe2bc862ec46083b (diff)
downloadotp-4adcdcf3f60995657f03aa98e3ba268e59da54c1.tar.gz
otp-4adcdcf3f60995657f03aa98e3ba268e59da54c1.tar.bz2
otp-4adcdcf3f60995657f03aa98e3ba268e59da54c1.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 1e36a0591b..20b1e85ceb 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1913,7 +1913,7 @@ validate_option(Opt, Value) ->
throw({error, {options, {Opt, Value}}}).
handle_cb_info({V1, V2, V3, V4}, {_,_,_,_,_}) ->
- {V1,V2,V3,V4, list_to_atom(atom_to_list(V2) ++ "passive")};
+ {V1,V2,V3,V4, list_to_atom(atom_to_list(V2) ++ "_passive")};
handle_cb_info(CbInfo, _) ->
CbInfo.