kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for some FireFox cases 

Chrome send "Connection: Upgrade" while FF has "Connection: keep-alive, Upgrade"
This commit is contained in:
Seven Du 2013-08-08 22:55:56 +08:00
parent 365fc08719
commit 5d49d9280e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
View File

@ -574,13 +574,10 @@ abyss_bool websocket_hook(TSession *r)
switch_event_node_t *nodes[MAX_EVENT_BIND_SLOTS]; switch_event_node_t *nodes[MAX_EVENT_BIND_SLOTS];
int node_count = 0; int node_count = 0;
char *p; char *p;
char *key = TableFind(&r->requestHeaderFields, "sec-websocket-key"); char *key = NULL;
char *version = TableFind(&r->requestHeaderFields, "sec-websocket-version"); char *version = NULL;
char *proto = TableFind(&r->requestHeaderFields, "sec-websocket-protocol"); char *proto = NULL;
char *upgrade = TableFind(&r->requestHeaderFields, "connection"); char *upgrade = NULL;
if (!key || !version || !proto || !upgrade) return FALSE;
if (strncasecmp(upgrade, "Upgrade", 7) || strncasecmp(proto, "websocket", 9)) return FALSE;
for (i = 0; i < r->requestHeaderFields.size; ++i) { for (i = 0; i < r->requestHeaderFields.size; ++i) {
TTableItem * const fieldP = &r->requestHeaderFields.item[i]; TTableItem * const fieldP = &r->requestHeaderFields.item[i];
@ -589,6 +586,14 @@ abyss_bool websocket_hook(TSession *r)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "headers %s: %s\n", fieldP->name, fieldValue); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "headers %s: %s\n", fieldP->name, fieldValue);
} }
key = TableFind(&r->requestHeaderFields, "sec-websocket-key");
version = TableFind(&r->requestHeaderFields, "sec-websocket-version");
proto = TableFind(&r->requestHeaderFields, "sec-websocket-protocol");
upgrade = TableFind(&r->requestHeaderFields, "connection");
if (!key || !version || !proto || !upgrade) return FALSE;
if (!strstr(upgrade, "Upgrade") || strncasecmp(proto, "websocket", 9)) return FALSE;
ret = ws_init(&wsh, r, NULL, 0); ret = ws_init(&wsh, r, NULL, 0);
if (ret != 0) { if (ret != 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket error %d\n", ret); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket error %d\n", ret);