com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/cgi/cgi _main.c sapi/fpm/fpm/fpm_main.c
| From: | Xinchen Hui | Date: | Tue, 27 Jan 2015 14:13:04 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/cgi/cgi _main.c sapi/fpm/fpm/fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84391@lists.php.net to get a copy of this message | ||
Commit: 6336fa18c42c0af2787688c0fec5df7dde3da0a9
Author: Xinchen Hui <laruence@php.net> Tue, 27 Jan 2015 22:13:04 +0800
Parents: 666cb333f725794892df7876889472aeee8e33fe 8c2d91761aaa3b7b25c70df4d2320f85e9322e79
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6336fa18c42c0af2787688c0fec5df7dde3da0a9
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM sapi/cgi/cgi_main.c
MM sapi/fpm/fpm/fpm_main.c
Diff: