diff options
| author | Micael Karlberg <[email protected]> | 2011-05-12 14:06:12 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-05-12 14:06:12 +0200 |
| commit | d3d5b4fcf3e07c22e61c2c9a410d365178b12945 (patch) | |
| tree | cf516c356a47991f1f7f136e0306c9812e738fff /lib/ssl | |
| parent | 8a6b5ba7e038decf54e044656ef05ce9eec3c6dd (diff) | |
| download | otp-d3d5b4fcf3e07c22e61c2c9a410d365178b12945.tar.gz otp-d3d5b4fcf3e07c22e61c2c9a410d365178b12945.tar.bz2 otp-d3d5b4fcf3e07c22e61c2c9a410d365178b12945.zip | |
Calling gen_tcp:connect with option {ip, {127,0,0,1}} results in an exit with
reason badarg. Neither SSL nor INETS catches this, resulting in crashes
with incomprehensible reasons.
OTP-9289
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 4 insertions, 2 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) -> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 2f1edfa186..0e80e42637 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 4.1.4 +SSL_VSN = 4.1.5 |