Merge branch 'PHP-5.4' into PHP-5.5

adoy · adoy · commit 8b67981b678b · 2012-12-27T13:37:11.000-05:00
* PHP-5.4:
  Fixed #63859 Memory leak when reusing curl-handle
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -2600,6 +2600,9 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 					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);
 

Original file line number	Diff line number	Diff line change
`@@ -2600,6 +2600,9 @@ static int _php_curl_setopt(php_curl ch, long option, zval zvalue, zval retu`
`2600`	`2600`	`return 1;`
`2601`	`2601`	`}`
`2602`	`2602`
	`2603`	`+ if (Z_REFCOUNT_P(ch->clone) <= 1) {`
	`2604`	`+ zend_llist_clean(&ch->to_free->post);`
	`2605`	`+ }`
`2603`	`2606`	`zend_llist_add_element(&ch->to_free->post, &first);`
`2604`	`2607`	`error = curl_easy_setopt(ch->cp, CURLOPT_HTTPPOST, first);`
`2605`	`2608`