Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)
author Peter Kokot <peterkokot@gmail.com>
Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)
diff --cc Zend/Zend.m4
Simple merge
diff --cc ext/standard/string.c
Simple merge
diff --cc main/php.h
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)
		1	2
Zend/Zend.m4	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php.h	patch \|	diff1 \|	diff2 \|	blob \| history