From 917ffb686f88dfcd2819206deff88307dc90943c Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 19 May 2016 13:18:16 +0200 Subject: websocket: accept empty protocol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If4d8609d5340faa53fea9e133a5415a576cbf5c5 Signed-off-by: José Bollo --- src/afb-websock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/afb-websock.c b/src/afb-websock.c index 3ad9e20d..0228ce1b 100644 --- a/src/afb-websock.c +++ b/src/afb-websock.c @@ -102,6 +102,10 @@ static const struct protodef *search_proto(const struct protodef *protodefs, con int i; size_t len; + if (protocols == NULL) { + /* return NULL; */ + return protodefs != NULL && protodefs->name != NULL ? protodefs : NULL; + } for(;;) { protocols += strspn(protocols, vseparators); if (!*protocols) @@ -154,7 +158,7 @@ static int check_websocket_upgrade(struct MHD_Connection *con, const struct prot /* is the protocol supported ? */ protocols = MHD_lookup_connection_value(con, MHD_HEADER_KIND, sec_websocket_protocol_s); - proto = protocols == NULL ? NULL : search_proto(protodefs, protocols); + proto = search_proto(protodefs, protocols); if (proto == NULL) { response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT); MHD_queue_response(con, MHD_HTTP_PRECONDITION_FAILED, response); -- cgit 1.2.3-korg