Merge 0.10->trunk

diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 274e587a1ca1fdcc6204491906c1a66ddad127ff..086eab62603bde1de809829bdbc0bf493559d340 100644 (file)
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -226,8 +226,7 @@ function handle_request(event)
                        frame.opcode = 0xA;
                        conn:write(build_frame(frame));
                        return "";
-               elseif opcode == 0xA then -- Pong frame
-                       module:log("warn", "Received unexpected pong frame: " .. tostring(frame.data));
+               elseif opcode == 0xA then -- Pong frame, MAY be sent unsolicited, eg as keepalive
                        return "";
                else
                        log("warn", "Received frame with unsupported opcode %i", opcode);
@@ -291,6 +290,12 @@ function handle_request(event)
        return "";
 end
 
+local function keepalive(event)
+       return conn:write(build_frame({ opcode = 0x9, }));
+end
+
+module:hook("c2s-read-timeout", keepalive, -0.9);
+
 function module.add_host(module)
        module:depends("http");
        module:provides("http", {
@@ -301,4 +306,5 @@ function module.add_host(module)
                        ["GET /"] = handle_request;
                };
        });
+       module:hook("c2s-read-timeout", keepalive, -0.9);
 end