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_log.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_log.erl')
| -rw-r--r-- | lib/inets/src/http_server/mod_log.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/mod_log.erl b/lib/inets/src/http_server/mod_log.erl index a912f5616c..2367d9cfeb 100644 --- a/lib/inets/src/http_server/mod_log.erl +++ b/lib/inets/src/http_server/mod_log.erl @@ -127,11 +127,11 @@ do(Info) -> %% Description: See httpd(3) ESWAPI CALLBACK FUNCTIONS %%------------------------------------------------------------------------- load("TransferLog " ++ TransferLog, []) -> - {ok,[],{transfer_log,httpd_conf:clean(TransferLog)}}; + {ok,[],{transfer_log,string:strip(TransferLog)}}; load("ErrorLog " ++ ErrorLog, []) -> - {ok,[],{error_log,httpd_conf:clean(ErrorLog)}}; + {ok,[],{error_log,string:strip(ErrorLog)}}; load("SecurityLog " ++ SecurityLog, []) -> - {ok, [], {security_log, httpd_conf:clean(SecurityLog)}}. + {ok, [], {security_log, string:strip(SecurityLog)}}. %%-------------------------------------------------------------------------- %% store(Directive, DirectiveList) -> {ok, NewDirective} | @@ -200,7 +200,7 @@ transfer_log(Info,RFC931,AuthUser,Date,StatusCode,Bytes) -> end. create_log(LogFile, ConfigList) -> - Filename = httpd_conf:clean(LogFile), + Filename = string:strip(LogFile), case filename:pathtype(Filename) of absolute -> case file:open(Filename, [read, write]) of |