X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=d629ae53ad5d137eca73be4c5fc7f51ce538e916;hp=4a3174a62a785c649d563ad7281874435d97e88f;hb=7a1fef9608be28f02f5a5b07b33065372574d593;hpb=468e8d748d365811af4ce890fd8fc4c1f88cc08a

diff --git a/php_http_message_body.c b/php_http_message_body.c
index 4a3174a..d629ae5 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -37,7 +37,7 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo
 
 	if (body_ptr && *body_ptr) {
 		body = *body_ptr;
-		++body->refcount;
+		php_http_message_body_addref(body);
 		return body;
 	}
 	
@@ -93,7 +93,6 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr)
 		php_http_message_body_t *body = *body_ptr;
 
 		if (!--body->refcount) {
-			/* NOFIXME: shows leakinfo in DEBUG mode */
 			zend_list_delete(body->res);
 			PTR_FREE(body->boundary);
 			efree(body);
@@ -694,7 +693,7 @@ PHP_METHOD(HttpMessageBody, toCallback)
 		php_http_message_body_to_callback(obj->body, php_http_pass_fcall_callback, &fcd, offset, forlen);
 		zend_fcall_info_args_clear(&fcd.fci, 1);
 		zval_ptr_dtor(&fcd.fcz);
-		RETURN_ZVAL_FAST(getThis());
+		RETURN_ZVAL(getThis(), 1, 0);
 	}
 }
 
@@ -743,7 +742,7 @@ PHP_METHOD(HttpMessageBody, append)
 
 	php_http_expect(len == php_http_message_body_append(obj->body, str, len), runtime, return);
 
-	RETURN_ZVAL_FAST(getThis());
+	RETURN_ZVAL(getThis(), 1, 0);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addForm, 0, 0, 0)
@@ -762,7 +761,7 @@ PHP_METHOD(HttpMessageBody, addForm)
 
 	php_http_expect(SUCCESS == php_http_message_body_add_form(obj->body, fields, files), runtime, return);
 
-	RETURN_ZVAL_FAST(getThis());
+	RETURN_ZVAL(getThis(), 1, 0);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addPart, 0, 0, 1)
@@ -787,7 +786,7 @@ PHP_METHOD(HttpMessageBody, addPart)
 	zend_restore_error_handling(&zeh);
 
 	if (!EG(exception)) {
-		RETURN_ZVAL_FAST(getThis());
+		RETURN_ZVAL(getThis(), 1, 0);
 	}
 }