diff options
| author | Micael Karlberg <[email protected]> | 2011-05-12 14:08:33 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-05-12 14:08:33 +0200 |
| commit | 9f1bd481611ad0ad9e4913b66adde474dafafa98 (patch) | |
| tree | cf516c356a47991f1f7f136e0306c9812e738fff /lib/ssl/src | |
| parent | 8a6b5ba7e038decf54e044656ef05ce9eec3c6dd (diff) | |
| parent | d3d5b4fcf3e07c22e61c2c9a410d365178b12945 (diff) | |
| download | otp-9f1bd481611ad0ad9e4913b66adde474dafafa98.tar.gz otp-9f1bd481611ad0ad9e4913b66adde474dafafa98.tar.bz2 otp-9f1bd481611ad0ad9e4913b66adde474dafafa98.zip | |
Merge branch 'bmk/catching_gen_tcp_badargs/OTP-9289' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/ssl/src')
| -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 7b1fda4cf9..38877ece7e 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -612,8 +612,10 @@ do_new_connect(Address, Port, catch exit:{function_clause, _} -> {error, {eoptions, {cb_info, CbInfo}}}; + exit:badarg -> + {error, {eoptions, {inet_options, UserOpts}}}; exit:{badarg, _} -> - {error,{eoptions, {inet_options, UserOpts}}} + {error, {eoptions, {inet_options, UserOpts}}} end. old_connect(Address, Port, Options, Timeout) -> |