diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:38:13 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:38:13 +0200 |
| commit | 9f69634d0ca0a21b0c8bc9ad1ab4d836db652170 (patch) | |
| tree | ddb8ed247bf9778e9d30a73175139caa434035a1 /lib/inets | |
| parent | 44b5b4f81398a0d0f2fc190fd5a77be3c594c6a8 (diff) | |
| parent | 94f6c68ff4a46c69be0030aff553d6db92f29a35 (diff) | |
| download | otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.tar.gz otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.tar.bz2 otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssh: Increase robustness
inets: Dialyzer spec fixes
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/src/http_server/httpd_log.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl index 60ab326a20..a34435e0e8 100644 --- a/lib/inets/src/http_server/httpd_log.erl +++ b/lib/inets/src/http_server/httpd_log.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -36,8 +36,8 @@ AuthUser :: string(), Date :: string(), StatusCode :: pos_integer(), - Size :: pos_integer() | string()) -> - {Log :: atom() | pid(), Entry :: string()}. + 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) -> @@ -69,7 +69,7 @@ access_entry(Log, NoLog, Info :: #mod{}, Date :: string(), Reason :: term()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). error_entry(Log, NoLog, #mod{config_db = ConfigDB, @@ -87,7 +87,7 @@ error_entry(Log, NoLog, ConfigDB :: term(), Date :: string(), ErrroStr :: string()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) -> MakeEntry = fun() -> io_lib:format("[~s], ~s~n", [Date, ErrorStr]) end, @@ -99,7 +99,7 @@ error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) -> ConfigDB :: term(), Date :: string(), Reason :: term()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). security_entry(Log, NoLog, #mod{config_db = ConfigDB}, Date, Reason) -> MakeEntry = fun() -> io_lib:format("[~s] ~s~n", [Date, Reason]) end, |