crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix response to empty close frame.

This commit is contained in:
Joel Martin 2012-02-02 11:06:19 -06:00
parent b76c357f3f
commit bc1ea59867
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
other/websocket.c
View File

@ -318,6 +318,12 @@ int decode_hybi(unsigned char *src, size_t srclength,
framecount ++; framecount ++;
*opcode = frame[0] & 0x0f; *opcode = frame[0] & 0x0f;
if (*opcode == 0x8) {
// client sent orderly close frame
break;
}
//printf("opcode %d, frame[0..3]: 0x%x 0x%x 0x%x 0x%x\n", *opcode, //printf("opcode %d, frame[0..3]: 0x%x 0x%x 0x%x 0x%x\n", *opcode,
// (unsigned char) frame[0], // (unsigned char) frame[0],
// (unsigned char) frame[1], // (unsigned char) frame[1],
@ -343,11 +349,6 @@ int decode_hybi(unsigned char *src, size_t srclength,
//printf(" payload_length: %u, raw remaining: %u\n", payload_length, (unsigned int) srclength - target_offset); //printf(" payload_length: %u, raw remaining: %u\n", payload_length, (unsigned int) srclength - target_offset);
payload = frame + hdr_length + 4; payload = frame + hdr_length + 4;
if (*opcode == 0x8) {
// client sent orderly close frame
break;
}
if (*opcode != 1 && *opcode != 2) { if (*opcode != 1 && *opcode != 2) {
handler_msg("Ignoring non-data frame, opcode 0x%x\n", *opcode); handler_msg("Ignoring non-data frame, opcode 0x%x\n", *opcode);
frame = frame + hdr_length + 4 + payload_length; frame = frame + hdr_length + 4 + payload_length;