Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
authorXinchen Hui <laruence@php.net>
Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)
commit6c87372199418029a4b0ecfc260fbe83673ca67f
tree490fab0202e81384bdc67b5d3defaa969dcc9619
parent3f57663b571c94db9583c805212eb4e465f13c0f
parent7953d830abbd178812c79e85a7a4dde96f164d75
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
sapi/fpm/fpm/fastcgi.c
sapi/fpm/fpm/fpm_main.c