Merge branch 'PHP-7.1' into PHP-7.2

This commit is contained in:
Nikita Popov 2017-12-15 22:04:24 +01:00
commit eb77c2c2a7
2 changed files with 4 additions and 1 deletions

2
NEWS
View File

@ -20,6 +20,8 @@ PHP NEWS
(Daniel Ciochiu)
. Fixed bug #75074 (php-process crash when is_file() is used with strings
longer 260 chars). (Anatol)
. Fixed bug #69727 (Remove timestamps from build to make it reproducible).
(jelle van der Waa)
- CLI server:
. Fixed bug #73830 (Directory does not exist). (Anatol)

View File

@ -1268,7 +1268,8 @@ fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
PHP_BUILD_DATE=`date '+%Y-%m-%d'`
# SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/
PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d`
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
PHP_UNAME=`uname -a | xargs`