diff options
| author | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
| commit | 908f5b61c55e4cba39e61ac415b0fca384a1095d (patch) | |
| tree | 6e391ff6608608f181e42c92ee6dfd7c534da255 /net/websocket.lua | |
| parent | c4c38d2f01d5f2711b527c7c2412250ed6c58738 (diff) | |
| parent | fd9ccf20d5b652dbad1f37cecd540661f4642ee6 (diff) | |
| download | prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.tar.gz prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/websocket.lua')
| -rw-r--r-- | net/websocket.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websocket.lua b/net/websocket.lua index 469c6a58..fb16b8bb 100644 --- a/net/websocket.lua +++ b/net/websocket.lua @@ -113,7 +113,7 @@ function websocket_listeners.onincoming(conn, buffer, err) -- luacheck: ignore 2 frame.MASK = true; -- RFC 6455 6.1.5: If the data is being sent by the client, the frame(s) MUST be masked conn:write(frames.build(frame)); elseif frame.opcode == 0xA then -- Pong frame - log("debug", "Received unexpected pong frame: " .. tostring(frame.data)); + log("debug", "Received unexpected pong frame: %s", frame.data); else return fail(s, 1002, "Reserved opcode"); end @@ -131,7 +131,7 @@ end function websocket_methods:close(code, reason) if self.readyState < 2 then code = code or 1000; - log("debug", "closing WebSocket with code %i: %s" , code , tostring(reason)); + log("debug", "closing WebSocket with code %i: %s" , code , reason); self.readyState = 2; local conn = self.conn; conn:write(frames.build_close(code, reason, true)); @@ -245,7 +245,7 @@ local function connect(url, ex, listeners) or (protocol and not protocol[r.headers["sec-websocket-protocol"]]) then s.readyState = 3; - log("warn", "WebSocket connection to %s failed: %s", url, tostring(b)); + log("warn", "WebSocket connection to %s failed: %s", url, b); if s.onerror then s:onerror("connecting-failed"); end return; end |