Merge pull request #27723 from YHNdnzj/service-restart-cleanup

author Yu Watanabe <watanabe.yu+github@gmail.com>

Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)

committer GitHub <noreply@github.com>

Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)
committer GitHub <noreply@github.com>
Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)
diff --cc src/core/socket.c
Simple merge
diff --cc src/core/timer.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)
committer	GitHub <noreply@github.com>
	Wed, 24 May 2023 20:14:52 +0000 (05:14 +0900)
		1	2
src/core/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/timer.c	patch \|	diff1 \|	diff2 \|	blob \| history