From: Aaron Piotrowski <aaron@trowski.com>
Date: Fri, 24 Feb 2017 03:18:09 +0000 (-0600)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~333^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c05c65ac806b77a8d00242a8ea9244ef3dc2e464;p=php

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

c05c65ac806b77a8d00242a8ea9244ef3dc2e464
diff --cc NEWS
index c988fa0f31,ee4c87e5b2..492b4bef0c
--- a/NEWS
+++ b/NEWS
@@@ -42,12 -49,14 +42,14 @@@ PH
  - OpenSSL:
    . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file).
      (Anatol)
 +  . Fixed bug #74099 (Memory leak with openssl_encrypt()). (Andrew Nester)
+   . Fixed bug #74159 (Writing a large buffer to a non-blocking encrypted stream
+     fails with "bad write retry"). (trowski)
  
  - Standard:
 -  . Fixed bug #74148 (ReflectionFunction incorrectly reports the number of
 -    arguments). (Laruence)
    . 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