Comparison

plugins/mod_websocket.lua @ 10582:6d4562acef81

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 02 Jan 2020 10:52:47 +0100
parent 10325:f2bbad04cf64
parent 10581:10d6d0d91f4e
child 10615:2bc918999615
comparison
equal deleted inserted replaced
10580:b7c5d7bae4ef 10582:6d4562acef81
221 elseif opcode == 0x8 then -- Close request 221 elseif opcode == 0x8 then -- Close request
222 websocket_close(1000, "Goodbye"); 222 websocket_close(1000, "Goodbye");
223 return; 223 return;
224 elseif opcode == 0x9 then -- Ping frame 224 elseif opcode == 0x9 then -- Ping frame
225 frame.opcode = 0xA; 225 frame.opcode = 0xA;
226 frame.MASK = false; -- Clients send masked frames, servers don't, see #1484
226 conn:write(build_frame(frame)); 227 conn:write(build_frame(frame));
227 return ""; 228 return "";
228 elseif opcode == 0xA then -- Pong frame, MAY be sent unsolicited, eg as keepalive 229 elseif opcode == 0xA then -- Pong frame, MAY be sent unsolicited, eg as keepalive
229 return ""; 230 return "";
230 else 231 else