From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 23 Apr 2017 09:59:34 +0000 (+0100)
Subject: [Minor] Add Lua 5.3 workaround
X-Git-Tag: 1.6.0~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8780f6f9d7b86235d05dd8b020b35809c81cda4e;p=thirdparty%2Frspamd.git

[Minor] Add Lua 5.3 workaround
---

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index dfcb29386b..aeb5ca75f7 100644
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -44,6 +44,7 @@ end
 local redis_params
 local whitelisted_ip
 local whitelist_domains_map = nil
+local toint =math.ifloor or math.floor
 local settings = {
   expire = 86400, -- 1 day by default
   timeout = 300, -- 5 minutes by default
@@ -328,18 +329,18 @@ local function greylist_set(task)
       true, -- is write
       redis_set_cb, --callback
       'EXPIRE', -- command
-      {body_key, tostring(settings['expire'])} -- arguments
+      {body_key, tostring(toint(settings['expire']))} -- arguments
     )
     -- Update greylisting record expire
     if ret then
       conn:add_cmd('EXPIRE', {
-        meta_key, tostring(settings['expire'])
+        meta_key, tostring(toint(settings['expire']))
       })
     else
       rspamd_logger.errx(task, 'got error while connecting to redis')
     end
   elseif do_greylisting or do_greylisting_required then
-    local t = tostring(math.floor(rspamd_util.get_time()))
+    local t = tostring(toint(rspamd_util.get_time()))
     local end_time = rspamd_util.time_to_string(t + settings['timeout'])
     rspamd_logger.infox(task, 'greylisted until "%s", new record', end_time)
     task:insert_result(settings['symbol'], 0.0, 'greylisted', end_time,
@@ -354,12 +355,12 @@ local function greylist_set(task)
       true, -- is write
       redis_set_cb, --callback
       'SETEX', -- command
-      {body_key, tostring(settings['expire']), t} -- arguments
+      {body_key, tostring(toint(settings['expire'])), t} -- arguments
     )
 
     if ret then
       conn:add_cmd('SETEX', {
-        meta_key, tostring(settings['expire']), t
+        meta_key, tostring(toint(settings['expire'])), t
       })
     else
       rspamd_logger.errx(task, 'got error while connecting to redis')