cvs: pecl /http http_message_object.c http_request_object.c http_requestpool_object.c php_http_std_defs.h

mike Fri Jan 20 16:48:13 2006 UTC Modified files: /pecl/http http_message_object.c http_request_object.c http_requestpool_object.c php_http_std_defs.h Log: add addref param to RETURN_OBJVAL() etc http://cvs.php.net/viewcvs.cgi/pecl/http/http_message_object.c?r1=1.73&r2=1.74&diff_format=u Index: pecl/http/http_message_object.c diff -u pecl/http/http_message_object.c:1.73 pecl/http/http_message_object.c:1.74 --- pecl/http/http_message_object.c:1.73 Fri Jan 20 14:23:08 2006 +++ pecl/http/http_message_object.c Fri Jan 20 16:48:12 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: http_message_object.c,v 1.73 2006/01/20 14:23:08 mike Exp $ */ +/* $Id: http_message_object.c,v 1.74 2006/01/20 16:48:12 mike Exp $ */ #define HTTP_WANT_SAPI #define HTTP_WANT_CURL @@ -337,7 +337,7 @@ case HTTP_MSG_PROPHASH_PARENT_MESSAGE: case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE: if (msg->parent) { - RETVAL_OBJVAL(obj->parent); + RETVAL_OBJVAL(obj->parent, 1); } else { RETVAL_NULL(); } @@ -632,7 +632,7 @@ } } if (ce) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(ce, msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(ce, msg, NULL), 0); } } } @@ -997,7 +997,7 @@ getObject(http_message_object, obj); if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent); + RETVAL_OBJVAL(obj->parent, 1); } else { RETVAL_NULL(); } @@ -1260,7 +1260,7 @@ zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message)); - ZVAL_OBJVAL(return_value, http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL), 0); } /* }}} */ @@ -1361,8 +1361,7 @@ if (itr && itr->parent.handle) { zval *old = obj->iterator; MAKE_STD_ZVAL(obj->iterator); - ZVAL_OBJVAL(obj->iterator, itr->parent); - Z_OBJ_ADDREF_P(obj->iterator); + ZVAL_OBJVAL(obj->iterator, itr->parent, 1); zval_ptr_dtor(&old); } else { zval_ptr_dtor(&obj->iterator); http://cvs.php.net/viewcvs.cgi/pecl/http/http_request_object.c?r1=1.99&r2=1.100&diff_format=u Index: pecl/http/http_request_object.c diff -u pecl/http/http_request_object.c:1.99 pecl/http/http_request_object.c:1.100 --- pecl/http/http_request_object.c:1.99 Thu Jan 19 11:42:08 2006 +++ pecl/http/http_request_object.c Fri Jan 20 16:48:12 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: http_request_object.c,v 1.99 2006/01/19 11:42:08 mike Exp $ */ +/* $Id: http_request_object.c,v 1.100 2006/01/20 16:48:12 mike Exp $ */ #define HTTP_WANT_CURL #include "php_http.h" @@ -603,7 +603,7 @@ zval_ptr_dtor(&resp); MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); SET_PROP(responseMessage, message); zval_ptr_dtor(&message); @@ -1713,7 +1713,7 @@ SET_EH_THROW_HTTP(); message = GET_PROP(responseMessage); if (Z_TYPE_P(message) == IS_OBJECT) { - RETVAL_OBJECT(message); + RETVAL_OBJECT(message, 1); } else { RETVAL_NULL(); } @@ -1750,7 +1750,7 @@ SET_EH_THROW_HTTP(); if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); } SET_EH_NORMAL(); } @@ -1824,7 +1824,7 @@ SET_EH_THROW_HTTP(); if ((msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history)))) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); } SET_EH_NORMAL(); } @@ -1904,7 +1904,7 @@ } else if (SUCCESS == http_request_object_requesthandler(obj, getThis())) { http_request_exec(obj->request); if (SUCCESS == http_request_object_responsehandler(obj, getThis())) { - RETVAL_OBJECT(GET_PROP(responseMessage)); + RETVAL_OBJECT(GET_PROP(responseMessage), 1); } } http://cvs.php.net/viewcvs.cgi/pecl/http/http_requestpool_object.c?r1=1.36&r2=1.37&diff_format=u Index: pecl/http/http_requestpool_object.c diff -u pecl/http/http_requestpool_object.c:1.36 pecl/http/http_requestpool_object.c:1.37 --- pecl/http/http_requestpool_object.c:1.36 Thu Jan 19 11:42:08 2006 +++ pecl/http/http_requestpool_object.c Fri Jan 20 16:48:12 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: http_requestpool_object.c,v 1.36 2006/01/19 11:42:08 mike Exp $ */ +/* $Id: http_requestpool_object.c,v 1.37 2006/01/20 16:48:12 mike Exp $ */ #define HTTP_WANT_CURL #include "php_http.h" @@ -426,7 +426,7 @@ current && obj->iterator.pos != pos++; current = zend_llist_get_next_ex(&obj->pool.handles, &lpos)); if (current) { - RETURN_OBJECT(*current); + RETURN_OBJECT(*current, 1); } } RETURN_NULL(); http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_std_defs.h?r1=1.79&r2=1.80&diff_format=u Index: pecl/http/php_http_std_defs.h diff -u pecl/http/php_http_std_defs.h:1.79 pecl/http/php_http_std_defs.h:1.80 --- pecl/http/php_http_std_defs.h:1.79 Mon Jan 2 15:36:58 2006 +++ pecl/http/php_http_std_defs.h Fri Jan 20 16:48:12 2006 @@ -10,7 +10,7 @@ +--------------------------------------------------------------------+ */ -/* $Id: php_http_std_defs.h,v 1.79 2006/01/02 15:36:58 mike Exp $ */ +/* $Id: php_http_std_defs.h,v 1.80 2006/01/20 16:48:12 mike Exp $ */ #ifndef PHP_HTTP_STD_DEFS_H #define PHP_HTTP_STD_DEFS_H @@ -60,22 +60,22 @@ #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) /* return object(values) */ -#define RETVAL_OBJECT(o) \ - RETVAL_OBJVAL((o)->value.obj) -#define RETURN_OBJECT(o) \ - RETVAL_OBJECT(o); \ +#define RETVAL_OBJECT(o, addref) \ + RETVAL_OBJVAL((o)->value.obj, addref) +#define RETURN_OBJECT(o, addref) \ + RETVAL_OBJECT(o, addref); \ return -#define RETVAL_OBJVAL(ov) \ - ZVAL_OBJVAL(return_value, ov) \ - if (Z_OBJ_HT_P(return_value)->add_ref) { \ - Z_OBJ_HT_P(return_value)->add_ref(return_value TSRMLS_CC); \ - } -#define RETURN_OBJVAL(ov) \ - RETVAL_OBJVAL(ov); \ +#define RETVAL_OBJVAL(ov, addref) \ + ZVAL_OBJVAL(return_value, ov, addref) +#define RETURN_OBJVAL(ov, addref) \ + RETVAL_OBJVAL(ov, addref); \ return -#define ZVAL_OBJVAL(zv, ov) \ +#define ZVAL_OBJVAL(zv, ov, addref) \ (zv)->type = IS_OBJECT; \ - (zv)->value.obj = (ov); + (zv)->value.obj = (ov);\ + if (addref && Z_OBJ_HT_P(zv)->add_ref) { \ + Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \ + } /* return property */ #define RETVAL_PROP(n) RETVAL_PROP_EX(getThis(), n) #define RETURN_PROP(n) RETURN_PROP_EX(getThis(), n)