Merge branch 'PHP-5.6'

diff --cc sapi/fpm/fpm/fpm_main.c
index efd1f7155a0ca92b48fd9b9365d5dde2264b529e,8b1503d6f00ccdd0248866d57a2f7dfad4239902..e9e11bad248749469c758bfb03883a0564b5cc1c
--- 1/sapi/fpm/fpm/fpm_main.c
--- 2/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();