com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/spl/spl_fixedarray.c

[email protected] (Nikita Popov) Wed, 24 May 2017 16:02:13 +0000

Newsgroups	php.cvs
Message-ID	<[email protected]>

Commit:    e7a706502475872928848f6606390eb77d274fdf
Author:    Nikita Popov <[email protected]>         Wed, 24 May 2017 18:01:56 +0200
Parents:   e535b80257b2ef3a515d0833a40e96788ba830e2 872e43d6e55e4af84681b259198ee688287cd40d
Branches:  PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=e7a706502475872928848f6606390eb77d274fdf

Log:
Merge branch 'PHP-7.0' into PHP-7.1

Changed paths:
  MM  NEWS
  MM  ext/spl/spl_fixedarray.c


Diff:
diff --cc NEWS
index 4558e98,daab8dc..d7fc713
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.21
 +?? ??? 2017, PHP 7.1.7
  
- 
+ - SPL:
+   . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
+     (jhdxr)
  
 -8 Jun 2017 PHP 7.0.20
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).