diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
| commit | 7b609609f929e1125b9347d7fb0b8e080da3ce5c (patch) | |
| tree | 3cab508593e54c925311eb26dca38f0bc86ee3d4 | |
| parent | bd7661932c7f620a72cbded20299e72d9e83e5c0 (diff) | |
| parent | b246855e0a0f1dd97e0fd509388ca8fc8596e62e (diff) | |
| download | prosody-7b609609f929e1125b9347d7fb0b8e080da3ce5c.tar.gz prosody-7b609609f929e1125b9347d7fb0b8e080da3ce5c.zip | |
Merge 0.10->trunk
| -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 a4c9d891..29a5a6c8 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -36,7 +36,7 @@ local resolve_path = require"util.paths".resolve_relative_path; local config_path = prosody.paths.config; local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)"); -local luasec_version = luasec_major * 100 + luasec_minor; +local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor); local luasec_has = { -- TODO If LuaSec ever starts exposing these things itself, use that instead cipher_server_preference = luasec_version >= 2; |