Merge 0.10->trunk

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 86689affdd12729cf036b0749928b95bbbdeadf8..49529ea28b1109c264acc8cdc1ad56d487e3ea17 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.
 --
@@ -111,7 +111,7 @@ function module.add_host(module)
                        end
                end
        end
-       
+
        local function http_app_removed(event)
                local app_handlers = apps[event.item.name];
                apps[event.item.name] = nil;
@@ -119,7 +119,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);
@@ -142,7 +142,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]";
        };