Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 14 May 2015 00:22:56 +0200
changeset 6695 93eefa92527d
parent 6692 53bfca69c48b (current diff)
parent 6694 c6c996410064 (diff)
child 6696 365f0f885aa5
child 6697 fc45dc6d604c
Merge 0.9->0.10
core/s2smanager.lua file | annotate | diff | comparison | revisions 
--- a/core/s2smanager.lua	Wed May 13 22:32:40 2015 +0200
+++ b/core/s2smanager.lua	Thu May 14 00:22:56 2015 +0200
@@ -64,6 +64,7 @@
 
 	function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
 	function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
+	session.sends2s = session.send;
 	return setmetatable(session, resting_session);
 end
prosody