Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)
author Peter Kokot <peterkokot@gmail.com>
Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)
diff --cc configure.ac
Simple merge
diff --cc ext/standard/url.c
Simple merge
diff --cc main/php.h
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Mon, 8 Jul 2019 13:06:54 +0000 (15:06 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/url.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php.h	patch \|	diff1 \|	diff2 \|	blob \| history