com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_main.c
| From: | Xinchen Hui | Date: | Tue, 27 Jan 2015 14:25:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84398@lists.php.net to get a copy of this message | ||
Commit: b881de9937d7433533554603826aa4b14e08d47c
Author: Xinchen Hui <laruence@php.net> Tue, 27 Jan 2015 22:25:45 +0800
Parents: 92d56b0af6e000d477a020fdcb07ddb5e98713b1 4c5995b1729b100b00707ddf32d072355dcc3ae8
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b881de9937d7433533554603826aa4b14e08d47c
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: