Merge 0.9 -> 0.10

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 9a88eac0b227e65406608276a3f4e861fe78ef94..1a0f6ff2d76119f7907785187a94e0541be72079 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -264,12 +264,6 @@ function init_global_state()
                prosody.events.fire_event("server-stopping", {reason = reason});
                server.setquitting(true);
        end
-
-       -- Load SSL settings from config, and create a ctx table
-       local certmanager = require "core.certmanager";
-       local global_ssl_ctx = certmanager.create_context("*", "server");
-       prosody.global_ssl_ctx = global_ssl_ctx;
-
 end
 
 function read_version()