X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message_body.c;h=90714d93e07e029dca041630e52bbde7c07fda3c;hp=ad8a2b12f7827c80ffac690ae392d4c3ccc67ebc;hb=58e3a73e85335ce1ed3bd59f3a379bacb061c915;hpb=e44e3ceb60817cfdd17945a3f6043816e134aa75

diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c
index ad8a2b1..90714d9 100644
--- a/src/php_http_message_body.c
+++ b/src/php_http_message_body.c
@@ -420,7 +420,7 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const
 			} else {
 				zend_string *tmp = zval_get_string(zdata);
 
-				stream = php_stream_memory_open(TEMP_STREAM_READONLY, tmp->val, tmp->len);
+				stream = php_http_mem_stream_open(TEMP_STREAM_READONLY, tmp);
 				zend_string_release(tmp);
 			}
 		} else {
@@ -693,18 +693,60 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_unserialize, 0, 0, 1)
 ZEND_END_ARG_INFO();
 PHP_METHOD(HttpMessageBody, unserialize)
 {
-	char *us_str;
-	size_t us_len;
+	zend_string *us_str;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &us_str, &us_len)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &us_str)) {
 		php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
-		php_stream *s = php_stream_memory_open(0, us_str, us_len);
+		php_stream *s = php_http_mem_stream_open(0, us_str);
 
 		obj->body = php_http_message_body_init(NULL, s);
 		php_stream_to_zval(s, obj->gc);
 	}
 }
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessageBody___unserialize, 0, 1, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpMessageBody, __unserialize)
+{
+	HashTable *arr;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "h", &arr)) {
+		zval *zv = zend_hash_index_find(arr, 0);
+
+		if (zv) {
+			zend_string *zs = zval_get_string(zv);
+			php_stream *s = php_http_mem_stream_open(0, zs);
+			php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
+
+			obj->body = php_http_message_body_init(NULL, s);
+			php_stream_to_zval(s, obj->gc);
+			zend_string_release(zs);
+		}
+	}
+}
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessageBody___serialize, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpMessageBody, __serialize)
+{
+
+	php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
+	zend_string *zs;
+
+	zend_parse_parameters_none();
+
+	PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
+	array_init(return_value);
+	zs = php_http_message_body_to_string(obj->body, 0, 0);
+	if (zs) {
+		add_index_str(return_value, 0, zs);
+	}
+}
+
+
+
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toStream, 0, 0, 1)
 	ZEND_ARG_INFO(0, stream)
 	ZEND_ARG_INFO(0, offset)
@@ -915,6 +957,8 @@ static zend_function_entry php_http_message_body_methods[] = {
 	PHP_MALIAS(HttpMessageBody, toString, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC)
 	PHP_MALIAS(HttpMessageBody, serialize, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessageBody, unserialize,  ai_HttpMessageBody_unserialize,  ZEND_ACC_PUBLIC)
+	PHP_ME(HttpMessageBody, __serialize,  ai_HttpMessageBody___serialize,  ZEND_ACC_PUBLIC)
+	PHP_ME(HttpMessageBody, __unserialize,ai_HttpMessageBody___unserialize,ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessageBody, toStream,     ai_HttpMessageBody_toStream,     ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessageBody, toCallback,   ai_HttpMessageBody_toCallback,   ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessageBody, getResource,  ai_HttpMessageBody_getResource,  ZEND_ACC_PUBLIC)