Merge 0.10->trunk

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 086887fbcc9a9b63ccd078c3a65804481d12a419..598028ee477ad7586d92e5ae2cd7d76a271d836e 100644 (file)
--- 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]";
        };