server allow NULL protocol map to protocol 0
authorAndy Green <andy.green@linaro.org>
Wed, 30 Jan 2013 04:26:14 +0000 (12:26 +0800)
committerAndy Green <andy.green@linaro.org>
Wed, 30 Jan 2013 04:26:14 +0000 (12:26 +0800)
Signed-off-by: Andy Green <andy.green@linaro.org>
lib/handshake.c

index b6d3897..72f51d4 100644 (file)
@@ -149,14 +149,16 @@ libwebsocket_read(struct libwebsocket_context *context,
                /* we didn't find a protocol he wanted? */
 
                if (wsi->protocol->callback == NULL) {
-                       if (wsi->utf8_token[WSI_TOKEN_PROTOCOL].token == NULL)
-                               lwsl_err("[no protocol] "
-                                       "not supported (use NULL .name)\n");
-                       else
+                       if (wsi->utf8_token[WSI_TOKEN_PROTOCOL].token == NULL) {
+                               lwsl_info("[no protocol] "
+                                       "mapped to protocol 0 handler\n");
+                               wsi->protocol = &context->protocols[0];
+                       } else {
                                lwsl_err("Requested protocol %s "
                                                "not supported\n",
                                     wsi->utf8_token[WSI_TOKEN_PROTOCOL].token);
-                       goto bail;
+                               goto bail;
+                       }
                }
 
                /*