aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 14:59:03 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 14:59:03 +0000
commit9613171fcbd245d285a95acc6cf7e3134469e5c5 (patch)
tree6d22aff1fd5c281d8280845d0646631ddd0e9daa /core/s2smanager.lua
parent02971394f90dde48ed352ebc1936258647f7ab3c (diff)
parent6fc597e709bcd9328e9309f05b55b1c2097cfebe (diff)
downloadprosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.tar.gz
prosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.zip
Merge 0.7->trunk
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua1
1 files changed, 1 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;