com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/info.c
| From: | Anatol Belski | Date: | Tue, 08 Jul 2014 07:57:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79322@lists.php.net to get a copy of this message | ||
Commit: 8b3cc726be43910de5b0d782c5922534b2deef71
Author: Anatol Belski <ab@php.net> Tue, 8 Jul 2014 09:57:36 +0200
Parents: 208ae5498db6787826a143f158b9fdf586d3bd19 51f79846bf5b8829a7fd70b03c278bdd88e5fbce
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b3cc726be43910de5b0d782c5922534b2deef71
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* 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
Bugs:
https://bugs.php.net/67407
https://bugs.php.net/67530
Changed paths:
MM ext/standard/info.c
Diff: