pajoye Thu, 15 Oct 2009 14:10:03 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289669
Log: - Merge: - #49855 ^# ^author ^date ^msg ^merge^ Bug: http://bugs.php.net/49855 (Closed) import_request_variables always return false in any codition. Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ U php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:289667 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:289666-289667 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289666 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289666 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289666 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561 /php/php-src/trunk/ext/pdo_mysql:284726 + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289666 /php/php-src/trunk/ext/pdo_mysql:284726 Modified: php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c =================================================================== --- php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c 2009-10-15 13:28:55 UTC (rev 289668) +++ php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c 2009-10-15 14:10:03 UTC (rev 289669) @@ -6048,6 +6048,7 @@ int types_len; zval *prefix = NULL; char *p; + zend_bool ok = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &types, &types_len, &prefix) == FAILURE) { return; @@ -6070,17 +6071,20 @@ case 'g': case 'G': zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix); + ok = 1; break; case 'p': case 'P': zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix); zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix); + ok = 1; break; case 'c': case 'C': zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix); + ok = 1; break; } } @@ -6088,6 +6092,7 @@ if (ZEND_NUM_ARGS() < 2) { zval_ptr_dtor(&prefix); } + RETURN_BOOL(ok); } /* }}} */ Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:289666-289667 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:289667 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:289666-289667 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
