Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 03 Dec 2015 16:13:12 +0000
changeset 6967 ed5440a6ef7f
parent 6965 2bb6586eacdd
child 6968 5360bdf93fce
Merge 0.10->trunk
plugins/mod_http.lua
--- a/plugins/mod_http.lua	Thu Dec 03 16:46:24 2015 +0100
+++ b/plugins/mod_http.lua	Thu Dec 03 16:13:12 2015 +0000
@@ -158,13 +158,7 @@
 	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]";
 	};