From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 27 May 2015 08:36:15 +0000 (+0800)
Subject: Merge branch 'master' into merge-fastcgi
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90df7e75e6b1ca301d053cbe6d1dee66c586ecb8;p=php

Merge branch 'master' into merge-fastcgi

Conflicts:
	sapi/fpm/fpm/fpm_main.c
---

90df7e75e6b1ca301d053cbe6d1dee66c586ecb8
diff --cc sapi/fpm/fpm/fpm_main.c
index 559f2e1aea,e9e11bad24..8066b4ebcf
--- 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();