Software / code / prosody
Diff
plugins/mod_websocket.lua @ 8794:0e2c1c4d4f78
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 |
| parent | 8595:d3bbff01df9d |
| parent | 8789:4ae8dd415e94 |
| child | 9378:a6f54df39624 |
line wrap: on
line diff
--- a/plugins/mod_websocket.lua Fri May 04 00:10:17 2018 +0200 +++ b/plugins/mod_websocket.lua Wed May 16 23:50:08 2018 +0100 @@ -261,6 +261,7 @@ session.ip = request.ip; session.secure = consider_websocket_secure or session.secure; + session.websocket_request = request; session.open_stream = session_open_stream; session.close = session_close;
