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/mod_cgi.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/mod_cgi.erl')
-rw-r--r-- | lib/inets/src/http_server/mod_cgi.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl index d933b0a4ba..fbcfa78e5f 100644 --- a/lib/inets/src/http_server/mod_cgi.erl +++ b/lib/inets/src/http_server/mod_cgi.erl @@ -95,24 +95,24 @@ do(ModData) -> %% or cache %% load("ScriptNoCache " ++ CacheArg, [])-> - case catch list_to_atom(httpd_conf:clean(CacheArg)) of + case catch list_to_atom(string:strip(CacheArg)) of true -> {ok, [], {script_nocache, true}}; false -> {ok, [], {script_nocache, false}}; _ -> - {error, ?NICE(httpd_conf:clean(CacheArg)++ + {error, ?NICE(string:strip(CacheArg)++ " is an invalid ScriptNoCache directive")} end; %% ScriptTimeout Seconds, The number of seconds that the server %% maximum will wait for the script to %% generate a part of the document load("ScriptTimeout " ++ Timeout, [])-> - case catch list_to_integer(httpd_conf:clean(Timeout)) of + case catch list_to_integer(string:strip(Timeout)) of TimeoutSec when is_integer(TimeoutSec) -> {ok, [], {script_timeout,TimeoutSec*1000}}; _ -> - {error, ?NICE(httpd_conf:clean(Timeout)++ + {error, ?NICE(string:strip(Timeout)++ " is an invalid ScriptTimeout")} end. |