From b56a5a1d60715ae115723c11c27ff7e032a3c4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 12 Sep 2018 16:16:29 +0200 Subject: Do not send a 101 after a final response in switch_protocol --- test/handlers/stream_handler_h.erl | 6 +++++ test/stream_handler_SUITE.erl | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) (limited to 'test') diff --git a/test/handlers/stream_handler_h.erl b/test/handlers/stream_handler_h.erl index 7aa3195..0f245c6 100644 --- a/test/handlers/stream_handler_h.erl +++ b/test/handlers/stream_handler_h.erl @@ -46,6 +46,12 @@ init_commands(_, _, State=#state{test=shutdown_timeout_on_stream_stop}) -> init_commands(_, _, State=#state{test=shutdown_timeout_on_socket_close}) -> Spawn = init_process(true, State), [{headers, 200, #{}}, {spawn, Spawn, 2000}]; +init_commands(_, _, State=#state{test=switch_protocol_after_headers}) -> + [{headers, 200, #{}}, {switch_protocol, #{}, ?MODULE, State}]; +init_commands(_, _, State=#state{test=switch_protocol_after_headers_data}) -> + [{headers, 200, #{}}, {data, fin, <<"{}">>}, {switch_protocol, #{}, ?MODULE, State}]; +init_commands(_, _, State=#state{test=switch_protocol_after_response}) -> + [{response, 200, #{}, <<"{}">>}, {switch_protocol, #{}, ?MODULE, State}]; init_commands(_, _, State=#state{test=terminate_on_switch_protocol}) -> [{switch_protocol, #{}, ?MODULE, State}]; init_commands(_, _, #state{test=terminate_on_stop}) -> diff --git a/test/stream_handler_SUITE.erl b/test/stream_handler_SUITE.erl index 231e97a..9003e23 100644 --- a/test/stream_handler_SUITE.erl +++ b/test/stream_handler_SUITE.erl @@ -325,6 +325,54 @@ shutdown_timeout_on_socket_close(Config) -> receive {'DOWN', MRef, process, Spawn, killed} -> ok after 1000 -> error(timeout) end, ok. +switch_protocol_after_headers(Config) -> + case config(protocol, Config) of + http -> do_switch_protocol_after_response( + <<"switch_protocol_after_headers">>, Config); + http2 -> doc("The switch_protocol command is not currently supported for HTTP/2.") + end. + +switch_protocol_after_headers_data(Config) -> + case config(protocol, Config) of + http -> do_switch_protocol_after_response( + <<"switch_protocol_after_headers_data">>, Config); + http2 -> doc("The switch_protocol command is not currently supported for HTTP/2.") + end. + +switch_protocol_after_response(Config) -> + case config(protocol, Config) of + http -> do_switch_protocol_after_response( + <<"switch_protocol_after_response">>, Config); + http2 -> doc("The switch_protocol command is not currently supported for HTTP/2.") + end. + +do_switch_protocol_after_response(TestCase, Config) -> + doc("The 101 informational response must not be sent when a response " + "has already been sent before the switch_protocol is returned."), + Self = self(), + ConnPid = gun_open(Config), + Ref = gun:get(ConnPid, "/long_polling", [ + {<<"accept-encoding">>, <<"gzip">>}, + {<<"x-test-case">>, TestCase}, + {<<"x-test-pid">>, pid_to_list(Self)} + ]), + %% Confirm init/3 is called and receive the response. + Pid = receive {Self, P, init, _, _, _} -> P after 1000 -> error(timeout) end, + {response, nofin, 200, _} = gun:await(ConnPid, Ref), + case TestCase of + <<"switch_protocol_after_headers">> -> + ok; + _ -> + {ok, <<"{}">>} = gun:await_body(ConnPid, Ref), + ok + end, + {error, _} = gun:await(ConnPid, Ref), + %% Confirm terminate/3 is called. + receive {Self, Pid, terminate, _, _, _} -> ok after 1000 -> error(timeout) end, + %% Confirm takeover/7 is called. + receive {Self, Pid, takeover, _, _, _, _, _, _, _} -> ok after 1000 -> error(timeout) end, + ok. + terminate_on_socket_close(Config) -> doc("Confirm terminate/3 is called when the socket gets closed brutally."), Self = self(), -- cgit v1.2.3