diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-07-07 17:01:18 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-07-07 17:01:18 -0500 |
| commit | 20297252ed1fa104f5651dd7df64b0f7f677d8df (patch) | |
| tree | c471a08f3218ac16faf9b71f1f3ff0e4f97915ef | |
| parent | 5717340ab3a74633b4514d5e2116a0a4de44ee0f (diff) | |
| parent | f35a4b8525c86d98187c142484f254ef0ff257e9 (diff) | |
Merge "res/res_http_websocket: Don't send HTTP response fragmented."
| -rw-r--r-- | res/res_http_websocket.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c index 40aedff72..ecae03919 100644 --- a/res/res_http_websocket.c +++ b/res/res_http_websocket.c @@ -781,13 +781,6 @@ int AST_OPTIONAL_API_NAME(ast_websocket_uri_cb)(struct ast_tcptls_session_instan 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: * * 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_. */ 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); + } 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); } else { |