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);
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;
}
}
efree(safe_name);
efree(path_dup);
+ efree(bname);
return SUCCESS;
}
/* 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;
}
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_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_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;
}
o = ecalloc(1, sizeof(php_http_message_body_object_t));
zend_object_std_init((zend_object *) o, php_http_message_body_class_entry TSRMLS_CC);
-#if PHP_VERSION_ID < 50339
- zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*));
-#else
object_properties_init((zend_object *) o, ce);
-#endif
if (ptr) {
*ptr = o;
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;
{
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);
}
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) {
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;
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);
}
}
projects / m6w6 / ext-http / blobdiff