diff options
author | Ingela Anderton Andin <[email protected]> | 2015-06-10 14:11:14 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-06-16 09:45:02 +0200 |
commit | 77d02ff81a4b7c0ea5f26b4e83097902556bef83 (patch) | |
tree | 05d90213f216662e9b2912568c93ee63d1f3b7da /lib/inets/src/http_server/mod_alias.erl | |
parent | d30b4ad1fac539b028fb8067caa6ff9c0cfbf004 (diff) | |
download | otp-77d02ff81a4b7c0ea5f26b4e83097902556bef83.tar.gz otp-77d02ff81a4b7c0ea5f26b4e83097902556bef83.tar.bz2 otp-77d02ff81a4b7c0ea5f26b4e83097902556bef83.zip |
inets: Remove use of httpd_conf:clean/1 and httpd_conf:custom_clean/3
Internal use of the function white_space_clean/1 could probably be done
in a much better way using re-module and removing a lot of legacy code.
But we will have to do this later, due to lack of time, we want to make
this commit as little work as possible.
Diffstat (limited to 'lib/inets/src/http_server/mod_alias.erl')
-rw-r--r-- | lib/inets/src/http_server/mod_alias.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl index 5039cd56b5..e0d34288cd 100644 --- a/lib/inets/src/http_server/mod_alias.erl +++ b/lib/inets/src/http_server/mod_alias.erl @@ -212,7 +212,7 @@ load("Alias " ++ Alias, []) -> {ok, [FakeName, RealName]} -> {ok,[],{alias,{FakeName,RealName}}}; {ok, _} -> - {error,?NICE(httpd_conf:clean(Alias)++" is an invalid Alias")} + {error,?NICE(string:strip(Alias)++" is an invalid Alias")} end; load("ReWrite " ++ Rule, Acc) -> load_re_write(Rule, Acc, "ReWrite", re_write); @@ -223,7 +223,7 @@ load("ScriptAlias " ++ ScriptAlias, []) -> RealName1 = filename:join(filename:split(RealName)), {ok, [], {script_alias, {FakeName, RealName1++"/"}}}; {ok, _} -> - {error, ?NICE(httpd_conf:clean(ScriptAlias)++ + {error, ?NICE(string:strip(ScriptAlias)++ " is an invalid ScriptAlias")} end; load("ScriptReWrite " ++ Rule, Acc) -> @@ -234,7 +234,7 @@ load_re_write(Rule0, Acc, Type, Tag) -> fun ($\s) -> true; ($\t) -> true; (_) -> false end, Rule0) of "" -> - {error, ?NICE(httpd_conf:clean(Rule0)++" is an invalid "++Type)}; + {error, ?NICE(string:strip(Rule0)++" is an invalid "++Type)}; Rule -> case string:chr(Rule, $\s) of 0 -> |