Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

diff --cc NEWS
index 67e9240fa57e100a9c6fdc3e22c429f466364615,a818b50641e1f8a28f8f83c85c35fe9fd9c6335a..a5bc03b9aba802a7cad2cbcac1e7b74256c3464b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.25
 +?? ??? 2020, PHP 7.4.13
  
+ - Core:
+   . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
+     (cmb)
+ 
  - IMAP:
    . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
    . Fixed bug #76618 (segfault on imap_reopen). (girgias)

diff --cc ext/date/config.w32
index abf12dc7320fdb4bec8cee265d65751ab95788b7,ad3256bf327663fb0efc04032e39d8480aae178a..bec0d709cff4ce795cb25e3b0e0494ec4f0136e4
mode 100644,100755..100644
--- 1/ext/date/config.w32
--- 2/ext/date/config.w32
+++ b/ext/date/config.w32
@@@ -1,7 -1,9 +1,8 @@@
  // vim:ft=javascript
  
  EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /DHAVE_TIMELIB_CONFIG_H=1");
+ PHP_DATE = "yes";
  ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date");
 -AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
  
  ADD_FLAG('CFLAGS_DATE', "/wd4244");
  

diff --cc ext/standard/config.w32
index 0f47242145506f903cf72c6b6de8890eb86caf29,2ce197b9d74a6c0b7f4a92be49f42b91a3b6b65b..b42efd3c857ecdbd43249cbd8b6257d8d057d5ca
--- 1/ext/standard/config.w32
--- 2/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@@ -37,5 -37,10 +37,6 @@@ EXTENSION("standard", "array.c base64.
        user_filters.c uuencode.c filters.c proc_open.c password.c \
        streamsfuncs.c http.c flock_compat.c random.c hrtime.c", false /* never shared */,
        '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 -PHP_INSTALL_HEADERS("", "ext/standard");
+ PHP_STANDARD = "yes";
 -if (PHP_MBREGEX != "no") {
 -      CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")
 -}
  ADD_MAKEFILE_FRAGMENT();
  PHP_INSTALL_HEADERS("", "ext/standard");