Merge branch 'master' into phpng

diff --cc ext/phar/phar_object.c
index e2acb53724e652254aa3d35afc5c1fc1375ce9b0,b198bc2fd16846609a0d7377cd0a24459a2aeb81..bfe17e6a13a9c41a56127ee6c1aee44fa020c533
--- 1/ext/phar/phar_object.c
--- 2/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -596,15 -606,16 +596,16 @@@ PHP_METHOD(Phar, webPhar
        }
  
        if ((strlen(sapi_module.name) == sizeof("cgi-fcgi")-1 && !strncmp(sapi_module.name, "cgi-fcgi", sizeof("cgi-fcgi")-1))
+               || (strlen(sapi_module.name) == sizeof("fpm-fcgi")-1 && !strncmp(sapi_module.name, "fpm-fcgi", sizeof("fpm-fcgi")-1))
                || (strlen(sapi_module.name) == sizeof("cgi")-1 && !strncmp(sapi_module.name, "cgi", sizeof("cgi")-1))) {
  
 -              if (PG(http_globals)[TRACK_VARS_SERVER]) {
 -                      HashTable *_server = Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]);
 -                      zval **z_script_name, **z_path_info;
 +              if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) != IS_UNDEF) {
 +                      HashTable *_server = Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]);
 +                      zval *z_script_name, *z_path_info;
  
 -                      if (SUCCESS != zend_hash_find(_server, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void**)&z_script_name) ||
 -                              IS_STRING != Z_TYPE_PP(z_script_name) ||
 -                              !strstr(Z_STRVAL_PP(z_script_name), basename)) {
 +                      if (NULL == (z_script_name = zend_hash_str_find(_server, "SCRIPT_NAME", sizeof("SCRIPT_NAME")-1)) ||
 +                              IS_STRING != Z_TYPE_P(z_script_name) ||
 +                              !strstr(Z_STRVAL_P(z_script_name), basename)) {
                                return;
                        }
  

diff --cc ext/standard/info.c
Simple merge