X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=b2fe39946b67acc8c69c229726785069cadc6633;hp=34741486fd908b9cf9f0675386c69b427285c961;hb=34c8af32031e2e847b4919402373ad70fc28a863;hpb=880540695ec6784e5570a15533467f7dff98d4f1 diff --git a/php_http_message_body.c b/php_http_message_body.c index 3474148..b2fe399 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; } } @@ -111,8 +123,8 @@ PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body) { - TSRMLS_FETCH_FROM_CTX(body->ts); const php_stream_statbuf *ssb = php_http_message_body_stat(body); + TSRMLS_FETCH_FROM_CTX(body->ts); /* real file or temp buffer ? */ if (ssb && ssb->sb.st_mtime) { @@ -134,8 +146,8 @@ PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body) PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); if (!forlen) { @@ -146,8 +158,8 @@ PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, PHP_HTTP_API void php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); if (!forlen) { @@ -158,9 +170,9 @@ PHP_HTTP_API void php_http_message_body_to_stream(php_http_message_body_t *body, PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); char *buf = emalloc(0x1000); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); @@ -264,10 +276,13 @@ PHP_HTTP_API STATUS php_http_message_body_add_form_field(php_http_message_body_t PHP_HTTP_API STATUS php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in) { - char *safe_name, *path_dup = estrdup(path); + char *safe_name, *path_dup = estrdup(path), *bname; + size_t bname_len; TSRMLS_FETCH_FROM_CTX(body->ts); safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); + + php_basename(path_dup, strlen(path_dup), NULL, 0, &bname, &bname_len TSRMLS_CC); BOUNDARY_OPEN(body); php_http_message_body_appendf( @@ -276,13 +291,14 @@ PHP_HTTP_API STATUS php_http_message_body_add_form_file(php_http_message_body_t "Content-Transfer-Encoding: binary" PHP_HTTP_CRLF "Content-Type: %s" PHP_HTTP_CRLF PHP_HTTP_CRLF, - safe_name, basename(path_dup), ctype + safe_name, bname, ctype ); php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL); BOUNDARY_CLOSE(body); efree(safe_name); efree(path_dup); + efree(bname); return SUCCESS; } @@ -464,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; } @@ -534,6 +550,9 @@ PHP_HTTP_BEGIN_ARGS(__construct, 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) @@ -543,6 +562,8 @@ 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; @@ -553,7 +574,7 @@ PHP_HTTP_BEGIN_ARGS(addForm, 0) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(addPart, 1) - PHP_HTTP_ARG_OBJ(http\\Message, "message", 0) + PHP_HTTP_ARG_OBJ(http\\Message, message, 0) PHP_HTTP_END_ARGS; PHP_HTTP_EMPTY_ARGS(etag); @@ -562,13 +583,22 @@ PHP_HTTP_BEGIN_ARGS(stat, 0) PHP_HTTP_ARG_VAL(what, 0) PHP_HTTP_END_ARGS; -zend_class_entry *php_http_message_body_class_entry; -zend_function_entry php_http_message_body_method_entry[] = { +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) @@ -580,11 +610,11 @@ 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_class_entry, 0); + 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; } @@ -621,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; @@ -632,8 +663,9 @@ void php_http_message_body_object_free(void *object TSRMLS_DC) { php_http_message_body_object_t *obj = object; - php_http_message_body_free(&obj->body); - + if (!obj->shared) { + php_http_message_body_free(&obj->body); + } zend_object_std_dtor((zend_object *) obj TSRMLS_CC); efree(obj); } @@ -644,16 +676,16 @@ PHP_METHOD(HttpMessageBody, __construct) zval *zstream = NULL; php_stream *stream; - with_error_handling(EH_THROW, php_http_exception_class_entry) { + with_error_handling(EH_THROW, php_http_exception_get_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) { - php_http_message_body_dtor(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) { @@ -678,6 +710,19 @@ PHP_METHOD(HttpMessageBody, __toString) RETURN_EMPTY_STRING(); } +PHP_METHOD(HttpMessageBody, unserialize) +{ + char *us_str; + int us_len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &us_str, &us_len)) { + php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_stream *s = php_stream_memory_open(0, us_str, us_len); + + obj->body = php_http_message_body_init(NULL, s TSRMLS_CC); + } +} + PHP_METHOD(HttpMessageBody, toStream) { zval *zstream; @@ -716,6 +761,16 @@ PHP_METHOD(HttpMessageBody, toCallback) RETURN_FALSE; } +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); + + zend_list_addref(obj->body->stream_id); + RETVAL_RESOURCE(obj->body->stream_id); + } +} + PHP_METHOD(HttpMessageBody, append) { char *str; @@ -745,7 +800,7 @@ PHP_METHOD(HttpMessageBody, addPart) { zval *zobj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_class_entry)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_get_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);