diff options
| author | Loïc Hoguin <[email protected]> | 2013-10-23 11:21:31 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-10-23 16:35:23 +0200 |
| commit | faf64524c6758ae1e27404d2ae1383a23538c538 (patch) | |
| tree | 1aed9b3434d9b38e67ceca1c1e09cd05f5222967 /src/cowboy_req.erl | |
| parent | aab63d605c595d8d0cd33646d13942d6cb372b60 (diff) | |
| download | cowboy-faf64524c6758ae1e27404d2ae1383a23538c538.tar.gz cowboy-faf64524c6758ae1e27404d2ae1383a23538c538.tar.bz2 cowboy-faf64524c6758ae1e27404d2ae1383a23538c538.zip | |
Move cookie parsing/building code to cowlib
The code for parsing has also been rewritten to be more efficient
and to be able to handle cookie values with space inside them properly.
Update cowlib to 0.2.0.
Diffstat (limited to 'src/cowboy_req.erl')
| -rw-r--r-- | src/cowboy_req.erl | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index 32ff7b0..34302c4 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -115,10 +115,7 @@ -export([lock/1]). -export([to_list/1]). --type cookie_option() :: {max_age, non_neg_integer()} - | {domain, binary()} | {path, binary()} - | {secure, boolean()} | {http_only, boolean()}. --type cookie_opts() :: [cookie_option()]. +-type cookie_opts() :: cow_cookie:cookie_opts(). -export_type([cookie_opts/0]). -type content_decode_fun() :: fun((binary()) @@ -430,7 +427,7 @@ parse_header(Name = <<"content-length">>, Req, Default) -> parse_header(Name = <<"content-type">>, Req, Default) -> parse_header(Name, Req, Default, fun cowboy_http:content_type/1); parse_header(Name = <<"cookie">>, Req, Default) -> - parse_header(Name, Req, Default, fun cowboy_http:cookie_list/1); + parse_header(Name, Req, Default, fun cow_cookie:parse_cookie/1); parse_header(Name = <<"expect">>, Req, Default) -> parse_header(Name, Req, Default, fun (Value) -> @@ -495,10 +492,7 @@ cookie(Name, Req=#http_req{cookies=undefined}, Default) when is_binary(Name) -> {ok, undefined, Req2} -> {Default, Req2#http_req{cookies=[]}}; {ok, Cookies, Req2} -> - cookie(Name, Req2#http_req{cookies=Cookies}, Default); - %% Flash player incorrectly sends an empty Cookie header. - {error, badarg} -> - {Default, Req#http_req{cookies=[]}} + cookie(Name, Req2#http_req{cookies=Cookies}, Default) end; cookie(Name, Req, Default) -> case lists:keyfind(Name, 1, Req#http_req.cookies) of @@ -854,7 +848,7 @@ multipart_skip(Req) -> -spec set_resp_cookie(iodata(), iodata(), cookie_opts(), Req) -> Req when Req::req(). set_resp_cookie(Name, Value, Opts, Req) -> - Cookie = cowboy_http:cookie_to_iodata(Name, Value, Opts), + Cookie = cow_cookie:setcookie(Name, Value, Opts), set_resp_header(<<"set-cookie">>, Cookie, Req). %% @doc Add a header to the response. |