From e09a85680540029df22001073f73b77eec67773d Mon Sep 17 00:00:00 2001 From: Cameron Bytheway Date: Fri, 24 Jun 2016 19:34:11 -0600 Subject: send resp_headers with websocket responses --- test/ws_SUITE.erl | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'test/ws_SUITE.erl') diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index 4eaf456..f15c9fe 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -79,7 +79,8 @@ init_dispatch() -> {text, <<"won't be received">>}]} ]}, {"/ws_timeout_hibernate", ws_timeout_hibernate, []}, - {"/ws_timeout_cancel", ws_timeout_cancel, []} + {"/ws_timeout_cancel", ws_timeout_cancel, []}, + {"/ws_subprotocol", ws_subprotocol, []} ]} ]). @@ -603,7 +604,7 @@ ws_timeout_hibernate(Config) -> ok. ws_timeout_cancel(Config) -> - %% Erlang messages to a socket should not cancel the timeout + %% Erlang messages to a socket should not cancel the timeout {port, Port} = lists:keyfind(port, 1, Config), {ok, Socket} = gen_tcp:connect("localhost", Port, [binary, {active, false}, {packet, raw}]), @@ -630,7 +631,7 @@ ws_timeout_cancel(Config) -> ok. ws_timeout_reset(Config) -> - %% Erlang messages across a socket should reset the timeout + %% Erlang messages across a socket should reset the timeout {port, Port} = lists:keyfind(port, 1, Config), {ok, Socket} = gen_tcp:connect("localhost", Port, [binary, {active, false}, {packet, raw}]), @@ -663,6 +664,35 @@ ws_timeout_reset(Config) -> {error, closed} = gen_tcp:recv(Socket, 0, 6000), ok. +ws_subprotocol(Config) -> + {port, Port} = lists:keyfind(port, 1, Config), + {ok, Socket} = gen_tcp:connect("localhost", Port, + [binary, {active, false}, {packet, raw}]), + ok = gen_tcp:send(Socket, [ + "GET /ws_subprotocol HTTP/1.1\r\n" + "Host: localhost\r\n" + "Connection: Upgrade\r\n" + "Upgrade: websocket\r\n" + "Sec-WebSocket-Origin: http://localhost\r\n" + "Sec-WebSocket-Version: 13\r\n" + "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n" + "Sec-WebSocket-Protocol: foo, bar\r\n" + "\r\n"]), + {ok, Handshake} = gen_tcp:recv(Socket, 0, 6000), + {ok, {http_response, {1, 1}, 101, "Switching Protocols"}, Rest} + = erlang:decode_packet(http, Handshake, []), + [Headers, <<>>] = do_decode_headers( + erlang:decode_packet(httph, Rest, []), []), + {'Connection', "Upgrade"} = lists:keyfind('Connection', 1, Headers), + {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), + {"sec-websocket-accept", "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="} + = lists:keyfind("sec-websocket-accept", 1, Headers), + {"sec-websocket-protocol", "foo"} + = lists:keyfind("sec-websocket-protocol", 1, Headers), + {ok, << 1:1, 0:3, 8:4, 0:1, 2:7, 1000:16 >>} = gen_tcp:recv(Socket, 0, 6000), + {error, closed} = gen_tcp:recv(Socket, 0, 6000), + ok. + %% Internal. do_decode_headers({ok, http_eoh, Rest}, Acc) -> -- cgit v1.2.3