From 5d49d9280e19651202986ebfb9f72f028ecda819 Mon Sep 17 00:00:00 2001
From: Seven Du <dujinfang@gmail.com>
Date: Thu, 8 Aug 2013 22:55:56 +0800
Subject: [PATCH] fix for some FireFox cases
Chrome send "Connection: Upgrade" while FF has "Connection: keep-alive, Upgrade"
---
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
index 0322ad5e51..d7b9d708d5 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
@@ -574,13 +574,10 @@ abyss_bool websocket_hook(TSession *r)
switch_event_node_t *nodes[MAX_EVENT_BIND_SLOTS];
int node_count = 0;
char *p;
- char *key = TableFind(&r->requestHeaderFields, "sec-websocket-key");
- char *version = TableFind(&r->requestHeaderFields, "sec-websocket-version");
- char *proto = TableFind(&r->requestHeaderFields, "sec-websocket-protocol");
- char *upgrade = TableFind(&r->requestHeaderFields, "connection");
-
- if (!key || !version || !proto || !upgrade) return FALSE;
- if (strncasecmp(upgrade, "Upgrade", 7) || strncasecmp(proto, "websocket", 9)) return FALSE;
+ char *key = NULL;
+ char *version = NULL;
+ char *proto = NULL;
+ char *upgrade = NULL;
for (i = 0; i < r->requestHeaderFields.size; ++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);
}
+ 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);
if (ret != 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket error %d\n", ret);