From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 19 May 2016 11:18:16 +0000 (+0200)
Subject: websocket: accept empty protocol
X-Git-Tag: blowfish_2.0.1~101
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=917ffb686f88dfcd2819206deff88307dc90943c;p=src%2Fapp-framework-binder.git

websocket: accept empty protocol

Change-Id: If4d8609d5340faa53fea9e133a5415a576cbf5c5
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

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);