com php-src: Merge branch 'master' into phpng: ext/phar/phar_ object.c ext/standard/info.c

Commit: f2a12d65fdc65079402660809641c67ae3837b8d Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Jul 2014 14:07:37 +0400 Parents: d87140d8d8a76dddc3501306d0da901c1ae2cd61 25fe17bdcd3e88adc4a2b020113a7bacf343cf7d Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2a12d65fdc65079402660809641c67ae3837b8d Log: Merge branch 'master' into phpng * master: 5.4.31 update NEWS fix unstable test 5.5.16 now fix unstable test Fix bug #67587: Redirection loop on nginx with FPM Fix bug #67587: Redirection loop on nginx with FPM Fix bug #67587: Redirection loop on nginx with FPM updated NEWS updated NEWS updated NEWS Backported the patch from bug #67407 into 5.5+ Backported the patch from bug #67407 into 5..4 NEWS 5.6 have fpm_globals.force_stderr Fix Bug #67530 error_log=syslog ignored NEWS NEWS Fix Bug #67530 error_log=syslog ignored Update info.c Bugs: https://bugs.php.net/67587 https://bugs.php.net/67407 https://bugs.php.net/67530 Changed paths: MM ext/phar/phar_object.c MM ext/standard/info.c Diff: diff --cc ext/phar/phar_object.c index e2acb53,b198bc2..bfe17e6 --- 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; }