Fixed bug #49855 (import_request_variables() always returns NULL).

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a0b999c7b2d1c061bf2c9ed6c015f61314e8387a..03c970476275a7828153f06a6268c991df15da95 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -6167,6 +6167,7 @@ PHP_FUNCTION(import_request_variables)
        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, UG(ascii_conv), &prefix) == FAILURE) {
                return;
@@ -6189,17 +6190,20 @@ PHP_FUNCTION(import_request_variables)
                        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;
                }
        }
@@ -6207,6 +6211,7 @@ PHP_FUNCTION(import_request_variables)
        if (ZEND_NUM_ARGS() < 2) {
                zval_ptr_dtor(&prefix);
        }
+       RETURN_BOOL(ok);
 }
 /* }}} */