]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ec93ee e5fdb5b)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)
* 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"

1  2 
sapi/fpm/fpm/fpm_stdio.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_stdio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.