From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 17 Feb 2017 17:43:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c240feb7f4471d26b9622f48990e78203145fca6;p=php

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

c240feb7f4471d26b9622f48990e78203145fca6
diff --cc NEWS
index 60d961e7e1,6f9c15ca13..8f0fb75e90
--- a/NEWS
+++ b/NEWS
@@@ -46,9 -52,10 +46,11 @@@ PH
  - Standard:
    . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
      (Anatol)
 +  . Fixed bug #74041 (substr_count with length=0 broken). (Nikita)
    . Fixed bug #73118 (is_callable callable name reports misleading value for
      anonymous classes). (Adam Saponara)
+   . Fixed bug #74105 (PHP on Linux should use /dev/urandom when getrandom is
+     not available). (Benjamin Robin)
  
  - Streams:
    . Fixed bug #73496 (Invalid memory access in zend_inline_hash_func).