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

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.