Merge pull request #19383 from keszybz/test58-fixes

author Frantisek Sumsal <frantisek@sumsal.cz>

Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)

committer GitHub <noreply@github.com>

Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)
author Frantisek Sumsal <frantisek@sumsal.cz>
Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)
committer GitHub <noreply@github.com>
Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)
diff --cc src/core/service.c
Simple merge
diff --cc test/test-functions
Simple merge
author	Frantisek Sumsal <frantisek@sumsal.cz>
	Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)
committer	GitHub <noreply@github.com>
	Mon, 26 Apr 2021 17:16:44 +0000 (19:16 +0200)
		1	2
src/core/service.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history