aboutsummaryrefslogtreecommitdiffstats
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
commitfd8f4e67d9cdf6c5de7ea86392573bfd7029160f (patch)
treeec81453553be8ea932864b20a1965d5b58e84ec0
parentde08c46b98679ccab99e06bb9150a40984f2cf4e (diff)
downloadprosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.tar.gz
prosody-fd8f4e67d9cdf6c5de7ea86392573bfd7029160f.zip
Merge 0.10->trunk
-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]";
};