diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:59:03 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:59:03 +0000 |
| commit | 9613171fcbd245d285a95acc6cf7e3134469e5c5 (patch) | |
| tree | 6d22aff1fd5c281d8280845d0646631ddd0e9daa | |
| parent | 02971394f90dde48ed352ebc1936258647f7ab3c (diff) | |
| parent | 6fc597e709bcd9328e9309f05b55b1c2097cfebe (diff) | |
| download | prosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.tar.gz prosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.zip | |
Merge 0.7->trunk
| -rw-r--r-- | core/s2smanager.lua | 1 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index f0b802d8..bc336372 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -506,6 +506,7 @@ end local resting_session = { -- Resting, not dead destroyed = true; + type = "s2s_destroyed"; open_stream = function (session) session.log("debug", "Attempt to open stream on resting session"); end; diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 5fa757d6..9fe012b1 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -68,6 +68,7 @@ end local resting_session = { -- Resting, not dead destroyed = true; + type = "c2s_destroyed"; close = function (session) session.log("debug", "Attempt to close already-closed session"); end; |