diff options
author | Pierrick Charron <pierrick@php.net> | 2012-12-27 13:37:11 -0500 |
---|---|---|
committer | Pierrick Charron <pierrick@php.net> | 2012-12-27 13:37:11 -0500 |
commit | 8b67981b678b41627141e65b04c24337814b2874 (patch) | |
tree | 3fca160088f6e8bd02e3b3141f7ffa7e08cbcfb5 | |
parent | 61afb2bb8f3104b056b2f2db6acf4f6bafbf64c8 (diff) | |
parent | ac3d227e28056bf5294a8a64e2f41ce2beebaa05 (diff) | |
download | php-git-8b67981b678b41627141e65b04c24337814b2874.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed #63859 Memory leak when reusing curl-handle
-rw-r--r-- | ext/curl/interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 06e5eb2ac5..063639e97e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2600,6 +2600,9 @@ string_copy: return 1; } + if (Z_REFCOUNT_P(ch->clone) <= 1) { + zend_llist_clean(&ch->to_free->post); + } zend_llist_add_element(&ch->to_free->post, &first); error = curl_easy_setopt(ch->cp, CURLOPT_HTTPPOST, first); |