From: Xinchen Hui <laruence@php.net>
Date: Wed, 9 Jul 2014 10:35:30 +0000 (+0800)
Subject: Merge branch 'master' into phpng
X-Git-Tag: POST_PHPNG_MERGE~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8431ba09c9e64aaa1dd6b518636d48a70a1dc97;p=php

Merge branch 'master' into phpng
---

d8431ba09c9e64aaa1dd6b518636d48a70a1dc97
diff --cc ext/phar/phar_object.c
index e2acb53724,b198bc2fd1..bfe17e6a13
--- a/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;
  			}