Merge 0.9->0.10

diff --cc core/modulemanager.lua
index b5674ece74d55e8c6ba35823035c2cd5850d5f9b,4df950697d905984808ac38eec0d030b36f9c9cf..db4c6bd0f3fbef4d1c70198448a7287fcf576247
--- 1/core/modulemanager.lua
--- 2/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@@ -121,9 -121,9 +121,9 @@@ local function do_load_module(host, mod
        if not modulemap[host] then
                modulemap[host] = hosts[host].modules;
        end
 -      
 +
        if modulemap[host][module_name] then
-               log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
+               log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
                return nil, "module-already-loaded";
        elseif modulemap["*"][module_name] then
                local mod = modulemap["*"][module_name];

diff --cc net/http/server.lua
Simple merge

diff --cc plugins/mod_c2s.lua
Simple merge

diff --cc plugins/mod_compression.lua
Simple merge

diff --cc plugins/mod_posix.lua
Simple merge

diff --cc plugins/mod_s2s/mod_s2s.lua
index f177bf8261dc002cd7a3e667b4fefb62d28be62e,4433442852329a406988ac7f02827946360b29a3..8614b8570933085a79dc5dfaeb251e9bf042862e
--- 1/plugins/mod_s2s/mod_s2s.lua
--- 2/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@@ -494,13 -523,13 +496,14 @@@ en
  -- Session initialization logic shared by incoming and outgoing
  local function initialize_session(session)
        local stream = new_xmpp_stream(session, stream_callbacks);
 +      local log = session.log or log;
        session.stream = stream;
 -      
 +
        session.notopen = true;
 -              
 +
        function session.reset_stream()
                session.notopen = true;
+               session.streamid = nil;
                session.stream:reset();
        end
  

diff --cc prosodyctl
Simple merge

diff --cc util/filters.lua
index c2bdca070229f0f7ae6d9c816b56bea255c1efca,6290e53b1744bf82c7c24a0cdeb6b759aaf12a3c..427dcb7cafa14f8cf2f4818393ae9b8221ac6655
--- 1/util/filters.lua
--- 2/util/filters.lua
+++ b/util/filters.lua
@@@ -45,10 -45,12 +45,12 @@@ function add_filter(session, type, call
        if not filter_list then
                filter_list = {};
                session.filters[type] = filter_list;
+       elseif filter_list[callback] then
+               return; -- Filter already added
        end
 -      
 +
        priority = priority or 0;
 -      
 +
        local i = 0;
        repeat
                i = i + 1;

diff --cc util/prosodyctl.lua
index d59c163ce2f975c20b77325351a8e5be5312ca5d,c6fe1986718b87e964ff12ac9dac09d6fe5ad4c5..cc48d5907155a9eee8b5afe1183f55daaa8b0e28
--- 1/util/prosodyctl.lua
--- 2/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@@ -189,11 -189,15 +189,15 @@@ function getpid(
                return false, "no-pidfile";
        end
  
 -      local modules_enabled = set.new(config.get("*", "modules_enabled"));
 -      if not modules_enabled:contains("posix") then
+       if type(pidfile) ~= "string" then
+               return false, "invalid-pidfile";
+       end
+       
 +      local modules_enabled = set.new(config.get("*", "modules_disabled"));
 +      if prosody.platform ~= "posix" or modules_enabled:contains("posix") then
                return false, "no-posix";
        end
- 
+       
        local file, err = io.open(pidfile, "r+");
        if not file then
                return false, "pidfile-read-failed", err;

diff --cc util/xmppstream.lua
Simple merge