Mercurial > prosody-hg
comparison plugins/mod_websocket.lua @ 7341:aa94cd27df4d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 06 Apr 2016 14:50:34 +0200 |
| parents | 7dea28dafc49 |
| children | 779a9ef6b4fd |
comparison
equal
deleted
inserted
replaced
| 7338:f8d37227acd7 | 7341:aa94cd27df4d |
|---|---|
| 289 | 289 |
| 290 return ""; | 290 return ""; |
| 291 end | 291 end |
| 292 | 292 |
| 293 local function keepalive(event) | 293 local function keepalive(event) |
| 294 return conn:write(build_frame({ opcode = 0x9, })); | 294 local session = event.session; |
| 295 if session.open_stream == session_open_stream then | |
| 296 return session.conn:write(build_frame({ opcode = 0x9, })); | |
| 297 end | |
| 295 end | 298 end |
| 296 | 299 |
| 297 module:hook("c2s-read-timeout", keepalive, -0.9); | 300 module:hook("c2s-read-timeout", keepalive, -0.9); |
| 298 | 301 |
| 299 function module.add_host(module) | 302 function module.add_host(module) |