From 90d2f509e2164b60fc7bc8407e63504c910cce11 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 30 Dec 2015 05:04:21 -0800 Subject: Fixed bug #71245 (file_get_contents() ignores "header" context option if it's a reference) --- ext/standard/streamsfuncs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/standard/streamsfuncs.c') diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index f257ef85e6..bc8c8557de 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -881,10 +881,11 @@ static int parse_context_options(php_stream_context *context, zval *options) int ret = SUCCESS; ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(options), wkey, wval) { - if (wkey && Z_TYPE_P(wval) == IS_ARRAY) { - + ZVAL_DEREF(wval); + if (Z_TYPE_P(wval) == IS_ARRAY) { ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(wval), okey, oval) { if (okey) { + ZVAL_DEREF(oval); php_stream_context_set_option(context, ZSTR_VAL(wkey), ZSTR_VAL(okey), oval); } } ZEND_HASH_FOREACH_END(); -- cgit v1.2.1