Merge 0.9->0.10

[prosody.git] / prosody

diff --git a/prosody b/prosody
index ee2baca500062bb3b5bf293ce1b65810b9d9cbbe..b411370fb1f0b63e4d8ed0f9d7c24061525c8545 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -265,12 +265,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()