kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_http_websocket: Don't send HTTP response fragmented.

Browse Source 
This change makes it so that when accepting a WebSocket
connection the HTTP response is sent as one packet instead of
fragmented. Browsers don't like it when you send it fragmented.

ASTERISK-25103

Change-Id: I9b82c4ec2949b0bce692ad0bf6f7cea9709e7f69
This commit is contained in:
Joshua Colp
2015-07-04 20:22:01 -03:00
parent 2c17515f3c
commit f35a4b8525
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_http_websocket.c
View File

@@ -781,13 +781,6 @@ int AST_OPTIONAL_API_NAME(ast_websocket_uri_cb)(struct ast_tcptls_session_instan
return 0; return 0;
} }
fprintf(ser->f, "HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: %s\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: %s\r\n",
upgrade,
websocket_combine_key(key, base64, sizeof(base64)));
/* RFC 6455, Section 4.1: /* RFC 6455, Section 4.1:
* *
* 6. If the response includes a |Sec-WebSocket-Protocol| header * 6. If the response includes a |Sec-WebSocket-Protocol| header
@@ -798,11 +791,23 @@ int AST_OPTIONAL_API_NAME(ast_websocket_uri_cb)(struct ast_tcptls_session_instan
* Connection_. * Connection_.
*/ */
if (protocol) { if (protocol) {
fprintf(ser->f, "Sec-WebSocket-Protocol: %s\r\n", fprintf(ser->f, "HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: %s\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: %s\r\n"
"Sec-WebSocket-Protocol: %s\r\n\r\n",
upgrade,
websocket_combine_key(key, base64, sizeof(base64)),
protocol); protocol);
} else {
fprintf(ser->f, "HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: %s\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: %s\r\n\r\n",
upgrade,
websocket_combine_key(key, base64, sizeof(base64)));
} }
fprintf(ser->f, "\r\n");
fflush(ser->f); fflush(ser->f);
} else { } else {