From: Xinchen Hui <laruence@php.net>
Date: Tue, 26 May 2015 08:26:12 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~30^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a728227fca3ba61fa6532afe2cfb85be8880d82;p=php

Merge branch 'PHP-5.6'
---

4a728227fca3ba61fa6532afe2cfb85be8880d82
diff --cc sapi/fpm/fpm/fpm_main.c
index efd1f7155a,8b1503d6f0..e9e11bad24
--- 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();