]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 208ae54 51f7984)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:57:36 +0000 (09:57 +0200)
committerAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:57:36 +0000 (09:57 +0200)
* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530  error_log=syslog ignored

Conflicts:
sapi/fpm/fpm/fpm_stdio.c

1  2 
ext/standard/info.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/info.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.