Merge 0.10->trunk

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 598028ee477ad7586d92e5ae2cd7d76a271d836e..2178e2e84ad16a9732813af00f64b3af5e00e032 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -47,6 +47,9 @@ end
 
 local function redir_handler(event)
        event.response.headers.location = event.request.path.."/";
+ if event.request.url.query then
+ event.response.headers.location = event.response.headers.location .. "?" .. event.request.url.query
+ end
        return 301;
 end
 
@@ -117,7 +120,7 @@ function module.add_host(module)
                                        module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);
                                end
                        else
-                               module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key);
+                               module:log("error", "Invalid route in %s, %q. See https://prosody.im/doc/developers/http#routes", app_name, key);
                        end
                end
                local services = portmanager.get_active_services();
@@ -158,7 +161,13 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
-       ssl_config = default_ssl_config;
+       ssl_config = {
+               verify = {
+                       peer = false,
+                       client_once = false,
+                       "none",
+               }
+       };
        multiplex = {
                pattern = "^[A-Z]";
        };