# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1413280794 -3600
# Node ID ee13d7dfa9889b3c3d76cce8428c558615989745
# Parent  93ffe59a9546a9895acf734c395f2467d2556112# Parent  7c8f58d2b3315d01447df52dff48965482f6eb42
Merge 0.10->trunk

diff -r 93ffe59a9546 -r ee13d7dfa988 plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Wed Oct 08 18:47:01 2014 -0400
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Tue Oct 14 10:59:54 2014 +0100
@@ -18,7 +18,7 @@
 	["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
 	["item-not-found"] = { "cancel", "item-not-found" };
 	["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
-	["forbidden"] = { "cancel", "forbidden" };
+	["forbidden"] = { "auth", "forbidden" };
 	["not-allowed"] = { "cancel", "not-allowed" };
 };
 local function pubsub_error_reply(stanza, error)
diff -r 93ffe59a9546 -r ee13d7dfa988 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Wed Oct 08 18:47:01 2014 -0400
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Oct 14 10:59:54 2014 +0100
@@ -47,7 +47,7 @@
 local function bounce_sendq(session, reason)
 	local sendq = session.sendq;
 	if not sendq then return; end
-	session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
+	session.log("info", "Sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
 	local dummy = {
 		type = "s2sin";
 		send = function(s)
diff -r 93ffe59a9546 -r ee13d7dfa988 prosody
--- a/prosody	Wed Oct 08 18:47:01 2014 -0400
+++ b/prosody	Tue Oct 14 10:59:54 2014 +0100
@@ -151,13 +151,11 @@
 	-- for neat sandboxing of modules
 	local _realG = _G;
 	local _real_require = require;
-	if not getfenv then
+	local getfenv = getfenv or function (f)
 		-- FIXME: This is a hack to replace getfenv() in Lua 5.2
-		function getfenv(f)
-			local name, env = debug.getupvalue(debug.getinfo(f or 1).func, 1);
-			if name == "_ENV" then
-				return env;
-			end
+		local name, env = debug.getupvalue(debug.getinfo(f or 1).func, 1);
+		if name == "_ENV" then
+			return env;
 		end
 	end
 	function require(...)