Mercurial > prosody-hg

comparison plugins/mod_websocket.lua @ 8794:0e2c1c4d4f78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10 -> trunk This commit intentionally drops changes from c2b99fa134b3 and 8da11142fabf which are based on older MUC code.
author Matthew Wild <mwild1@gmail.com>
date Wed, 16 May 2018 23:50:08 +0100
parents d3bbff01df9d 4ae8dd415e94
children a6f54df39624
comparison
equal deleted inserted replaced
8788:7a9b680a79fb 8794:0e2c1c4d4f78
259 -- Use upstream IP if a HTTP proxy was used 259 -- Use upstream IP if a HTTP proxy was used
260 -- See mod_http and #540 260 -- See mod_http and #540
261 session.ip = request.ip; 261 session.ip = request.ip;
262 262
263 session.secure = consider_websocket_secure or session.secure; 263 session.secure = consider_websocket_secure or session.secure;
264 session.websocket_request = request;
264 265
265 session.open_stream = session_open_stream; 266 session.open_stream = session_open_stream;
266 session.close = session_close; 267 session.close = session_close;
267 268
268 local frameBuffer = ""; 269 local frameBuffer = "";