]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 24 Oct 2019 12:47:15 +0000 (14:47 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 24 Oct 2019 12:47:15 +0000 (14:47 +0200)
* PHP-7.4:
  Skip large ftruncate test if large files not supported
  Don't test "blocks" in lstat_stat_variation7.phpt
  Increase FD used in php://fd test
  Use posix_getuid() to check for root in pcntl_setpriority() test


Trivial merge