diff options
author | Erlang/OTP <otp@erlang.org> | 2014-02-05 13:56:18 +0100 |
---|---|---|
committer | Erlang/OTP <otp@erlang.org> | 2014-02-05 13:56:18 +0100 |
commit | 5f30912275c02e06de2a03e5b03c64b919c5a048 (patch) | |
tree | b8a716cc5cbf9f68d6a7a6a71cd57d7ff7a4c2d8 /lib/inets/src/http_server/httpd_log.erl | |
parent | 28eb7e0a25aed6153433ab3e93f023b194d0d858 (diff) | |
parent | 6a6653e1fa03d105fa66da54f7291dd592e6f203 (diff) | |
download | erlang-5f30912275c02e06de2a03e5b03c64b919c5a048.tar.gz |
Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15
* refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits)
Changed to correct errorcode in testcase
inets: Prepare for release
inets: Make test suites independent of each other
inets: Rewrite of test case to avoid timing issues in test code
Add missing brackets to report formatting on ftp_progress process exit
inets: Remove log message as it causes more harm than use at the moment
inets: Mend broken max_clients check
inets: Start CT'ify httpd_SUITE
inets: Remove use of default gen_server timeout
Fix http_request:http_headers/1 to send content-length when length is zero
Fix httpd config option 'keep_alive_timeout'
Fix httpd config option 'script_timeout'
inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
inets: Add crypto start check to ssl test cases
ftp: fix sockname dialyzer warning including ftp:sockname/1 bug
ftp,ssl: Fixes broken type link (ssloption).
ftp: Adds dynamic cert generation to tests.
ftp: Clean Makefile and conf file
ftp: Linking rfc-refs.
ftp: Add documentation.
...
Diffstat (limited to 'lib/inets/src/http_server/httpd_log.erl')
-rw-r--r-- | lib/inets/src/http_server/httpd_log.erl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl index a34435e0e8..693a681fd4 100644 --- a/lib/inets/src/http_server/httpd_log.erl +++ b/lib/inets/src/http_server/httpd_log.erl @@ -39,14 +39,21 @@ Size :: 0 | pos_integer() | string()) -> {Log :: atom() | pid(), Entry :: string()} | term() . -access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, SizeStr) - when is_list(SizeStr) -> +%% Somethime the size in the form of the content_length is put here, which +%% is actually in the form of a string +%% So it can either be the size as an integer, the size as a string +%% or, worst case scenario, bytes. +access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, + SizeStrOrBytes) + when is_list(SizeStrOrBytes) -> Size = - case (catch list_to_integer(SizeStr)) of + case (catch list_to_integer(SizeStrOrBytes)) of I when is_integer(I) -> + %% This is from using the content_length (which is a string) I; _ -> - SizeStr % This is better then nothing + %% This is better than nothing + httpd_util:flatlength(SizeStrOrBytes) end, access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, Size); access_entry(Log, NoLog, |