0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00

Properly handle 101 upgrade responses for Websocket

This commit is contained in:
Loïc Hoguin 2017-05-05 16:10:15 +02:00
parent 7db724f04a
commit 96bbf6752f
No known key found for this signature in database
GPG key ID: 71366FF21851DF03

View file

@ -791,6 +791,21 @@ commands(State=#state{out_state=wait}, StreamID, [{error_response, StatusCode, H
commands(State, StreamID, [{response, StatusCode, Headers, Body}|Tail]); commands(State, StreamID, [{response, StatusCode, Headers, Body}|Tail]);
commands(State, StreamID, [{error_response, _, _, _}|Tail]) -> commands(State, StreamID, [{error_response, _, _, _}|Tail]) ->
commands(State, StreamID, Tail); commands(State, StreamID, Tail);
%% Send an informational response.
commands(State=#state{socket=Socket, transport=Transport, out_state=wait, streams=Streams},
StreamID, [{inform, StatusCode, Headers}|Tail]) ->
%% @todo I'm pretty sure the last stream in the list is the one we want
%% considering all others are queued.
#stream{version=Version} = lists:keyfind(StreamID, #stream.id, Streams),
_ = case Version of
'HTTP/1.1' ->
Transport:send(Socket, cow_http:response(StatusCode, 'HTTP/1.1',
headers_to_list(Headers)));
%% Do not send informational responses to HTTP/1.0 clients. (RFC7231 6.2)
'HTTP/1.0' ->
ok
end,
commands(State, StreamID, Tail);
%% Send a full response. %% Send a full response.
%% %%
%% @todo Kill the stream if it sent a response when one has already been sent. %% @todo Kill the stream if it sent a response when one has already been sent.
@ -874,7 +889,7 @@ commands(State0=#state{ref=Ref, parent=Parent, socket=Socket, transport=Transpor
_ = [exit(Pid, kill) || {Pid, _, _} <- Children], _ = [exit(Pid, kill) || {Pid, _, _} <- Children],
flush(), flush(),
%% Everything good, upgrade! %% Everything good, upgrade!
_ = commands(State, StreamID, [{response, 101, Headers, <<>>}]), _ = commands(State, StreamID, [{inform, 101, Headers}]),
%% @todo This is no good because commands return a state normally and here it doesn't %% @todo This is no good because commands return a state normally and here it doesn't
%% we need to let this module go entirely. Perhaps it should be handled directly in %% we need to let this module go entirely. Perhaps it should be handled directly in
%% cowboy_clear/cowboy_tls? Perhaps not. We do want that Buffer. %% cowboy_clear/cowboy_tls? Perhaps not. We do want that Buffer.