aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-05-16 09:46:10 +0200
committerMicael Karlberg <[email protected]>2011-05-16 09:46:10 +0200
commitb19a2c6648e65b5ad1b8a0351928856fad941f99 (patch)
tree60c75bda36560b1e4a3422c349f3f95bfe337a6e /lib/ssl/src/ssl.erl
parent37210d94cf9f1cfa20654103d76039a2d453bc7c (diff)
parent8c9edd9c00142d0622beb74ef852c79871a631a6 (diff)
downloadotp-b19a2c6648e65b5ad1b8a0351928856fad941f99.tar.gz
otp-b19a2c6648e65b5ad1b8a0351928856fad941f99.tar.bz2
otp-b19a2c6648e65b5ad1b8a0351928856fad941f99.zip
OTP-9094: [httpc] Add support for upload body streaming (PUT and POST).
Filipe David Manana OTP-9114: [ftp] Added (type) spec for all exported functions. OTP-9123: mod_esi:deliver/2 made to accept binary data. Bernard Duggan OTP-9124: [httpd] Prevent XSS in error pages. Michael Santos OTP-9131: [httpd] Wrong security property names used in documentation. Garrett Smith OTP-9157: [httpd] Improved error messages. Ricardo Catalinas Jim�nez OTP-9158: [httpd] Fix timeout message generated by mod_esi. Bernard Duggan OTP-9202: [httpd] Extended support for file descriptors. Attila Rajmund Nohl OTP-9230: The default ssl kind has now been changed to essl. OTP-9246: [httpc] httpc manager crash because of a handler retry race condition. Merge branch 'bmk/inets/inet56_integration' into dev
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r--lib/ssl/src/ssl.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 380c59b058..0ced6707eb 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -611,8 +611,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) ->