Diff

core/certmanager.lua @ 6557:8aa967c81cbc

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 21 Jan 2015 01:29:00 +0000
parent 6547:2f65de21ff56
child 6564:bcf32653cab7
line wrap: on
line diff
--- a/core/certmanager.lua	Mon Jan 19 14:09:13 2015 -0500
+++ b/core/certmanager.lua	Wed Jan 21 01:29:00 2015 +0000
@@ -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;