commit 7846b2f: Merge branch 'rspamd:master' into master

[GitHub]

Author: LBahtarliev
Date: 2023-09-12 23:59:56 +0300
URL: https://github.com/rspamd/rspamd/commit/7846b2f3203c1fefce8560fb89ef198e2323d939 (refs/pull/4595/head)

Merge branch 'rspamd:master' into master


 lualib/plugins/rbl.lua                         |  3 ++-
 lualib/rspamadm/mime.lua                       |  4 ++--
 src/lua/lua_ip.c                               | 20 ++++++++++----------
 src/plugins/lua/rbl.lua                        |  5 ++++-
 src/ragel/content_disposition.rl               |  4 ++--
 test/functional/cases/001_merged/300_rbl.robot |  5 +++++
 test/functional/configs/merged-local.conf      |  5 +++++
 test/functional/configs/merged-override.conf   |  4 ++++
 test/functional/messages/numeric_urls.eml      |  3 +++
 9 files changed, 37 insertions(+), 16 deletions(-)