X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message_body.c;h=79c8bf765095852bd2798cf1ae80e077a287de12;hp=43aba7f4a8d2e731f31fae42e145ec28d2643142;hb=d5d03014cff8c8ca80ee7866af100d3ceae1bd8f;hpb=53a654ed6e112b2766b41c01a1c2bb79373c59e4 diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c index 43aba7f..79c8bf7 100644 --- a/src/php_http_message_body.c +++ b/src/php_http_message_body.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -#include +#include "ext/standard/php_lcg.h" #define BOUNDARY_OPEN(body) \ do {\ @@ -40,18 +40,17 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo php_http_message_body_addref(body); return body; } - + body = ecalloc(1, sizeof(php_http_message_body_t)); body->refcount = 1; if (stream) { body->res = stream->res; - ++GC_REFCOUNT(body->res); + GC_ADDREF(body->res); } else { - stream = php_stream_temp_create(TEMP_STREAM_DEFAULT, 0xffff); - body->res = stream->res; + body->res = php_stream_temp_create(TEMP_STREAM_DEFAULT, 0xffff)->res; } - php_stream_auto_cleanup(stream); + php_stream_auto_cleanup(php_http_message_body_stream(body)); if (body_ptr) { *body_ptr = body; @@ -91,9 +90,9 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr) { if (*body_ptr) { php_http_message_body_t *body = *body_ptr; - if (!--body->refcount) { zend_list_delete(body->res); + body->res = NULL; PTR_FREE(body->boundary); efree(body); } @@ -263,9 +262,14 @@ void php_http_message_body_add_part(php_http_message_body_t *body, php_http_mess ZEND_RESULT_CODE php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) { - zend_string *safe_name = zend_string_init(name, strlen(name), 0); + zend_string *safe_name, *zstr_name = zend_string_init(name, strlen(name), 0); - safe_name = php_addslashes(safe_name, 1); +#if PHP_VERSION_ID < 70300 + safe_name = php_addslashes(zstr_name, 1); +#else + safe_name = php_addslashes(zstr_name); + zend_string_release_ex(zstr_name, 0); +#endif BOUNDARY_OPEN(body); php_http_message_body_appendf( @@ -285,9 +289,14 @@ ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *bo { size_t path_len = strlen(path); char *path_dup = estrndup(path, path_len); - zend_string *base_name, *safe_name = zend_string_init(name, strlen(name), 0); - - safe_name = php_addslashes(safe_name, 1); + zend_string *base_name, *safe_name, *zstr_name = zend_string_init(name, strlen(name), 0); + +#if PHP_VERSION_ID < 70300 + safe_name = php_addslashes(zstr_name, 1); +#else + safe_name = php_addslashes(zstr_name); + zend_string_release_ex(zstr_name, 0); +#endif base_name = php_basename(path_dup, path_len, NULL, 0); BOUNDARY_OPEN(body); @@ -340,8 +349,8 @@ static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, cons zval *val; php_http_arrkey_t key; - if (!ZEND_HASH_GET_APPLY_COUNT(fields)) { - ZEND_HASH_INC_APPLY_COUNT(fields); + if (!HT_IS_RECURSIVE(fields)) { + HT_PROTECT_RECURSION(fields); ZEND_HASH_FOREACH_KEY_VAL_IND(fields, key.h, key.key, val) { char *str = format_key(&key, name); @@ -349,18 +358,18 @@ static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, cons if (Z_TYPE_P(val) != IS_ARRAY && Z_TYPE_P(val) != IS_OBJECT) { if (SUCCESS != add_recursive_field_value(body, str, val)) { efree(str); - ZEND_HASH_DEC_APPLY_COUNT(fields); + HT_UNPROTECT_RECURSION(fields); return FAILURE; } } else if (SUCCESS != add_recursive_fields(body, str, HASH_OF(val))) { efree(str); - ZEND_HASH_DEC_APPLY_COUNT(fields); + HT_UNPROTECT_RECURSION(fields); return FAILURE; } efree(str); } ZEND_HASH_FOREACH_END(); - ZEND_HASH_DEC_APPLY_COUNT(fields); + HT_UNPROTECT_RECURSION(fields); } return SUCCESS; @@ -378,8 +387,8 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const zval *val; php_http_arrkey_t key; - if (!ZEND_HASH_GET_APPLY_COUNT(files)) { - ZEND_HASH_INC_APPLY_COUNT(files); + if (!HT_IS_RECURSIVE(files)) { + HT_PROTECT_RECURSION(files); ZEND_HASH_FOREACH_KEY_VAL_IND(files, key.h, key.key, val) { if (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT) { @@ -387,14 +396,14 @@ static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const if (SUCCESS != add_recursive_files(body, str, HASH_OF(val))) { efree(str); - ZEND_HASH_DEC_APPLY_COUNT(files); + HT_UNPROTECT_RECURSION(files); return FAILURE; } efree(str); } } ZEND_HASH_FOREACH_END(); - ZEND_HASH_DEC_APPLY_COUNT(files); + HT_UNPROTECT_RECURSION(files); } return SUCCESS; } else { @@ -567,6 +576,8 @@ php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_e zend_object_std_init(&o->zo, php_http_message_body_class_entry); object_properties_init(&o->zo, ce); + o->gc = emalloc(sizeof(zval)); + if (body) { o->body = body; } @@ -578,7 +589,7 @@ php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_e zend_object *php_http_message_body_object_clone(zval *object) { - php_http_message_body_object_t *new_obj = NULL; + 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_t *body = php_http_message_body_copy(old_obj->body, NULL); @@ -588,10 +599,40 @@ 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) +{ + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, object); + HashTable *props = Z_OBJPROP_P(object); + uint32_t count = zend_hash_num_elements(props); + + obj->gc = erealloc(obj->gc, (1 + count) * sizeof(zval)); + + if (php_http_message_body_stream(obj->body)) { + *n = 1; + php_stream_to_zval(php_http_message_body_stream(obj->body), obj->gc); + } else { + *n = 0; + } + + if (count) { + zval *val; + + ZEND_HASH_FOREACH_VAL(props, val) + { + ZVAL_COPY_VALUE(&obj->gc[(*n)++], val); + } + ZEND_HASH_FOREACH_END(); + } + *table = obj->gc; + + return NULL; +} + void php_http_message_body_object_free(zend_object *object) { php_http_message_body_object_t *obj = PHP_HTTP_OBJ(object, NULL); + PTR_FREE(obj->gc); php_http_message_body_free(&obj->body); zend_object_std_dtor(object); } @@ -600,6 +641,7 @@ void php_http_message_body_object_free(zend_object *object) do { \ if (!obj->body) { \ obj->body = php_http_message_body_init(NULL, NULL); \ + php_stream_to_zval(php_http_message_body_stream(obj->body), obj->gc); \ } \ } while(0) @@ -621,6 +663,7 @@ PHP_METHOD(HttpMessageBody, __construct) php_http_message_body_free(&obj->body); } obj->body = php_http_message_body_init(NULL, stream); + php_stream_to_zval(stream, obj->gc); } } @@ -655,6 +698,7 @@ PHP_METHOD(HttpMessageBody, unserialize) php_stream *s = php_stream_memory_open(0, us_str, us_len); obj->body = php_http_message_body_init(NULL, s); + php_stream_to_zval(s, obj->gc); } } @@ -712,8 +756,8 @@ PHP_METHOD(HttpMessageBody, getResource) PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - ++GC_REFCOUNT(obj->body->res); - RETVAL_RES(obj->body->res); + php_stream_to_zval(php_http_message_body_stream(obj->body), return_value); + Z_ADDREF_P(return_value); } } @@ -863,7 +907,7 @@ PHP_METHOD(HttpMessageBody, stat) } static zend_function_entry php_http_message_body_methods[] = { - PHP_ME(HttpMessageBody, __construct, ai_HttpMessageBody___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpMessageBody, __construct, ai_HttpMessageBody___construct, ZEND_ACC_PUBLIC) PHP_ME(HttpMessageBody, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) PHP_MALIAS(HttpMessageBody, toString, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) PHP_MALIAS(HttpMessageBody, serialize, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) @@ -891,6 +935,7 @@ PHP_MINIT_FUNCTION(http_message_body) php_http_message_body_object_handlers.offset = XtOffsetOf(php_http_message_body_object_t, zo); php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; php_http_message_body_object_handlers.free_obj = php_http_message_body_object_free; + php_http_message_body_object_handlers.get_gc = php_http_message_body_object_get_gc; zend_class_implements(php_http_message_body_class_entry, 1, zend_ce_serializable); return SUCCESS;