aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-05-21 09:00:10 +0200
committerIngela Anderton Andin <[email protected]>2018-05-21 09:00:10 +0200
commitf03603762806ac96cdca4a2c4f3b2b8b3190741a (patch)
tree547e672466c2f64d6ae704c52649524ca877945f /lib/stdlib
parente3bc55fb1e768cd30140a769507b50bddf3cb6ca (diff)
parent7a718717d8b2b5eb055ec3c307da073496f20f26 (diff)
downloadotp-f03603762806ac96cdca4a2c4f3b2b8b3190741a.tar.gz
otp-f03603762806ac96cdca4a2c4f3b2b8b3190741a.tar.bz2
otp-f03603762806ac96cdca4a2c4f3b2b8b3190741a.zip
Merge remote-tracking branch 'origin/ingela/ssl/deprecate-ssl-accept/OTP-15056'
* origin/ingela/ssl/deprecate-ssl-accept/OTP-15056: ssl: Deprecate ssl:ssl_accept/[1,2,3]
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/otp_internal.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index a17addcc42..ceec3079a1 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -612,6 +612,15 @@ obsolete_1(erlang, get_stacktrace, 0) ->
obsolete_1(erlang, hash, 2) ->
{removed, {erlang, phash2, 2}, "20.0"};
+%% Add in OTP 21.
+
+obsolete_1(ssl, ssl_accept, 1) ->
+ {deprecated, "deprecated; use ssl:handshake/1 instead"};
+obsolete_1(ssl, ssl_accept, 2) ->
+ {deprecated, "deprecated; use ssl:handshake/2 instead"};
+obsolete_1(ssl, ssl_accept, 3) ->
+ {deprecated, "deprecated; use ssl:handshake/3 instead"};
+
%% not obsolete
obsolete_1(_, _, _) ->