com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_stdio.c
| From: | Ferenc Kovacs | Date: | Mon, 30 Jun 2014 16:38:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_stdio.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79158@lists.php.net to get a copy of this message | ||
Commit: d810c2139fa16953d1a1661e8616046716dd247c
Author: Ferenc Kovacs <tyrael@php.net> Mon, 30 Jun 2014 18:38:54 +0200
Parents: 3ec93ee19f174f27285872515d236028f0e079f9 e5fdb5b3f02fcb61efa5aa7d6e5ccd15838470a2
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=d810c2139fa16953d1a1661e8616046716dd247c
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Bugs:
https://bugs.php.net/67530
Changed paths:
MM sapi/fpm/fpm/fpm_stdio.c
Diff: