com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS
| From: | Joe Watkins | Date: | Mon, 23 Jan 2017 16:56:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96850@lists.php.net to get a copy of this message | ||
Commit: 9aad38038e8bd41b9bf89c00804943509e10fe1a
Author: Joe Watkins <krakjoe@php.net> Mon, 23 Jan 2017 16:55:43 +0000
Parents: 9d7054693ec2cb81b5e061a6c9efbda4f9c9d410 80a851b4dd622f5825e46a7318bdd80123205b02
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9aad38038e8bd41b9bf89c00804943509e10fe1a
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #69865 php-fpm does not close stderr when using syslog
Bugs:
https://bugs.php.net/69865
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 488e990,e76d755..425a90e
--- a/NEWS
+++ b/NEWS
@@@ -13,10 -12,12 +13,14 @@@ PH
- DTrace:
. Fixed bug #73965 (DTrace reported as enabled when disabled). (Remi)
+- FCGI:
+ . Fixed bug #73904 (php-cgi fails to load -c specified php.ini file). (Anatol)
+ . Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol)
+
+ - FPM:
- . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
- (Dmitry Saprykin)
+ . Fixed bug #69865 (php-fpm does not close stderr when using syslog).
+ (m6w6)
+
- GD:
. Fixed bug #73968 (Premature failing of XBM reading). (cmb)