Merge branch 'PHP-7.3' into PHP-7.4

author Nikita Popov <nikita.ppv@gmail.com>

Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)
diff --cc ext/curl/interface.c
Simple merge
diff --cc ext/curl/sync-constants.php

index 08d2d28460ea1ad22a58c56b0c0999708db64519,f8f7ba4c24fb598ff62dec6cc55444c2465cb45d..2db773d5f80a1c0ecd1185d5f96d6b30b8c9a39b

mode 100755,100644..100755
--- 1/ext/curl/sync-constants.php
--- 2/ext/curl/sync-constants.php
+++ b/ext/curl/sync-constants.php
author	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)
		1	2
ext/curl/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/curl/sync-constants.php	patch \|	diff1 \|	diff2 \|	blob \| history