diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
| commit | 6f1ffa163d7e1624892aead18a400744750f29f8 (patch) | |
| tree | a2ed9fcc1c1496bdcbdf1da40e868aa4d50246fa /core/certmanager.lua | |
| parent | 6d2aec4a34dde4d20cc4a6f7e0a9a6db8057a630 (diff) | |
| parent | e0c0cffcc27601ec9e4dd3d6fcb556baa21f1e21 (diff) | |
| download | prosody-6f1ffa163d7e1624892aead18a400744750f29f8.tar.gz prosody-6f1ffa163d7e1624892aead18a400744750f29f8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 7ad7b034..b2c358fe 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -8,7 +8,7 @@ local configmanager = require "core.configmanager"; local log = require "util.logger".init("certmanager"); -local ssl = ssl; +local ssl = _G.ssl; local ssl_newcontext = ssl and ssl.newcontext; local new_config = require"util.sslconfig".new; |