jani Tue, 21 Jul 2009 23:06:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284568
Log:
- PHP_5_2 branch does not have these macros
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 22:57:08 UTC
(rev 284567)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 23:06:18 UTC
(rev 284568)
@@ -1260,7 +1260,7 @@
zend_llist_copy(&dupch->to_free.post, &ch->to_free.post);
/* Keep track of cloned copies to avoid invoking curl destructors for
every clone */
- Z_ADDREF_P(ch->clone);
+ ch->clone->refcount++;
dupch->clone = ch->clone;
ZEND_REGISTER_RESOURCE(return_value, dupch, le_curl);
@@ -2083,12 +2083,12 @@
#endif
/* cURL destructors should be invoked only by last curl handle */
- if (Z_REFCOUNT_P(ch->clone) <= 1) {
+ if (ch->clone->refcount <= 1) {
zend_llist_clean(&ch->to_free.slist);
zend_llist_clean(&ch->to_free.post);
zval_ptr_dtor(&ch->clone);
} else {
- Z_DELREF_P(ch->clone);
+ ch->clone->refcount--;
ch->to_free.slist.dtor = NULL;
ch->to_free.post.dtor = NULL;
zend_llist_clean(&ch->to_free.slist);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
