From 2709f328b9976c937d417f9d03b6d8b90ca2d1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 23 Sep 2019 13:46:32 +0200 Subject: Properly error out on HTTP/1.0 Websocket upgrade attempts --- src/gun_http.erl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gun_http.erl b/src/gun_http.erl index 780dc04..59f4fe7 100644 --- a/src/gun_http.erl +++ b/src/gun_http.erl @@ -777,9 +777,10 @@ end_stream(State=#http_state{streams=[_|Tail]}) -> %% Websocket upgrade. -%% Ensure version is 1.1. -ws_upgrade(#http_state{version='HTTP/1.0'}, _, _, _, _, _, _, _, _) -> - error; %% @todo Probably don't error out here, have a protocol function/command. +ws_upgrade(#http_state{owner=ReplyTo, version='HTTP/1.0'}, StreamRef, _, _, _, _, _, _, EvHandlerState) -> + ReplyTo ! {gun_error, self(), StreamRef, {badstate, + "Websocket cannot be used over an HTTP/1.0 connection."}}, + {[], EvHandlerState}; ws_upgrade(State=#http_state{owner=ReplyTo, out=head}, StreamRef, Host, Port, Path, Headers0, WsOpts, EvHandler, EvHandlerState0) -> -- cgit v1.2.3