Merge pull request #15015 from omoerbeek/backport-15010-to-rec-5.2.x

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)

committer GitHub <noreply@github.com>

Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)
committer GitHub <noreply@github.com>
Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)
diff --cc pdns/recursordist/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/rec-tcp.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)
committer	GitHub <noreply@github.com>
	Fri, 10 Jan 2025 09:04:52 +0000 (10:04 +0100)
		1	2
pdns/recursordist/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history