X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=cf2f0a97dac3e38470dc9869364fcb9a9578e442;hp=45fe95e9ef9d9e44e8a158a0f1b03564e2a2c7d3;hb=f753226f1f45e10ef3916256ec1bc0416c8644a8;hpb=6f61c56b9d16c4fd68e388e629cc5a9248fe8281

diff --git a/php_http_message_body.c b/php_http_message_body.c
index 45fe95e..cf2f0a9 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -30,13 +30,19 @@
 static STATUS add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value);
 static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value);
 
-PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t *body, php_stream *stream TSRMLS_DC)
+PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body_ptr, php_stream *stream TSRMLS_DC)
 {
-	if (!body) {
-		body = emalloc(sizeof(php_http_message_body_t));
+	php_http_message_body_t *body;
+
+	if (body_ptr && *body_ptr) {
+		body = *body_ptr;
+		++body->refcount;
+		return body;
 	}
-	memset(body, 0, sizeof(*body));
 	
+	body = ecalloc(1, sizeof(php_http_message_body_t));
+	body->refcount = 1;
+
 	if (stream) {
 		php_stream_auto_cleanup(stream);
 		body->stream_id = php_stream_get_resource_id(stream);
@@ -51,42 +57,48 @@ PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_messag
 	return body;
 }
 
-PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to, zend_bool dup_internal_stream_and_contents)
+PHP_HTTP_API unsigned php_http_message_body_addref(php_http_message_body_t *body)
 {
-	if (!from) {
-		return NULL;
-	} else {
+	return ++body->refcount;
+}
+
+PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to)
+{
+	if (from) {
 		TSRMLS_FETCH_FROM_CTX(from->ts);
 		
-		if (dup_internal_stream_and_contents) {
-			to = php_http_message_body_init(to, NULL TSRMLS_CC);
-			php_http_message_body_to_stream(from, php_http_message_body_stream(to), 0, 0);
+		if (to) {
+			php_stream_truncate_set_size(php_http_message_body_stream(to), 0);
 		} else {
-			to = php_http_message_body_init(to, php_http_message_body_stream(from) TSRMLS_CC);
+			to = php_http_message_body_init(NULL, NULL TSRMLS_CC);
 		}
+		php_http_message_body_to_stream(from, php_http_message_body_stream(to), 0, 0);
 
+		if (to->boundary) {
+			efree(to->boundary);
+		}
 		if (from->boundary) {
 			to->boundary = estrdup(from->boundary);
 		}
-
-		return to;
+	} else {
+		to = NULL;
 	}
+	return to;
 }
 
-PHP_HTTP_API void php_http_message_body_dtor(php_http_message_body_t *body)
+PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body_ptr)
 {
-	TSRMLS_FETCH_FROM_CTX(body->ts);
-	/* NO FIXME: shows leakinfo in DEBUG mode */
-	zend_list_delete(body->stream_id);
-	STR_FREE(body->boundary);
-}
+	if (*body_ptr) {
+		php_http_message_body_t *body = *body_ptr;
 
-PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body)
-{
-	if (*body) {
-		php_http_message_body_dtor(*body);
-		efree(*body);
-		*body = NULL;
+		if (!--body->refcount) {
+			TSRMLS_FETCH_FROM_CTX(body->ts);
+			/* NO FIXME: shows leakinfo in DEBUG mode */
+			zend_list_delete(body->stream_id);
+			STR_FREE(body->boundary);
+			efree(body);
+		}
+		*body_ptr = NULL;
 	}
 }
 
@@ -468,7 +480,7 @@ static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC)
 					/* advance messages */
 					php_http_message_t *msg;
 
-					msg = php_http_message_init(NULL, 0 TSRMLS_CC);
+					msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
 					msg->parent = arg->parser->message;
 					arg->parser->message = msg;
 				}
@@ -639,8 +651,9 @@ zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC)
 	zend_object_value new_ov;
 	php_http_message_body_object_t *new_obj = NULL;
 	php_http_message_body_object_t *old_obj = zend_object_store_get_object(object TSRMLS_CC);
+	php_http_message_body_t *body = php_http_message_body_copy(old_obj->body, NULL);
 
