} else {
zend_string *tmp = zval_get_string(zdata);
- stream = php_http_mem_stream_open(TEMP_STREAM_READONLY, tmp);
+ stream = php_stream_memory_open(TEMP_STREAM_READONLY, tmp->val, tmp->len);
zend_string_release(tmp);
}
} else {
return FAILURE;
} else {
zend_string *znc = zval_get_string(zname), *ztc = zval_get_string(ztype);
- php_http_arrkey_t arrkey = {0, znc, 0, 0};
+ php_http_arrkey_t arrkey = {0, znc};
char *key = format_key(&arrkey, name);
ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, ztc->val, zfc->val, stream);
return o;
}
-zend_object *php_http_message_body_object_clone(zend_object *object)
+zend_object *php_http_message_body_object_clone(zval *object)
{
php_http_message_body_object_t *new_obj;
- php_http_message_body_object_t *old_obj = PHP_HTTP_OBJ(object, NULL);
+ 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);
new_obj = php_http_message_body_object_new_ex(old_obj->zo.ce, body);
return &new_obj->zo;
}
-static HashTable *php_http_message_body_object_get_gc(zend_object *object, zval **table, int *n)
+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(object, NULL);
- HashTable *props = object->handlers->get_properties(object);
+ 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));
}
}
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_serialize, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___toString, 0, 0, 0)
ZEND_END_ARG_INFO();
-PHP_METHOD(HttpMessageBody, serialize)
+PHP_METHOD(HttpMessageBody, __toString)
{
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
ZEND_END_ARG_INFO();
PHP_METHOD(HttpMessageBody, unserialize)
{
- zend_string *us_str;
+ char *us_str;
+ size_t us_len;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &us_str)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &us_str, &us_len)) {
php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
- php_stream *s = php_http_mem_stream_open(0, us_str);
+ 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);
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessageBody___unserialize, 0, 1, IS_VOID, 0)
- ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpMessageBody, __unserialize)
-{
- HashTable *arr;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "h", &arr)) {
- zval *zv = zend_hash_index_find(arr, 0);
-
- if (zv) {
- zend_string *zs = zval_get_string(zv);
- php_stream *s = php_http_mem_stream_open(0, zs);
- php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
-
- obj->body = php_http_message_body_init(NULL, s);
- php_stream_to_zval(s, obj->gc);
- zend_string_release(zs);
- }
- }
-}
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessageBody___serialize, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpMessageBody, __serialize)
-{
-
- php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
- zend_string *zs;
-
- zend_parse_parameters_none();
-
- PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
-
- array_init(return_value);
- zs = php_http_message_body_to_string(obj->body, 0, 0);
- if (zs) {
- add_index_str(return_value, 0, zs);
- }
-}
-
-
-
ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toStream, 0, 0, 1)
ZEND_ARG_INFO(0, stream)
ZEND_ARG_INFO(0, offset)
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessageBody___toString, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO();
-
static zend_function_entry php_http_message_body_methods[] = {
PHP_ME(HttpMessageBody, __construct, ai_HttpMessageBody___construct, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessageBody, serialize, ai_HttpMessageBody_serialize, ZEND_ACC_PUBLIC)
- PHP_MALIAS(HttpMessageBody, toString, serialize, ai_HttpMessageBody_serialize, ZEND_ACC_PUBLIC)
- PHP_MALIAS(HttpMessageBody, __toString, serialize, ai_HttpMessageBody___toString, 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)
PHP_ME(HttpMessageBody, unserialize, ai_HttpMessageBody_unserialize, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessageBody, __serialize, ai_HttpMessageBody___serialize, 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)