com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_main. c
| From: | Ferenc Kovacs | Date: | Tue, 12 Aug 2014 12:48:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_main. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79824@lists.php.net to get a copy of this message | ||
Commit: 86aa8d25236b71830c35901646041f627519e9aa
Author: Ferenc Kovacs <tyrael@php.net> Tue, 12 Aug 2014 14:48:48 +0200
Parents: 91351d4bf55d9937186739e528330e287d7bbc84 844e2e81f56fca1f49c73df4e15866cd1ba37f30
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86aa8d25236b71830c35901646041f627519e9aa
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for e6d93a1 / d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
Bugs:
https://bugs.php.net/694
https://bugs.php.net/67606
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: