projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5d2bfe
)
certmanager: Return final ssl config along with ssl context on success
author
Kim Alvefur
<zash@zash.se>
Wed, 19 Nov 2014 13:47:03 +0000
(14:47 +0100)
committer
Kim Alvefur
<zash@zash.se>
Wed, 19 Nov 2014 13:47:03 +0000
(14:47 +0100)
core/certmanager.lua
patch
|
blob
|
history
diff --git
a/core/certmanager.lua
b/core/certmanager.lua
index 837fe23192ef6f4882c8d882c430025e8e18bff9..3454fcc4e867081bf80cc752df9ea56bd4430798 100644
(file)
--- a/
core/certmanager.lua
+++ b/
core/certmanager.lua
@@
-137,8
+137,10
@@
function create_context(host, mode, ...)
else
log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
end
+ else
+ err = nil;
end
- return ctx, err;
+ return ctx, err
or user_ssl_config
;
end
function reload_ssl_config()