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

Commit:    c05c65ac806b77a8d00242a8ea9244ef3dc2e464
Author:    Aaron Piotrowski <[email protected]>         Thu, 23 Feb 2017 21:18:09 -0600
Parents:   be60d159b6246efc6e6b63a4a7c8426f89f84534 cc105150565676518d0bc72579c8b18ef792ef87
Branches:  PHP-7.1

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

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

Changed paths:
  MM  NEWS
  MM  ext/openssl/xp_ssl.c


Diff:
diff --cc NEWS
index c988fa0,ee4c87e..492b4be
--- 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