com php-src: Merge branch 'master' into test: Zend/zend_ast .c ext/intl/locale/locale_methods.c ext/spl/spl_arr ay.c ext/spl/spl_observer.c
ext/standard/info.c s api/fpm/fpm/fpm_main.c

Commit: acfbb7b6dcfdf868b2c709a105dbd32fbf60eccb Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Jul 2014 00:19:41 +0400 Parents: 424894de021f1be6fce205bea46de89838c8e600 2d26a7cf627ad621f1190ebc3f9fb9af5e04aa77 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=acfbb7b6dcfdf868b2c709a105dbd32fbf60eccb Log: Merge branch 'master' into test * master: (67 commits) remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix Revert "Fix Bug #67530 error_log=syslog ignored" --enable-fpm for the travis build fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here NEWS NEWS Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0 adding NEWS entry for the fix for bug #65641 Updated NEWS file for recent phpdbg fixes Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline Fixed test Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames Fix issue krakjoe/phpdbg#98 break if does not seem to work Fix issue krakjoe/phpdbg#99 register function has the same behavior as run Fix readline/libedit (Thanks to @remicollet) Replace incorrect E command with ev in watch help Fix typo in finish help ... Conflicts: Zend/zend_ast.c Zend/zend_highlight.c Zend/zend_indent.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/info.c Bugs: https://bugs.php.net/67530 https://bugs.php.net/67091 https://bugs.php.net/65641 https://bugs.php.net/94 https://bugs.php.net/97 https://bugs.php.net/100 https://bugs.php.net/98 https://bugs.php.net/99 Changed paths: MM Zend/zend_ast.c MM ext/intl/locale/locale_methods.c MM ext/spl/spl_array.c MM ext/spl/spl_observer.c MM ext/standard/info.c MM sapi/fpm/fpm/fpm_main.c Diff: diff --cc Zend/zend_ast.c index 7a9547b,fceb940..e173afd --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@@ -350,6 -322,17 +350,20 @@@ ZEND_API void zend_ast_evaluate(zval *r } } break; ++//??? ++#if 0 + case ZEND_FETCH_DIM_R: + zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + { + zval *tmp; + zend_fetch_dimension_by_zval(&tmp, &op1, &op2 TSRMLS_CC); + ZVAL_ZVAL(result, tmp, 1, 1); + } + zval_dtor(&op1); + zval_dtor(&op2); + break; ++#endif default: zend_error(E_ERROR, "Unsupported constant expression"); } diff --cc ext/spl/spl_array.c index 3e688aa,c38065f..24556b5 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@@ -1831,7 -1803,9 +1831,9 @@@ SPL_METHOD(Array, unserialize } ++p; - if (!php_var_unserialize(&members, &p, s + buf_len, &var_hash TSRMLS_CC)) { - ALLOC_INIT_ZVAL(pmembers); - if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(pmembers) != IS_ARRAY) { - zval_ptr_dtor(&pmembers); ++ ZVAL_UNDEF(&members); ++ if (!php_var_unserialize(&members, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE(members) != IS_ARRAY) { ++ zval_ptr_dtor(&members); goto outexcept; } diff --cc ext/spl/spl_observer.c index a13a7db,f493154..bdfff35 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@@ -891,7 -913,9 +891,9 @@@ SPL_METHOD(SplObjectStorage, unserializ } ++p; - if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC)) { - ALLOC_INIT_ZVAL(pmembers); - if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(pmembers) != IS_ARRAY) { ++ ZVAL_UNDEF(&pmembers); ++ if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE(pmembers) != IS_ARRAY) { + zval_ptr_dtor(&pmembers); goto outexcept; } diff --cc ext/standard/info.c index 19f8ebf,0626a70..ef39747 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@@ -861,17 -866,17 +861,17 @@@ PHPAPI void php_print_info(int flag TSR php_info_print_table_start(); php_info_print_table_header(2, "Variable", "Value"); - if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_SELF", sizeof("PHP_SELF")-1)) != NULL) { - if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { - php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_PP(data)); ++ if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_SELF", sizeof("PHP_SELF")-1)) != NULL && Z_TYPE_P(data) == IS_STRING) { + php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_P(data)); } - if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE")-1)) != NULL) { - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { - php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_PP(data)); ++ if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE")-1)) != NULL && Z_TYPE_P(data) == IS_STRING) { + php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_P(data)); } - if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_USER", sizeof("PHP_AUTH_USER")-1)) != NULL) { - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { - php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_PP(data)); ++ if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_USER", sizeof("PHP_AUTH_USER")-1)) != NULL && Z_TYPE_P(data) == IS_STRING) { + php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_P(data)); } - if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_PW", sizeof("PHP_AUTH_PW")-1)) != NULL) { - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { - php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_PP(data)); ++ if ((data = zend_hash_str_find(&EG(symbol_table).ht, "PHP_AUTH_PW", sizeof("PHP_AUTH_PW")-1)) != NULL && Z_TYPE_P(data) == IS_STRING) { + php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_P(data)); } php_print_gpcse_array(ZEND_STRL("_REQUEST") TSRMLS_CC); php_print_gpcse_array(ZEND_STRL("_GET") TSRMLS_CC);