X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_message_body.c;h=70fd58741667fdd859ffa250d892fb44a91a9dd7;hb=3d3727416df3f7b51b10a5c5d5af7249d5500222;hp=db86ab07ea8129e8c7a18d14ee306579f060c3a6;hpb=19b4a9cd20fd1cdf5f896b21a2e7b0e3d177ebe3;p=m6w6%2Fext-http

diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c
index db86ab0..70fd587 100644
--- a/src/php_http_message_body.c
+++ b/src/php_http_message_body.c
@@ -393,7 +393,7 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const
 			{
 				if (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT) {
 					char *str = key.key ? format_key(&key, name) : NULL;
-					const char *prefix = str ?: name;
+					const char *prefix = str ? str : name;
 
 					if (SUCCESS != add_recursive_files(body, prefix, HASH_OF(val))) {
 						efree(str);
@@ -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 {
@@ -432,7 +432,7 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const
 			return FAILURE;
 		} else {
 			zend_string *znc = zval_get_string(zname), *ztc = zval_get_string(ztype);
-			php_http_arrkey_t arrkey = {0, znc};
+			php_http_arrkey_t arrkey = {0, znc, 0, 0};
 			char *key = format_key(&arrkey, name);
 			ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, ztc->val, zfc->val, stream);
 
@@ -590,10 +590,10 @@ php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_e
 	return o;
 }
 
-zend_object *php_http_message_body_object_clone(zval *object)
+zend_object *php_http_message_body_object_clone(zend_object *object)
 {
 	php_http_message_body_object_t *new_obj;
-	php_http_message_body_object_t *old_obj = PHP_HTTP_OBJ(NULL, object);
+	php_http_message_body_object_t *old_obj = PHP_HTTP_OBJ(object, NULL);
 	php_http_message_body_t *body = php_http_message_body_copy(old_obj->body, NULL);
 
 	new_obj = php_http_message_body_object_new_ex(old_obj->zo.ce, body);
@@ -602,10 +602,10 @@ zend_object *php_http_message_body_object_clone(zval *object)
 	return &new_obj->zo;
 }
 
-static HashTable *php_http_message_body_object_get_gc(zval *object, zval **table, int *n)
+static HashTable *php_http_message_body_object_get_gc(zend_object *object, zval **table, int *n)
 {
-	php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, object);
-	HashTable *props = Z_OBJPROP_P(object);
+	php_http_message_body_object_t *obj = PHP_HTTP_OBJ(object, NULL);
+	HashTable *props = object->handlers->get_properties(object);
 	uint32_t count = zend_hash_num_elements(props);
 
 	obj->gc = erealloc(obj->gc, (1 + count) * sizeof(zval));
@@ -693,12 +693,11 @@ 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);