]> granicus.if.org Git - php/commit
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)
commit37aa57cd1b40029844381e22ae8ab5664a4c5482
tree3eff125f677d94ebb6eb625d39f2bdcded5c4fc9
parent1255aa9130383721504a5489dd3864e903852654
parent6c72ea87fd5c1155f31bea75c1711e0143bb6447
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
sapi/fpm/fpm/fpm_conf.c
sapi/fpm/fpm/fpm_stdio.c