Merge branch 'master' into merge-fastcgi

Conflicts:
	sapi/fpm/fpm/fpm_main.c

diff --cc configure.in
Simple merge

diff --cc sapi/fpm/fpm/fpm_main.c
index 559f2e1aea170e604f963178666706738c36cf82,e9e11bad248749469c758bfb03883a0564b5cc1c..8066b4ebcf1c7f9aab66171a277eed3c6851625c
--- 1/sapi/fpm/fpm/fpm_main.c
--- 2/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();