diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-02-05 19:51:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-02-05 19:51:33 +0800 |
| commit | 095096c7ab2be3f6506bcd5429252b9abdf2138a (patch) | |
| tree | 515aace5ef4929beff4784e94c3b809962508ed3 /ext/curl/interface.c | |
| parent | 3311f8e8403e8209003d94576ac4a1c17447e709 (diff) | |
| parent | 5fdfab743d964bb13602effc9efcd6f747e2f58c (diff) | |
| download | php-git-095096c7ab2be3f6506bcd5429252b9abdf2138a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/curl/interface.c
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index bd611ce42f..1cd22a8acf 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2475,7 +2475,11 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ } } ZEND_HASH_FOREACH_END(); - zend_hash_index_update_ptr(ch->to_free->slist, option, slist); + if ((*ch->clone) == 1) { + zend_hash_index_update_ptr(ch->to_free->slist, option, slist); + } else { + zend_hash_next_index_insert_ptr(ch->to_free->slist, slist); + } error = curl_easy_setopt(ch->cp, option, slist); |