Mercurial > prosody-modules
comparison mod_smacks/mod_smacks.lua @ 1641:1fa25cfb0ad4
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Mar 2015 18:31:13 +0200 |
| parents | ad6694f7b13c |
| children | 5f5ff061b316 |
comparison
equal
deleted
inserted
replaced
| 1636:7fa0c41792c7 | 1641:1fa25cfb0ad4 |
|---|---|
| 313 conn:close(); | 313 conn:close(); |
| 314 end | 314 end |
| 315 original_session.ip = session.ip; | 315 original_session.ip = session.ip; |
| 316 original_session.conn = session.conn; | 316 original_session.conn = session.conn; |
| 317 original_session.send = session.send; | 317 original_session.send = session.send; |
| 318 original_session.send.filter = original_session.filter; | 318 original_session.filter = session.filter; |
| 319 original_session.send.filter = session.filter; | |
| 320 original_session.data.filter = session.filter; | |
| 319 original_session.stream = session.stream; | 321 original_session.stream = session.stream; |
| 320 original_session.secure = session.secure; | 322 original_session.secure = session.secure; |
| 321 original_session.hibernating = nil; | 323 original_session.hibernating = nil; |
| 322 wrap_session(original_session, true); | 324 wrap_session(original_session, true); |
| 323 -- Inform xmppstream of the new session (passed to its callbacks) | 325 -- Inform xmppstream of the new session (passed to its callbacks) |
