From 0ffa2d00d0dddd9c12da26b9db4ccf043fd8c8d0 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 19 May 2017 16:41:27 +0800 Subject: [PATCH] Add a 'websocket_protocol_header' option to fix the missing 'Sec-Websocket-Protocol' header of WeChat WebSocket Connection --- src/emqttd_http.erl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/emqttd_http.erl b/src/emqttd_http.erl index b2828a853..9cbc10a6f 100644 --- a/src/emqttd_http.erl +++ b/src/emqttd_http.erl @@ -59,7 +59,7 @@ handle_request('POST', "/mqtt/publish", Req) -> handle_request('GET', "/mqtt", Req) -> lager:info("WebSocket Connection from: ~s", [Req:get(peer)]), Upgrade = Req:get_header_value("Upgrade"), - Proto = Req:get_header_value("Sec-WebSocket-Protocol"), + Proto = check_protocol_header(Req), case {is_websocket(Upgrade), Proto} of {true, "mqtt" ++ _Vsn} -> emqttd_ws:handle_request(Req); @@ -83,6 +83,18 @@ handle_request(Method, Path, Req) -> lager:error("Unexpected HTTP Request: ~s ~s", [Method, Path]), Req:not_found(). +check_protocol_header(Req) -> + case emqttd:env(websocket_protocol_header, false) of + true -> get_protocol_header(Req); + false -> "mqtt-v3.1.1" + end. + +get_protocol_header(Req) -> + case Req:get_header_value("Emq-WebSocket-Protocol") of + undefined -> Req:get_header_value("Sec-WebSocket-Protocol"); + Proto -> Proto + end. + %%-------------------------------------------------------------------- %% HTTP Publish %%--------------------------------------------------------------------