com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_main. c
| From: | Xinchen Hui | Date: | Tue, 26 May 2015 08:26:23 +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-86934@lists.php.net to get a copy of this message | ||
Commit: 4a728227fca3ba61fa6532afe2cfb85be8880d82
Author: Xinchen Hui <laruence@php.net> Tue, 26 May 2015 16:26:12 +0800
Parents: 770a4629432a8722bd1ad46eee9bccdd00c61e30 1f077cc4f4c0ceef0c86591d4fc4469818adc7d2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a728227fca3ba61fa6532afe2cfb85be8880d82
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM sapi/fpm/fpm/fpm_main..c
Diff:
diff --cc sapi/fpm/fpm/fpm_main.c
index efd1f71,8b1503d..e9e11ba
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@@ -1819,14 -1885,15 +1819,14 @@@ consult the installation file that cam
php_import_environment_variables = cgi_php_import_environment_variables;
/* library is already initialized, now init our request */
- fcgi_init_request(&request, fcgi_fd);
+ request = fcgi_init_request(fcgi_fd);
zend_first_try {
- while (fcgi_accept_request(&request) >= 0) {
+ while (fcgi_accept_request(request) >= 0) {
+ char *primary_script = NULL;
request_body_fd = -1;
- SG(server_context) = (void *) &request;
- init_request_info(TSRMLS_C);
- CG(interactive) = 0;
+ SG(server_context) = (void *) request;
+ init_request_info();
- char *primary_script = NULL;
fpm_request_info();