From 3f1b901db822c147d88d55270e46d5a33cd16123 Mon Sep 17 00:00:00 2001 From: Aurelien DARRAGON Date: Tue, 11 Jul 2023 11:32:55 +0200 Subject: [PATCH] EXAMPLES: maintain haproxy 2.8 retrocompatibility for lua mailers script Because of b58bd97 ("MINOR: hlua_fcn/mailers: handle timeout mail from mailers section"), latest examples/lua/mailers.lua file wouldn't work if loaded with haproxy < 2.8.2 (which is not yet released), unless it is manually recompiled from the latest code sources. But this can be an issue given that direct URL may be referenced in guides/tutorials as download link for the the script, independently from the related haproxy source code revision. ie: http://git.haproxy.org/?p=haproxy-2.8.git;a=blob_plain;f=examples/lua/mailers.lua;hb=HEAD Thus, in order to make examples/lua/mailers.lua work with previous 2.8 versions, we ensure that the script stays compatible with pre-b58bd97 code by adding extra checks in the script. This must be backported in 2.8 with b58bd97 --- examples/lua/mailers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/lua/mailers.lua b/examples/lua/mailers.lua index 0d146ff173..1c496d3af9 100644 --- a/examples/lua/mailers.lua +++ b/examples/lua/mailers.lua @@ -57,7 +57,7 @@ function smtp_send_email(server, timeout, domain, from, to, data) end end - if timeout ~= 0 then + if timeout ~= nil and timeout > 0 then tcp:settimeout(timeout / 1000) end