]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 27 Jun 2014 07:51:15 +0000 (09:51 +0200)
committerRemi Collet <remi@php.net>
Fri, 27 Jun 2014 07:51:15 +0000 (09:51 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Fix Bug #67531  syslog cannot be set in pool configuration
  Fix Bug #67530  error_log=syslog ignored

1  2 
sapi/fpm/fpm/fpm_conf.c
sapi/fpm/fpm/fpm_stdio.c

Simple merge
Simple merge