aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-16 09:51:46 +0200
committerIngela Anderton Andin <[email protected]>2015-06-16 09:51:46 +0200
commit35f3fe1ef8827d423aabf5e5438626a2c50bad4d (patch)
tree8deebe9fc42cf546a5c782093e043a51b9e3ed40 /lib/stdlib/src
parentd57bf76c50e5193312babc39ea5324e9f549a4b8 (diff)
parentcdadd193deb6e46c5a244b5fc3aabc3a89f92055 (diff)
downloadotp-35f3fe1ef8827d423aabf5e5438626a2c50bad4d.tar.gz
otp-35f3fe1ef8827d423aabf5e5438626a2c50bad4d.tar.bz2
otp-35f3fe1ef8827d423aabf5e5438626a2c50bad4d.zip
Merge branch 'ia/inets/deprecate'
* ia/inets/deprecate: inets: Fix race condition in httpc inets: Remove use of httpd_conf:clean/1 and httpd_conf:custom_clean/3 inets: Remove use of httpd_conf:make_integer/1 inets: Deprecate functions in util module httpd_conf.erl
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/otp_internal.erl13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 0340015c35..62807e2e54 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -634,6 +634,19 @@ obsolete_1(ssl, negotiated_next_protocol, 1) ->
obsolete_1(ssl, connection_info, 1) ->
{deprecated, "deprecated; use connection_information/[1,2] instead"};
+obsolete_1(httpd_conf, check_enum, 2) ->
+ {deprecated, "deprecated; use lists:member/2 instead"};
+obsolete_1(httpd_conf, clean, 1) ->
+ {deprecated, "deprecated; use sting:strip/1 instead or possible the re module"};
+obsolete_1(httpd_conf, custom_clean, 3) ->
+ {deprecated, "deprecated; use sting:strip/3 instead or possible the re module"};
+obsolete_1(httpd_conf, is_directory, 1) ->
+ {deprecated, "deprecated; use filelib:is_dir/1 instead"};
+obsolete_1(httpd_conf, is_file, 1) ->
+ {deprecated, "deprecated; use filelib:is_file/1 instead"};
+obsolete_1(httpd_conf, make_integer, 1) ->
+ {deprecated, "deprecated; use erlang:list_to_integer/1 instead"};
+
obsolete_1(_, _, _) ->
no.