diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-26 11:04:57 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-26 11:05:22 +0100 |
| commit | 8b59e4e8972629d59a1f29d0a371cf68bf7087f2 (patch) | |
| tree | c34adeac492866526c74d4c759fdd62afa16b48c | |
| parent | 2e84f4d16adf41e3f9e777578af78e9dc374fc12 (diff) | |
| parent | 2be27074b6e165d8d3e282150d02aa8abfcfec5e (diff) | |
| download | php-git-8b59e4e8972629d59a1f29d0a371cf68bf7087f2.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/date/config.w32 | 1 | ||||
| -rw-r--r-- | ext/standard/config.w32 | 1 |
3 files changed, 6 insertions, 0 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 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 --git a/ext/date/config.w32 b/ext/date/config.w32 index abf12dc732..bec0d709cf 100644 --- a/ext/date/config.w32 +++ b/ext/date/config.w32 @@ -1,6 +1,7 @@ // 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"); ADD_FLAG('CFLAGS_DATE', "/wd4244"); diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 0f47242145..b42efd3c85 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -37,5 +37,6 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ 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_STANDARD = "yes"; ADD_MAKEFILE_FRAGMENT(); PHP_INSTALL_HEADERS("", "ext/standard"); |