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_actions.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_actions.erl')
| -rw-r--r-- | lib/inets/src/http_server/mod_actions.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/mod_actions.erl b/lib/inets/src/http_server/mod_actions.erl index c3946ff9b4..e493ddbf93 100644 --- a/lib/inets/src/http_server/mod_actions.erl +++ b/lib/inets/src/http_server/mod_actions.erl @@ -84,14 +84,14 @@ load("Action "++ Action, []) -> {ok,[MimeType, CGIScript]} -> {ok,[],{action, {MimeType, CGIScript}}}; {ok,_} -> - {error,?NICE(httpd_conf:clean(Action)++" is an invalid Action")} + {error,?NICE(string:strip(Action)++" is an invalid Action")} end; load("Script " ++ Script,[]) -> case inets_regexp:split(Script, " ") of {ok,[Method, CGIScript]} -> {ok,[],{script, {Method, CGIScript}}}; {ok,_} -> - {error,?NICE(httpd_conf:clean(Script)++" is an invalid Script")} + {error,?NICE(string:strip(Script)++" is an invalid Script")} end. store({action, {MimeType, CGIScript}} = Conf, _) when is_list(MimeType), |