aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
commit0bd91699304e6e338d4bc934f331349d70debaac (patch)
treeec81453553be8ea932864b20a1965d5b58e84ec0 /plugins
parente031950b06248d986bbad686ea667e5f4a920dad (diff)
downloadprosody-0bd91699304e6e338d4bc934f331349d70debaac.tar.gz
prosody-0bd91699304e6e338d4bc934f331349d70debaac.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_http.lua8
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 086887fb..598028ee 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -158,13 +158,7 @@ module:provides("net", {
listener = server.listener;
default_port = 5281;
encryption = "ssl";
- ssl_config = {
- verify = {
- peer = false,
- client_once = false,
- "none",
- }
- };
+ ssl_config = default_ssl_config;
multiplex = {
pattern = "^[A-Z]";
};