jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C proxy: Issue #14: wss:// from Safari 

Addresses this issue:
http://github.com/kanaka/noVNC/issues#issue/14

This goes along with commit 7e63919e6 but for the C proxy.
This commit is contained in:
Joel Martin 2010-09-15 18:21:42 -05:00
parent 0a1184bde8
commit 02889945cb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/websocket.c
View File

@ -350,7 +350,8 @@ ws_ctx_t *do_handshake(int sock) {
send(sock, policy_response, sizeof(policy_response), 0); send(sock, policy_response, sizeof(policy_response), 0);
close(sock); close(sock);
return NULL; return NULL;
} else if (bcmp(handshake, "\x16", 1) == 0) { } else if ((bcmp(handshake, "\x16", 1) == 0) ||
(bcmp(handshake, "\x80", 1) == 0)) {
// SSL // SSL
if (! settings.cert) { return NULL; } if (! settings.cert) { return NULL; }
ws_ctx = ws_socket_ssl(sock, settings.cert); ws_ctx = ws_socket_ssl(sock, settings.cert);
@ -368,6 +369,11 @@ ws_ctx_t *do_handshake(int sock) {
handler_msg("using plain (not SSL) socket\n"); handler_msg("using plain (not SSL) socket\n");
} }
len = ws_recv(ws_ctx, handshake, 4096); len = ws_recv(ws_ctx, handshake, 4096);
if (len == 0) {
handler_emsg("Client closed during handshake\n");
close(sock);
return NULL;
}
handshake[len] = 0; handshake[len] = 0;
if (!parse_handshake(handshake, &headers)) { if (!parse_handshake(handshake, &headers)) {