Mercurial > prosody-hg

comparison core/certmanager.lua @ 6526:873538f0b18c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
certmanager, mod_tls: Return final ssl config as third return value (fix for c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
author Kim Alvefur <zash@zash.se>
date Sat, 22 Nov 2014 11:51:54 +0100
parents c6caaa440e74
children 2f65de21ff56
comparison
equal deleted inserted replaced
6524:185817ef4a4d 6526:873538f0b18c
135 end 135 end
136 log("error", "SSL/TLS: Failed to load '%s': %s (for %s)", file, reason, host); 136 log("error", "SSL/TLS: Failed to load '%s': %s (for %s)", file, reason, host);
137 else 137 else
138 log("error", "SSL/TLS: Error initialising for %s: %s", host, err); 138 log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
139 end 139 end
140 else
141 err = nil;
142 end 140 end
143 return ctx, err or user_ssl_config; 141 return ctx, err, user_ssl_config;
144 end 142 end
145 143
146 function reload_ssl_config() 144 function reload_ssl_config()
147 global_ssl_config = configmanager.get("*", "ssl"); 145 global_ssl_config = configmanager.get("*", "ssl");
148 if luasec_has_no_compression then 146 if luasec_has_no_compression then