fts: dont break server if missing config

Author: lws-team

lib/core-net/vhost.c

@@ -467,20 +467,20 @@ lws_protocol_init_vhost(struct lws_vhost *vh, int *any)
 		) {
 			lwsl_vhost_info(vh, "init %s.%s", vh->name,
 					vh->protocols[n].name);
-			vh->protocol_init |= 1u << n;
 			if (vh->protocols[n].callback((struct lws *)lwsa,
-				LWS_CALLBACK_PROTOCOL_INIT, NULL,
-				(void *)(pvo ? pvo->options : NULL),
-				0)) {
+					LWS_CALLBACK_PROTOCOL_INIT, NULL,
+					(void *)(pvo ? pvo->options : NULL),
+					0)) {
 				if (vh->protocol_vh_privs && vh->protocol_vh_privs[n]) {
 					lws_free(vh->protocol_vh_privs[n]);
 					vh->protocol_vh_privs[n] = NULL;
 				}
-			lwsl_vhost_err(vh, "protocol %s failed init",
+				lwsl_vhost_warn(vh, "protocol %s failed init",
 					vh->protocols[n].name);
 
-				return 1;
-			}
+				// return 1;
+			} else
+				vh->protocol_init |= 1u << n;
 		}
 	}
 

lib/roles/http/client/client-http.c

@@ -1203,15 +1203,15 @@ lws_client_interpret_server_handshake(struct lws *wsi)
 				lwsl_warn("%s: redirect path exceeds ah size\n", __func__);
 				goto bail3;
 			}
-			memcpy(wsi->http.ah->data + wsi->http.ah->pos + 1, path, pl + 1);
+			memcpy(wsi->http.ah->data + wsi->http.ah->pos + 1, path, pl + 1u);
 			wsi->http.ah->data[wsi->http.ah->pos] = '/';
 			wsi->http.ah->frags[wsi->http.ah->frag_index[_WSI_TOKEN_CLIENT_URI]].offset = wsi->http.ah->pos;
-			wsi->http.ah->frags[wsi->http.ah->frag_index[_WSI_TOKEN_CLIENT_URI]].len = pl + 1;
+			wsi->http.ah->frags[wsi->http.ah->frag_index[_WSI_TOKEN_CLIENT_URI]].len = (uint16_t)(pl + 1u);
 
 			if (wsi->stash)
 				wsi->stash->cis[CIS_PATH] = wsi->http.ah->data + wsi->http.ah->pos;
 
-			wsi->http.ah->pos += pl + 1;
+			wsi->http.ah->pos += pl + 1u;
 		}
 
 

plugins/protocol_fulltext_demo.c

@@ -81,7 +81,7 @@ callback_fts(struct lws *wsi, enum lws_callback_reasons reason, void *user,
 			return 0;
 		if (lws_pvo_get_str(in, "indexpath",
 				    (const char **)&vhd->indexpath))
-			return 1;
+                       return 0;
 
 		return 0;