diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-16 09:51:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-16 09:51:46 +0200 |
| commit | 35f3fe1ef8827d423aabf5e5438626a2c50bad4d (patch) | |
| tree | 8deebe9fc42cf546a5c782093e043a51b9e3ed40 /lib/inets/src/http_server/httpd_example.erl | |
| parent | d57bf76c50e5193312babc39ea5324e9f549a4b8 (diff) | |
| parent | cdadd193deb6e46c5a244b5fc3aabc3a89f92055 (diff) | |
| download | otp-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/inets/src/http_server/httpd_example.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_example.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl index 6fc07f033c..b2c2ea7480 100644 --- a/lib/inets/src/http_server/httpd_example.erl +++ b/lib/inets/src/http_server/httpd_example.erl @@ -126,9 +126,7 @@ delay(Time) when is_integer(Time) -> i("httpd_example:delay(~p) -> done, now reply",[Time]), delay_reply("delay ok"); delay(Time) when is_list(Time) -> - delay(httpd_conf:make_integer(Time)); -delay({ok,Time}) when is_integer(Time) -> - delay(Time); + delay(list_to_integer(Time)); delay({error,_Reason}) -> i("delay -> called with invalid time"), delay_reply("delay failed: invalid delay time"). |