X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=fd5b76293b9384b279089a9301d1084467cc5526;hp=45fe95e9ef9d9e44e8a158a0f1b03564e2a2c7d3;hb=9650ced54ff8ae9331f5f96e2e8f62153270f2be;hpb=6f61c56b9d16c4fd68e388e629cc5a9248fe8281 diff --git a/php_http_message_body.c b/php_http_message_body.c index 45fe95e..fd5b762 100644 --- a/php_http_message_body.c +++ b/php_http_message_body.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2013, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -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; } @@ -527,85 +539,8 @@ PHP_HTTP_API php_http_message_t *php_http_message_body_split(php_http_message_bo return msg; } -/* PHP */ - -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpMessageBody, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpMessageBody, method, 0) -#define PHP_HTTP_MESSAGE_BODY_ME(method, visibility) PHP_ME(HttpMessageBody, method, PHP_HTTP_ARGS(HttpMessageBody, method), visibility) - -PHP_HTTP_BEGIN_ARGS(__construct, 0) - PHP_HTTP_ARG_VAL(stream, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(__toString); -PHP_HTTP_BEGIN_ARGS(unserialize, 1) - PHP_HTTP_ARG_VAL(serialized, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(toStream, 1) - PHP_HTTP_ARG_VAL(stream, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(toCallback, 1) - PHP_HTTP_ARG_VAL(callback, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getResource); - -PHP_HTTP_BEGIN_ARGS(append, 1) - PHP_HTTP_ARG_VAL(string, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addForm, 0) - PHP_HTTP_ARG_ARR(fields, 1, 0) - PHP_HTTP_ARG_ARR(files, 1, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addPart, 1) - PHP_HTTP_ARG_OBJ(http\\Message, message, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(etag); - -PHP_HTTP_BEGIN_ARGS(stat, 0) - PHP_HTTP_ARG_VAL(what, 0) -PHP_HTTP_END_ARGS; - -static zend_class_entry *php_http_message_body_class_entry; - -zend_class_entry *php_http_message_body_get_class_entry(void) -{ - return php_http_message_body_class_entry; -} - -static zend_function_entry php_http_message_body_method_entry[] = { - PHP_HTTP_MESSAGE_BODY_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_HTTP_MESSAGE_BODY_ME(__toString, ZEND_ACC_PUBLIC) - PHP_MALIAS(HttpMessageBody, toString, __toString, args_for_HttpMessageBody___toString, ZEND_ACC_PUBLIC) - PHP_MALIAS(HttpMessageBody, serialize, __toString, args_for_HttpMessageBody___toString, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(unserialize, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(toStream, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(toCallback, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(getResource, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(append, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(addForm, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(addPart, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(etag, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(stat, ZEND_ACC_PUBLIC) - EMPTY_FUNCTION_ENTRY -}; static zend_object_handlers php_http_message_body_object_handlers; -PHP_MINIT_FUNCTION(http_message_body) -{ - PHP_HTTP_REGISTER_CLASS(http\\Message, Body, http_message_body, php_http_object_get_class_entry(), 0); - php_http_message_body_class_entry->create_object = php_http_message_body_object_new; - memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; - zend_class_implements(php_http_message_body_class_entry TSRMLS_CC, 1, zend_ce_serializable); - return SUCCESS; -} - zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC) { return php_http_message_body_object_new_ex(ce, NULL, NULL TSRMLS_CC); @@ -613,7 +548,6 @@ zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_D zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_http_message_body_object_t *o; o = ecalloc(1, sizeof(php_http_message_body_object_t)); @@ -628,10 +562,10 @@ zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_ o->body = body; } - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_body_object_free, NULL TSRMLS_CC); - ov.handlers = &php_http_message_body_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_body_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_http_message_body_object_handlers; - return ov; + return o->zv; } zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC) @@ -639,8 +573,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; @@ -650,38 +585,46 @@ void php_http_message_body_object_free(void *object TSRMLS_DC) { php_http_message_body_object_t *obj = object; - if (!obj->shared) { - php_http_message_body_free(&obj->body); - } + php_http_message_body_free(&obj->body); zend_object_std_dtor((zend_object *) obj TSRMLS_CC); 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) + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___construct, 0, 0, 0) + ZEND_ARG_INFO(0, stream) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __construct) { php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval *zstream = NULL; php_stream *stream; - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) { if (zstream) { 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(); } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___toString, 0, 0, 0) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __toString) { if (SUCCESS == zend_parse_parameters_none()) { @@ -689,6 +632,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); @@ -697,6 +642,9 @@ PHP_METHOD(HttpMessageBody, __toString) RETURN_EMPTY_STRING(); } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_unserialize, 0, 0, 1) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, unserialize) { char *us_str; @@ -710,6 +658,9 @@ PHP_METHOD(HttpMessageBody, unserialize) } } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toStream, 0, 0, 1) + ZEND_ARG_INFO(0, stream) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toStream) { zval *zstream; @@ -719,6 +670,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; @@ -726,7 +679,9 @@ PHP_METHOD(HttpMessageBody, toStream) RETURN_FALSE; } - +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toCallback, 0, 0, 1) + ZEND_ARG_INFO(0, callback) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toCallback) { php_http_pass_fcall_arg_t fcd; @@ -735,6 +690,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); @@ -748,16 +705,23 @@ PHP_METHOD(HttpMessageBody, toCallback) RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_getResource, 0, 0, 0) +ZEND_END_ARG_INFO(); 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); } } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_append, 0, 0, 1) + ZEND_ARG_INFO(0, string) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, append) { char *str; @@ -766,11 +730,17 @@ 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; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addForm, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, fields, 1) + ZEND_ARG_ARRAY_INFO(0, files, 1) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, addForm) { HashTable *fields = NULL, *files = NULL; @@ -778,38 +748,52 @@ 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); - RETURN_SUCCESS(php_http_message_body_add_form(obj->body, fields, files)); + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + RETURN_BOOL(SUCCESS == php_http_message_body_add_form(obj->body, fields, files)); } RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addPart, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, message, http\\Message, 0) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, addPart) { zval *zobj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_get_class_entry())) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_class_entry)) { 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; } RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_etag, 0, 0, 0) +ZEND_END_ARG_INFO(); 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); } } RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_stat, 0, 0, 0) + ZEND_ARG_INFO(0, what) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, stat) { char *field_str = NULL; @@ -817,9 +801,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': @@ -855,6 +841,39 @@ PHP_METHOD(HttpMessageBody, stat) RETURN_FALSE; } +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, __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) + 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) + PHP_ME(HttpMessageBody, append, ai_HttpMessageBody_append, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, addForm, ai_HttpMessageBody_addForm, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, addPart, ai_HttpMessageBody_addPart, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, etag, ai_HttpMessageBody_etag, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, stat, ai_HttpMessageBody_stat, ZEND_ACC_PUBLIC) + EMPTY_FUNCTION_ENTRY +}; + +zend_class_entry *php_http_message_body_class_entry; + +PHP_MINIT_FUNCTION(http_message_body) +{ + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http\\Message", "Body", php_http_message_body_methods); + php_http_message_body_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC); + php_http_message_body_class_entry->create_object = php_http_message_body_object_new; + memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; + zend_class_implements(php_http_message_body_class_entry TSRMLS_CC, 1, zend_ce_serializable); + + return SUCCESS; +} + /* * Local variables: * tab-width: 4