Merge 0.6.2/waqas with 0.6.2/MattJ

diff --cc core/hostmanager.lua
Simple merge

diff --cc core/s2smanager.lua
index e8d8e7231e403cdf24c7de5f23cc0e7ca5f4a10b,aabfddd600dfa9a904f7d84e751fd958a621c1d4..92f073549fa08503827d66d7c19767a36e6aee84
--- 1/core/s2smanager.lua
--- 2/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@@ -491,9 -504,7 +504,9 @@@ function mark_connected(session
        end
  end
  
- function destroy_session(session)
 +local function null_data_handler(conn, data) log("debug", "Discarding data from destroyed s2s session: %s", data); end
 +
+ function destroy_session(session, reason)
        (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
        
        if session.direction == "outgoing" then

diff --cc net/dns.lua
Simple merge

diff --cc net/httpserver.lua
Simple merge

diff --cc net/xmppserver_listener.lua
index 2ab51992c5da95bdb21cf168acccf1ee9380b321,4394eac50ededa17fb2fa3546a64b362d0136fee..86a3d7356ace928ceca3b31bef67adb2c76ece83
--- 1/net/xmppserver_listener.lua
--- 2/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@@ -159,9 -159,10 +159,9 @@@ function xmppserver.disconnect(conn, er
                        end
                end
                (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err));
-               s2s_destroy_session(session);
+               s2s_destroy_session(session, err);
                sessions[conn]  = nil;
                session = nil;
 -              collectgarbage("collect");
        end
  end
  

diff --cc plugins/mod_saslauth.lua
Simple merge

diff --cc plugins/mod_tls.lua
Simple merge

diff --cc prosody
index 55198c2fd5efb0b2447d84f70d5f0f7784b87feb,40aeac5ed8dce99f6313fed3323293b66188cd31..7f4a2cec58a38e70df493abdbdd44b8cdfb27df0
--- 1/prosody
--- 2/prosody
+++ b/prosody
@@@ -195,11 -198,11 +198,11 @@@ function init_global_state(
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..option.."_ports: "..tostring(port));
                                else
 -                                      cl.start(listener, { 
 +                                      local ok, err = cl.start(listener, {
                                                ssl = conntype ~= "tcp" and global_ssl_ctx,
                                                port = port,
-                                               interface = config.get("*", "core", option.."_interface") 
-                                                       or cl.get(listener).default_interface 
+                                               interface = (option and config.get("*", "core", option.."_interface"))
+                                                       or cl.get(listener).default_interface
                                                        or config.get("*", "core", "interface"),
                                                type = conntype
                                        });