Merge branch 'PHP-7.3' into PHP-7.4

author George Wang <gwang@php.net>

Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)

committer George Wang <gwang@php.net>

Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)
author George Wang <gwang@php.net>
Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)
committer George Wang <gwang@php.net>
Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)
diff --cc sapi/litespeed/lsapi_main.c
Simple merge
diff --cc sapi/litespeed/lsapilib.c
Simple merge
author	George Wang <gwang@php.net>
	Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)
committer	George Wang <gwang@php.net>
	Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)
		1	2
sapi/litespeed/lsapi_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/litespeed/lsapilib.c	patch \|	diff1 \|	diff2 \|	blob \| history