diff options
author | Micael Karlberg <bmk@erlang.org> | 2011-11-23 16:22:50 +0100 |
---|---|---|
committer | Micael Karlberg <bmk@erlang.org> | 2011-11-23 16:22:50 +0100 |
commit | 473c6308bbfed958ab04f45f53305e5d82d733fa (patch) | |
tree | f1f40409c955cb367aca433c1e1c8ddbb391bf9a /lib/inets/src/http_client/httpc.erl | |
parent | a41174d5ef937a22455f8cc52428fee313ae156e (diff) | |
download | otp-473c6308bbfed958ab04f45f53305e5d82d733fa.tar.gz otp-473c6308bbfed958ab04f45f53305e5d82d733fa.tar.bz2 otp-473c6308bbfed958ab04f45f53305e5d82d733fa.zip |
Fixed acceptor exit warnings (detected by dialyzer).
Also fixed cookie_header/3 and updated documented
accordingly. Also added documentation for undocumented
URI parse option.
Diffstat (limited to 'lib/inets/src/http_client/httpc.erl')
-rw-r--r-- | lib/inets/src/http_client/httpc.erl | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index d72c34fa6b..ae87ceed93 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -34,7 +34,7 @@ set_option/2, set_option/3, set_options/1, set_options/2, store_cookies/2, store_cookies/3, - cookie_header/1, cookie_header/2, + cookie_header/1, cookie_header/2, cookie_header/3, which_cookies/0, which_cookies/1, reset_cookies/0, reset_cookies/1, stream_next/1, @@ -290,25 +290,36 @@ store_cookies(SetCookieHeaders, Url, Profile) %%-------------------------------------------------------------------------- -%% cookie_header(Url [, Profile]) -> Header | {error, Reason} -%% +%% cookie_header(Url) -> Header | {error, Reason} +%% cookie_header(Url, Profile) -> Header | {error, Reason} +%% cookie_header(Url, Opts, Profile) -> Header | {error, Reason} +%% %% Description: Returns the cookie header that would be sent when making %% a request to <Url>. %%------------------------------------------------------------------------- cookie_header(Url) -> cookie_header(Url, default_profile()). -cookie_header(Url, Profile) -> +cookie_header(Url, Profile) when is_atom(Profile) orelse is_pid(Profile) -> + cookie_header(Url, [], Profile); +cookie_header(Url, Opts) when is_list(Opts) -> + cookie_header(Url, Opts, default_profile()). + +cookie_header(Url, Opts, Profile) + when (is_list(Opts) andalso (is_atom(Profile) orelse is_pid(Profile))) -> ?hcrt("cookie header", [{url, Url}, + {opts, Opts}, {profile, Profile}]), try begin - httpc_manager:which_cookies(Url, profile_name(Profile)) + httpc_manager:which_cookies(Url, Opts, profile_name(Profile)) end catch exit:{noproc, _} -> {error, {not_started, Profile}} end. + + %%-------------------------------------------------------------------------- |