diff options
| -rw-r--r-- | examples/echo_get/src/toppage_handler.erl | 2 | ||||
| -rw-r--r-- | examples/echo_post/src/toppage_handler.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_cookies.erl | 16 | ||||
| -rw-r--r-- | src/cowboy_websocket.erl | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/examples/echo_get/src/toppage_handler.erl b/examples/echo_get/src/toppage_handler.erl index 6d914ec..86433cb 100644 --- a/examples/echo_get/src/toppage_handler.erl +++ b/examples/echo_get/src/toppage_handler.erl @@ -20,7 +20,7 @@ echo(<<"GET">>, undefined, Req) -> cowboy_req:reply(400, [], <<"Missing echo parameter.">>, Req); echo(<<"GET">>, Echo, Req) -> cowboy_req:reply(200, - [{<<"Content-Encoding">>, <<"utf-8">>}], Echo, Req); + [{<<"content-encoding">>, <<"utf-8">>}], Echo, Req); echo(_, _, Req) -> %% Method not allowed. cowboy_req:reply(405, Req). diff --git a/examples/echo_post/src/toppage_handler.erl b/examples/echo_post/src/toppage_handler.erl index 69aeb9f..808ba8e 100644 --- a/examples/echo_post/src/toppage_handler.erl +++ b/examples/echo_post/src/toppage_handler.erl @@ -30,7 +30,7 @@ echo(undefined, Req) -> cowboy_req:reply(400, [], <<"Missing echo parameter.">>, Req); echo(Echo, Req) -> cowboy_req:reply(200, - [{<<"Content-Encoding">>, <<"utf-8">>}], Echo, Req). + [{<<"content-encoding">>, <<"utf-8">>}], Echo, Req). terminate(_Req, _State) -> ok. diff --git a/src/cowboy_cookies.erl b/src/cowboy_cookies.erl index d10c848..72b5e8a 100644 --- a/src/cowboy_cookies.erl +++ b/src/cowboy_cookies.erl @@ -115,7 +115,7 @@ cookie(Key, Value, Options) when is_binary(Key) end, CookieParts = <<Cookie/binary, ExpiresPart/binary, SecurePart/binary, DomainPart/binary, PathPart/binary, HttpOnlyPart/binary>>, - {<<"Set-Cookie">>, CookieParts}. + {<<"set-cookie">>, CookieParts}. %% Internal. @@ -358,7 +358,7 @@ parse_cookie_test() -> domain_test() -> ?assertEqual( - {<<"Set-Cookie">>, + {<<"set-cookie">>, <<"Customer=WILE_E_COYOTE; " "Version=1; " "Domain=acme.com; " @@ -368,7 +368,7 @@ domain_test() -> ok. local_time_test() -> - {<<"Set-Cookie">>, B} = cookie(<<"Customer">>, <<"WILE_E_COYOTE">>, + {<<"set-cookie">>, B} = cookie(<<"Customer">>, <<"WILE_E_COYOTE">>, [{max_age, 111}, {secure, true}]), ?assertMatch( @@ -382,7 +382,7 @@ local_time_test() -> -spec cookie_test() -> no_return(). %% Not actually true, just a bad option. cookie_test() -> - C1 = {<<"Set-Cookie">>, + C1 = {<<"set-cookie">>, <<"Customer=WILE_E_COYOTE; " "Version=1; " "Path=/acme">>}, @@ -391,20 +391,20 @@ cookie_test() -> C1 = cookie(<<"Customer">>, <<"WILE_E_COYOTE">>, [{path, <<"/acme">>}, {badoption, <<"negatory">>}]), - {<<"Set-Cookie">>,<<"=NoKey; Version=1">>} + {<<"set-cookie">>,<<"=NoKey; Version=1">>} = cookie(<<"">>, <<"NoKey">>, []), - {<<"Set-Cookie">>,<<"=NoKey; Version=1">>} + {<<"set-cookie">>,<<"=NoKey; Version=1">>} = cookie(<<"">>, <<"NoKey">>), LocalTime = calendar:universal_time_to_local_time( {{2007, 5, 15}, {13, 45, 33}}), - C2 = {<<"Set-Cookie">>, + C2 = {<<"set-cookie">>, <<"Customer=WILE_E_COYOTE; " "Version=1; " "Expires=Tue, 15 May 2007 13:45:33 GMT; " "Max-Age=0">>}, C2 = cookie(<<"Customer">>, <<"WILE_E_COYOTE">>, [{max_age, -111}, {local_time, LocalTime}]), - C3 = {<<"Set-Cookie">>, + C3 = {<<"set-cookie">>, <<"Customer=WILE_E_COYOTE; " "Version=1; " "Expires=Wed, 16 May 2007 13:45:50 GMT; " diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index 0e41279..295767b 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -153,9 +153,9 @@ websocket_handshake(State=#state{socket=Socket, transport=Transport, {<< "http", Location/binary >>, Req1} = cowboy_req:url(Req), {ok, Req2} = cowboy_req:upgrade_reply( <<"101 WebSocket Protocol Handshake">>, - [{<<"Upgrade">>, <<"WebSocket">>}, - {<<"Sec-Websocket-Location">>, << "ws", Location/binary >>}, - {<<"Sec-Websocket-Origin">>, Origin}], + [{<<"upgrade">>, <<"WebSocket">>}, + {<<"sec-websocket-location">>, << "ws", Location/binary >>}, + {<<"sec-websocket-origin">>, Origin}], Req1), %% Flush the resp_sent message before moving on. receive {cowboy_req, resp_sent} -> ok after 0 -> ok end, @@ -181,8 +181,8 @@ websocket_handshake(State=#state{transport=Transport, challenge=Challenge}, Req, HandlerState) -> {ok, Req2} = cowboy_req:upgrade_reply( 101, - [{<<"Upgrade">>, <<"websocket">>}, - {<<"Sec-Websocket-Accept">>, Challenge}], + [{<<"upgrade">>, <<"websocket">>}, + {<<"sec-websocket-accept">>, Challenge}], Req), %% Flush the resp_sent message before moving on. receive {cowboy_req, resp_sent} -> ok after 0 -> ok end, |