com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/intl/collator/collator_class.c ext/intl/php_intl. c

Commit:    2735318c7b8a464488e9bfe6c4f88921186b3fe2
Author:    Joe Watkins <[email protected]>         Tue, 2 May 2017 06:21:17 +0100
Parents:   023cbdb2ca0dd9fc0d86c95a0d7f97cf30d36818 f50df1d0e33aaf5007670966ca067318e064df82
Branches:  PHP-7.1 master

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

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

* PHP-7.0:
  Fix bug #74468 wrong reflection on Collator::sortWithSortKeys

Bugs:
https://bugs.php.net/74468

Changed paths:
  MM  NEWS
  MM  ext/intl/collator/collator_class.c
  MM  ext/intl/php_intl.c


Diff:
diff --cc NEWS
index 891c444,ec8b4f9..959298f
--- a/NEWS
+++ b/NEWS
@@@ -1,20 -1,16 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.20
 +?? ??? 2017, PHP 7.1.6
  
- 
+ - intl:
+   . Fixed bug #74468 (wrong reflection on Collator::sortWithSortKeys). (villfa)
  
 -11 May 2017 PHP 7.0.19
 +11 May 2017, PHP 7.1.5
  
  - Core:
 +  . Fixed bug #74408 (Endless loop bypassing execution time limit). (Laruence)
 +  . Fixed bug #74353 (Segfault when killing within bash script trap code).
 +    (Laruence)
 +  . Fixed bug #74340 (Magic function __get has different behavior in php 7.1.x).
 +    (Nikita)
    . Fixed bug #74188 (Null coalescing operator fails for undeclared static
      class properties). (tpunt)
 -  . Fixed bug #74408 (Endless loop bypassing execution time limit). (Laruence)
 +  . Fixed bug #74444 (multiple catch freezes in some cases). (David Matějka)
    . Fixed bug #74410 (stream_select() is broken on Windows Nanoserver).
      (Matt Ficken)
    . Fixed bug #74337 (php-cgi.exe crash on facebook callback).