com php-src: Merge branch 'master' into merge-fastcgi: configure.in sapi/fpm/fpm/fpm_main.c

Commit: 90df7e75e6b1ca301d053cbe6d1dee66c586ecb8 Author: Xinchen Hui <laruence@gmail.com> Wed, 27 May 2015 16:36:15 +0800 Parents: f972e219e477fa1f4137de2de24e05c0f5c515e1 f68dc94aa727085040650b4c9354672f2f62ee6a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=90df7e75e6b1ca301d053cbe6d1dee66c586ecb8 Log: Merge branch 'master' into merge-fastcgi Conflicts: sapi/fpm/fpm/fpm_main.c Changed paths: MM configure.in MM sapi/fpm/fpm/fpm_main.c Diff: diff --cc sapi/fpm/fpm/fpm_main.c index 559f2e1,e9e11ba..8066b4e --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@@ -1860,14 -1819,14 +1860,14 @@@ consult the installation file that cam php_import_environment_variables = cgi_php_import_environment_variables; /* library is already initialized, now init our request */ - request = fcgi_init_request(fcgi_fd); + fpm_init_request(&request, fcgi_fd); zend_first_try { - while (fcgi_accept_request(request) >= 0) { + while (EXPECTED(fcgi_accept_request(&request) >= 0)) { + char *primary_script = NULL; request_body_fd = -1; - SG(server_context) = (void *) request; + SG(server_context) = (void *) &request; init_request_info(); - char *primary_script = NULL; fpm_request_info();