]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 5 Aug 2020 13:44:04 +0000 (15:44 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 5 Aug 2020 13:44:04 +0000 (15:44 +0200)
* PHP-7.4:
  Fixed bug #79930
  Fix iov_base pointer type for illumos
  Backport bless_tests.php changes from PHP 8

1  2 
ext/opcache/zend_file_cache.c
ext/standard/array.c

Simple merge
Simple merge