projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
| inline |
side by side
fix cainfo default configuration; fix array_merge
[m6w6/ext-http]
/
php_http_misc.c
diff --git
a/php_http_misc.c
b/php_http_misc.c
index ff0c02475d204075ef18547792d50de54cd5ee9e..1344726ce2fe60d5bda46c4b9f88e095810f5ad5 100644
(file)
--- a/
php_http_misc.c
+++ b/
php_http_misc.c
@@
-226,7
+226,7
@@
int php_http_array_apply_merge_func(zval *value, int num_args, va_list args, zen
convert_to_string_ex(value);
}
- Z_ADDREF_P(value);
+ Z_
TRY_
ADDREF_P(value);
if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) {
key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1);