com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_conf.c sapi/fpm/fpm/fpm_stdio.c
| From: | Remi Collet | Date: | Fri, 27 Jun 2014 07:51:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_conf.c sapi/fpm/fpm/fpm_stdio.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79093@lists.php.net to get a copy of this message | ||
Commit: 37aa57cd1b40029844381e22ae8ab5664a4c5482
Author: Remi Collet <remi@php.net> Fri, 27 Jun 2014 09:51:15 +0200
Parents: 1255aa9130383721504a5489dd3864e903852654 6c72ea87fd5c1155f31bea75c1711e0143bb6447
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=37aa57cd1b40029844381e22ae8ab5664a4c5482
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
Bugs:
https://bugs.php.net/67531
https://bugs.php.net/67530
Changed paths:
MM sapi/fpm/fpm/fpm_conf.c
MM sapi/fpm/fpm/fpm_stdio.c
Diff: