]> git.ipfire.org Git - thirdparty/rspamd.git/commit
Merge branch 'master' into vstakhov-fuzzy-tcp-rework
authorVsevolod Stakhov <vsevolod@rspamd.com>
Thu, 9 Oct 2025 07:31:51 +0000 (08:31 +0100)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Thu, 9 Oct 2025 07:31:51 +0000 (08:31 +0100)
commit27b416a536e22dab25febba3c8fa3ccbfdbfbde0
tree1da753f2f9dab70a72ff6aedbe64152d89e99ea1
parentc4999f8d625d8e8e898a7675addcb4a8c41ed804
parent698fb83b99c5835d7e36f3e16f86d423910a400c
Merge branch 'master' into vstakhov-fuzzy-tcp-rework

Resolved conflict in src/plugins/fuzzy_check.c by including both:
- HTML shingles configuration parsing from master
- TCP connection initialization from feature branch

Fixed trailing whitespace in config files from master.
conf/modules.d/fuzzy_check_html.conf
src/libserver/protocol.c
src/plugins/fuzzy_check.c
test/functional/configs/fuzzy_html_test.conf
test/functional/messages/html_phishing.eml