prosody
194f540e13e2

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

7867:194f540e13e2

util.sslconfig: Remvoe flag merging for 'verify' as this is more of a tri-state field than a set of options
author Kim Alvefur <zash@zash.se>
date Thu, 26 Jan 2017 14:18:30 +0100
parents 7866:b6d99132d7dc
children 7868:11fcdef5022f 7869:eb5fba4c8074
files plugins/mod_http.lua util/sslconfig.lua
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_http.lua	Wed Jan 25 11:18:00 2017 +0100
+++ b/plugins/mod_http.lua	Thu Jan 26 14:18:30 2017 +0100
@@ -162,11 +162,7 @@
 	default_port = 5281;
 	encryption = "ssl";
 	ssl_config = {
-		verify = {
-			peer = false,
-			client_once = false,
-			"none",
-		}
+		verify = "none";
 	};
 	multiplex = {
 		pattern = "^[A-Z]";
--- a/util/sslconfig.lua	Wed Jan 25 11:18:00 2017 +0100
+++ b/util/sslconfig.lua	Thu Jan 26 14:18:30 2017 +0100
@@ -36,7 +36,6 @@
 	config[field] = options;
 end
 
-handlers.verify = handlers.options;
 handlers.verifyext = handlers.options;
 
 -- finalisers take something produced by handlers and return what luasec
@@ -53,7 +52,6 @@
 	return output;
 end
 
-finalisers.verify = finalisers.options;
 finalisers.verifyext = finalisers.options;
 
 -- We allow ciphers to be a list