-	new_ov = php_http_message_body_object_new_ex(old_obj->zo.ce, php_http_message_body_copy(old_obj->body, NULL, 1), &new_obj TSRMLS_CC);
+	new_ov = php_http_message_body_object_new_ex(old_obj->zo.ce, body, &new_obj TSRMLS_CC);
 	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(object) TSRMLS_CC);
 
 	return new_ov;
@@ -657,6 +670,13 @@ void php_http_message_body_object_free(void *object TSRMLS_DC)
 	efree(obj);
 }
 
+#define PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj) \
+	do { \
+		if (!obj->body) { \
+			obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC); \
+		} \
+	} while(0)
+
 PHP_METHOD(HttpMessageBody, __construct)
 {
 	php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
@@ -669,15 +689,13 @@ PHP_METHOD(HttpMessageBody, __construct)
 				php_stream_from_zval(stream, &zstream);
 
 				if (stream) {
-					if (obj->body && !obj->shared) {
-						php_http_message_body_dtor(obj->body);
+					if (obj->body) {
+						php_http_message_body_free(&obj->body);
 					}
-					obj->body = php_http_message_body_init(obj->body, stream TSRMLS_CC);
+					obj->body = php_http_message_body_init(NULL, stream TSRMLS_CC);
 				}
 			}
-			if (!obj->body) {
-				obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
-			}
+			PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
 		}
 	} end_error_handling();
 }
@@ -689,6 +707,8 @@ PHP_METHOD(HttpMessageBody, __toString)
 		char *str;
 		size_t len;
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		php_http_message_body_to_string(obj->body, &str, &len, 0, 0);
 		if (str) {
 			RETURN_STRINGL(str, len, 0);
@@ -719,6 +739,8 @@ PHP_METHOD(HttpMessageBody, toStream)
 		php_stream *stream;
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		php_stream_from_zval(stream, &zstream);
 		php_http_message_body_to_stream(obj->body, stream, offset, forlen);
 		RETURN_TRUE;
@@ -735,6 +757,8 @@ PHP_METHOD(HttpMessageBody, toCallback)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		fcd.fcz = getThis();
 		Z_ADDREF_P(fcd.fcz);
 		TSRMLS_SET_CTX(fcd.ts);
@@ -753,6 +777,8 @@ PHP_METHOD(HttpMessageBody, getResource)
 	if (SUCCESS == zend_parse_parameters_none()) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		zend_list_addref(obj->body->stream_id);
 		RETVAL_RESOURCE(obj->body->stream_id);
 	}
@@ -766,6 +792,8 @@ PHP_METHOD(HttpMessageBody, append)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		RETURN_LONG(php_http_message_body_append(obj->body, str, len));
 	}
 	RETURN_FALSE;
@@ -778,6 +806,8 @@ PHP_METHOD(HttpMessageBody, addForm)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!h!", &fields, &files)) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		RETURN_SUCCESS(php_http_message_body_add_form(obj->body, fields, files));
 	}
 	RETURN_FALSE;
@@ -791,6 +821,8 @@ PHP_METHOD(HttpMessageBody, addPart)
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 		php_http_message_object_t *mobj = zend_object_store_get_object(zobj TSRMLS_CC);
 
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
 		php_http_message_body_add_part(obj->body, mobj->message);
 		RETURN_TRUE;
 	}
@@ -801,9 +833,11 @@ PHP_METHOD(HttpMessageBody, etag)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-		char *etag = php_http_message_body_etag(obj->body);
+		char *etag;
 
-		if (etag) {
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
+		if ((etag = php_http_message_body_etag(obj->body))) {
 			RETURN_STRING(etag, 0);
 		}
 	}
@@ -817,9 +851,11 @@ PHP_METHOD(HttpMessageBody, stat)
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &field_str, &field_len)) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-		const php_stream_statbuf *sb = php_http_message_body_stat(obj->body);
+		const php_stream_statbuf *sb;
+
+		PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
 
-		if (sb) {
+		if ((sb = php_http_message_body_stat(obj->body))) {
 			if (field_str && field_len) {
 					switch (*field_str) {
 						case 's':