Merge 0.9->0.10 again

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 9b574bc8eff9c45985174ff1e20c9cdd91dbdeb1..086887fbcc9a9b63ccd078c3a65804481d12a419 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2012 Matthew Wild
 -- Copyright (C) 2008-2012 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -45,6 +45,11 @@ local function get_base_path(host_module, app_name, default_app_path)
                :gsub("%$(%w+)", { host = host_module.host });
 end
 
+local function redir_handler(event)
+       event.response.headers.location = event.request.path.."/";
+       return 301;
+end
+
 local ports_by_scheme = { http = 80, https = 443, };
 
 -- Helper to deduce a module's external URL
@@ -101,6 +106,9 @@ function module.add_host(module)
                                                local path = event.request.path:sub(base_path_len);
                                                return _handler(event, path);
                                        end;
+                                       module:hook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
+                               elseif event_name:sub(-1, -1) == "/" then
+                                       module:hook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
                                end
                                if not app_handlers[event_name] then
                                        app_handlers[event_name] = handler;
@@ -119,7 +127,7 @@ function module.add_host(module)
                        module:log("warn", "Not listening on any ports, '%s' will be unreachable", app_name);
                end
        end
-       
+
        local function http_app_removed(event)
                local app_handlers = apps[event.item.name];
                apps[event.item.name] = nil;
@@ -127,7 +135,7 @@ function module.add_host(module)
                        module:unhook_object_event(server, event, handler);
                end
        end
-       
+
        module:handle_items("http-provider", http_app_added, http_app_removed);
 
        server.add_host(host);
@@ -150,7 +158,13 @@ module:provides("net", {
        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]";
        };