diff options
author | Zandra <[email protected]> | 2016-02-02 10:46:41 +0100 |
---|---|---|
committer | Zandra <[email protected]> | 2016-02-02 10:46:41 +0100 |
commit | 781ef120612c0018aa9f4e8114d74ac4af4e6191 (patch) | |
tree | 3f6e5c6f8aff726af1b7a8da77c4956023f4f458 /lib/inets/src/http_client/httpc.erl | |
parent | 1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0 (diff) | |
parent | bdfc7355e066db8812dec0c3aa70a0fae0e5d6ac (diff) | |
download | otp-781ef120612c0018aa9f4e8114d74ac4af4e6191.tar.gz otp-781ef120612c0018aa9f4e8114d74ac4af4e6191.tar.bz2 otp-781ef120612c0018aa9f4e8114d74ac4af4e6191.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/inets/src/http_client/httpc.erl')
-rw-r--r-- | lib/inets/src/http_client/httpc.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index e4a6f8f748..85663b5ded 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -101,7 +101,8 @@ request(Url, Profile) -> %% {ok, {StatusLine, Headers, Body}} | {ok, {Status, Body}} | %% {ok, RequestId} | {error,Reason} | {ok, {saved_as, FilePath} %% -%% Method - atom() = head | get | put | post | trace | options| delete +%% Method - atom() = head | get | put | patch | post | trace | +%% options | delete %% Request - {Url, Headers} | {Url, Headers, ContentType, Body} %% Url - string() %% HTTPOptions - [HttpOption] @@ -176,8 +177,8 @@ request(Method, request(Method, {Url, Headers, ContentType, Body}, HTTPOptions, Options, Profile) - when ((Method =:= post) orelse (Method =:= put) orelse (Method =:= delete)) andalso - (is_atom(Profile) orelse is_pid(Profile)) -> + when ((Method =:= post) orelse (Method =:= patch) orelse (Method =:= put) orelse + (Method =:= delete)) andalso (is_atom(Profile) orelse is_pid(Profile)) -> ?hcrt("request", [{method, Method}, {url, Url}, {headers, Headers}, |