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_alias.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_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 -> |