Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge
Fri, 10 Apr 2009 10:31:47 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Fri, 10 Apr 2009 10:31:47 +0100
- changeset 975
- 452ff29e296d
- parent 974
- 82f7261c0482 (current diff)
- parent 972
- 144d0ad17389 (diff)
- child 976
- 17af9851c81d
Merge
--- a/prosody Fri Apr 10 10:31:38 2009 +0100 +++ b/prosody Fri Apr 10 10:31:47 2009 +0100 @@ -115,7 +115,7 @@ eventmanager.fire_event("server-starting"); -local global_ssl_ctx = config.get("*", "core", "ssl"); +local global_ssl_ctx = ssl and config.get("*", "core", "ssl"); if global_ssl_ctx then local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; }; setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
