aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server/mod_htaccess.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-16 09:51:46 +0200
committerIngela Anderton Andin <[email protected]>2015-06-16 09:51:46 +0200
commit35f3fe1ef8827d423aabf5e5438626a2c50bad4d (patch)
tree8deebe9fc42cf546a5c782093e043a51b9e3ed40 /lib/inets/src/http_server/mod_htaccess.erl
parentd57bf76c50e5193312babc39ea5324e9f549a4b8 (diff)
parentcdadd193deb6e46c5a244b5fc3aabc3a89f92055 (diff)
downloadotp-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_htaccess.erl')
-rw-r--r--lib/inets/src/http_server/mod_htaccess.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/mod_htaccess.erl b/lib/inets/src/http_server/mod_htaccess.erl
index e1f66d01c8..d526fbe156 100644
--- a/lib/inets/src/http_server/mod_htaccess.erl
+++ b/lib/inets/src/http_server/mod_htaccess.erl
@@ -34,7 +34,7 @@
% Names on accessfiles
%----------------------------------------------------------------------
load("AccessFileName" ++ FileNames, _Context)->
- CleanFileNames=httpd_conf:clean(FileNames),
+ CleanFileNames=string:strip(FileNames),
{ok,[],{access_files,string:tokens(CleanFileNames," ")}}.
store({access_files, Files} = Conf, _) when is_list(Files)->