Software / code / prosody
Changeset
2916:c29ecf0cadff
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:59:03 +0000 |
| parents | 2914:9f6fec37d3e2 (current diff) 2915:f47bd0f7e2e6 (diff) |
| children | 2919:8ce6b680975a |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Mon Mar 22 14:38:01 2010 +0000 +++ b/core/s2smanager.lua Mon Mar 22 14:59:03 2010 +0000 @@ -506,6 +506,7 @@ 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;
--- a/core/sessionmanager.lua Mon Mar 22 14:38:01 2010 +0000 +++ b/core/sessionmanager.lua Mon Mar 22 14:59:03 2010 +0000 @@ -68,6 +68,7 @@ local resting_session = { -- Resting, not dead destroyed = true; + type = "c2s_destroyed"; close = function (session) session.log("debug", "Attempt to close already-closed session"); end;
