Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

client allow remote server to accept with no protocol set

Browse source 
Needed if our clientside can connect to, eg, echo.websocket.org

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2013-01-17 00:50:48 +08:00
parent 443ea54c5c
commit d32bb9128b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/client.c
View file

@ -341,9 +341,8 @@ lws_client_interpret_server_handshake(struct libwebsocket_context *context,
if (!wsi->utf8_token[WSI_TOKEN_HTTP].token_len ||
!wsi->utf8_token[WSI_TOKEN_UPGRADE].token_len ||
!wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len ||
!wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len ||
(!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len &&
wsi->c_protocol != NULL)) {
!wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len
) {
lwsl_parser("libwebsocket_client_handshake "
"missing required header(s)\n");
pkt[len] = '\0';
@ -396,11 +395,10 @@ lws_client_interpret_server_handshake(struct libwebsocket_context *context,
!wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len ||
!wsi->utf8_token[WSI_TOKEN_ACCEPT].token_len ||
(!wsi->utf8_token[WSI_TOKEN_NONCE].token_len &&
wsi->ietf_spec_revision == 4) ||
(!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len &&
wsi->c_protocol != NULL)) {
wsi->ietf_spec_revision == 4)
) {
lwsl_parser("libwebsocket_client_handshake "
"missing required header(s)\n");
"missing required header(s) revision=%d\n", wsi->ietf_spec_revision);
pkt[len] = '\0';
lwsl_parser("%s", pkt);
goto bail3;
@ -453,7 +451,7 @@ select_protocol:
if (!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len) {
lwsl_warn("lws_client_interpret_server_handshake "
lwsl_info("lws_client_interpret_server_handshake "
"WSI_TOKEN_PROTOCOL is null\n");
/*
* no protocol name to work from,