# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1398029985 -7200
# Node ID be10c6c5aa7f3024107e45397d93e963c2583a78
# Parent  31b2f82e2d3c6f884d12f2f2962befb0a806966a# Parent  821756a862b085684e466f0e2ce6cac5323d6e84
Merge 0.10->trunk

diff -r 31b2f82e2d3c -r be10c6c5aa7f core/certmanager.lua
--- a/core/certmanager.lua	Tue Apr 15 21:54:44 2014 +0200
+++ b/core/certmanager.lua	Sun Apr 20 23:39:45 2014 +0200
@@ -111,7 +111,9 @@
 	for option in pairs(set_options) do
 		local merged = {};
 		merge_set(core_defaults[option], merged);
-		merge_set(global_ssl_config[option], merged);
+		if global_ssl_config then
+			merge_set(global_ssl_config[option], merged);
+		end
 		merge_set(user_ssl_config[option], merged);
 		local final_array = {};
 		for opt, enable in pairs(merged) do
diff -r 31b2f82e2d3c -r be10c6c5aa7f plugins/mod_http.lua
--- a/plugins/mod_http.lua	Tue Apr 15 21:54:44 2014 +0200
+++ b/plugins/mod_http.lua	Sun Apr 20 23:39:45 2014 +0200
@@ -142,7 +142,13 @@
 	listener = server.listener;
 	default_port = 5281;
 	encryption = "ssl";
-	ssl_config = { verify = "none" };
+	ssl_config = {
+		verify = {
+			peer = false,
+			client_once = false,
+			"none",
+		}
+	};
 	multiplex = {
 		pattern = "^[A-Z]";
 	};
diff -r 31b2f82e2d3c -r be10c6c5aa7f plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Apr 15 21:54:44 2014 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Sun Apr 20 23:39:45 2014 +0200
@@ -510,22 +510,10 @@
 	end
 end
 
-function session_open_stream(session, from, to)
-	local attr = {
-		["xmlns:stream"] = 'http://etherx.jabber.org/streams',
-		xmlns = 'jabber:server',
-		version = session.version and (session.version > 0 and "1.0" or nil),
-		["xml:lang"] = 'en',
-		id = session.streamid,
-		from = from, to = to,
-	}
+function session_stream_attrs(session, from, to, attr)
 	if not from or (hosts[from] and hosts[from].modules.dialback) then
 		attr["xmlns:db"] = 'jabber:server:dialback';
 	end
-
-	session.sends2s("<?xml version='1.0'?>");
-	session.sends2s(st.stanza("stream:stream", attr):top_tag());
-	return true;
 end
 
 -- Session initialization logic shared by incoming and outgoing
@@ -540,7 +528,7 @@
 		session.stream:reset();
 	end
 
-	session.open_stream = session_open_stream;
+	session.stream_attrs = session_stream_attrs;
 
 	local filter = session.filter;
 	function session.data(data)
diff -r 31b2f82e2d3c -r be10c6c5aa7f util/xmppstream.lua
--- a/util/xmppstream.lua	Tue Apr 15 21:54:44 2014 +0200
+++ b/util/xmppstream.lua	Sun Apr 20 23:39:45 2014 +0200
@@ -252,6 +252,9 @@
 			id = session.streamid or "",
 			from = from or session.host, to = to,
 		};
+		if session.stream_attrs then
+			session:stream_attrs(from, to, attr)
+		end
 		send("<?xml version='1.0'?>");
 		send(st.stanza("stream:stream", attr):top_tag());
 		return true;