mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 21:57:45 +03:00
Merge 0.10 -> trunk
This commit intentionally drops changes from c2b99fa134b3 and 8da11142fabf which are based on older MUC code.
This commit is contained in:
commit
3754dac582
2 changed files with 33 additions and 2 deletions
|
@ -261,6 +261,7 @@ function handle_request(event)
|
|||
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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue