| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
php_http_message_body_appendf(body, "--%s" PHP_HTTP_CRLF, php_http_message_body_boundary(body)); \
} \
} while(0)
+
#define BOUNDARY_CLOSE(body) \
php_http_message_body_appendf(body, PHP_HTTP_CRLF "--%s--" PHP_HTTP_CRLF, php_http_message_body_boundary(body))
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_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);
}
TSRMLS_SET_CTX(body->ts);
+ if (body_ptr) {
+ *body_ptr = body;
+ }
+
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)
+unsigned php_http_message_body_addref(php_http_message_body_t *body)
{
- if (!from) {
- return NULL;
- } else {
+ return ++body->refcount;
+}
+
+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)
+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);
+ /* NOFIXME: shows leakinfo in DEBUG mode */
+ zend_list_delete(body->stream_id);
+ PTR_FREE(body->boundary);
+ efree(body);
+ }
+ *body_ptr = NULL;
}
}
-PHP_HTTP_API const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body)
+const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body)
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream_stat(php_http_message_body_stream(body), &body->ssb);
return &body->ssb;
}
-PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t *body)
+const char *php_http_message_body_boundary(php_http_message_body_t *body)
{
if (!body->boundary) {
union { double dbl; int num[2]; } data;
return body->boundary;
}
-PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body)
+char *php_http_message_body_etag(php_http_message_body_t *body)
{
const php_stream_statbuf *ssb = php_http_message_body_stat(body);
TSRMLS_FETCH_FROM_CTX(body->ts);
}
}
-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)
+void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen)
{
php_stream *s = php_http_message_body_stream(body);
TSRMLS_FETCH_FROM_CTX(body->ts);
*len = php_stream_copy_to_mem(s, buf, forlen, 0);
}
-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)
+STATUS php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen)
{
php_stream *s = php_http_message_body_stream(body);
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream_seek(s, offset, SEEK_SET);
+
if (!forlen) {
forlen = -1;
}
- php_stream_copy_to_stream_ex(s, dst, forlen, NULL);
+ return php_stream_copy_to_stream_ex(s, dst, forlen, NULL);
}
-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)
+STATUS 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)
{
php_stream *s = php_http_message_body_stream(body);
char *buf = emalloc(0x1000);
size_t read = php_stream_read(s, buf, MIN(forlen, 0x1000));
if (read) {
- cb(cb_arg, buf, read);
+ if (-1 == cb(cb_arg, buf, read)) {
+ return FAILURE;
+ }
}
if (read < MIN(forlen, sizeof(buf))) {
}
}
efree(buf);
+
+ return SUCCESS;
}
-PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len)
+size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len)
{
php_stream *s;
+ size_t written;
TSRMLS_FETCH_FROM_CTX(body->ts);
- s = php_http_message_body_stream(body);
- php_stream_seek(s, 0, SEEK_END);
- return php_stream_write(s, buf, len);
+ if (!(s = php_http_message_body_stream(body))) {
+ return -1;
+ }
+
+ if (s->ops->seek) {
+ php_stream_seek(s, 0, SEEK_END);
+ }
+
+ written = php_stream_write(s, buf, len);
+
+ if (written != len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to append %zu bytes to body; wrote %zu", len, written);
+ }
+
+ return len;
}
-PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...)
+size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...)
{
va_list argv;
char *print_str;
return print_len;
}
-PHP_HTTP_API STATUS php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files)
+STATUS php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files)
{
zval tmp;
return SUCCESS;
}
-PHP_HTTP_API void php_http_message_body_add_part(php_http_message_body_t *body, php_http_message_t *part)
+void php_http_message_body_add_part(php_http_message_body_t *body, php_http_message_t *part)
{
TSRMLS_FETCH_FROM_CTX(body->ts);
}
-PHP_HTTP_API STATUS php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len)
+STATUS php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len)
{
char *safe_name;
TSRMLS_FETCH_FROM_CTX(body->ts);
return SUCCESS;
}
-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)
+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), *bname;
size_t bname_len;
efree(safe_name);
efree(path_dup);
+ efree(bname);
return SUCCESS;
}
TSRMLS_FETCH_FROM_CTX(body->ts);
if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) {
- php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Expected array or object (name, type, file) for message body file to add");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array or object (name, type, file) for message body file to add");
return FAILURE;
}
/* 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;
}
len = 0;
} else {
/* let this be garbage */
- php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Malformed multipart boundary at pos %zu", consumed);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Malformed multipart boundary at pos %zu", consumed);
return -1;
}
}
return consumed;
}
-PHP_HTTP_API php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, const char *boundary)
+php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, const char *boundary)
{
php_stream *s = php_http_message_body_stream(body);
php_http_buffer_t *tmp = NULL;
php_http_buffer_free(&tmp);
php_http_message_parser_free(&arg.parser);
php_http_buffer_dtor(&arg.buf);
- STR_FREE(arg.boundary_str);
+ PTR_FREE(arg.boundary_str);
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(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_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;
-
- 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);
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));
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;
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)
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);
-
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()) {
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
- if (zstream) {
- php_stream_from_zval(stream, &zstream);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream), invalid_arg, return);
- if (stream) {
- if (obj->body) {
- php_http_message_body_dtor(obj->body);
- }
- obj->body = php_http_message_body_init(obj->body, stream TSRMLS_CC);
- }
- }
- if (!obj->body) {
- obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
- }
+ if (zstream) {
+ php_http_expect(php_stream_from_zval_no_verify(stream, &zstream), unexpected_val, return);
+
+ if (obj->body) {
+ php_http_message_body_free(&obj->body);
}
- } end_error_handling();
+ obj->body = php_http_message_body_init(NULL, stream TSRMLS_CC);
+ }
}
+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()) {
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);
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;
+ 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);
+ }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toStream, 0, 0, 1)
+ ZEND_ARG_INFO(0, stream)
+ ZEND_ARG_INFO(0, offset)
+ ZEND_ARG_INFO(0, maxlen)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpMessageBody, toStream)
{
zval *zstream;
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;
+ RETURN_ZVAL(getThis(), 1, 0);
}
- RETURN_FALSE;
}
-
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toCallback, 0, 0, 1)
+ ZEND_ARG_INFO(0, callback)
+ ZEND_ARG_INFO(0, offset)
+ ZEND_ARG_INFO(0, maxlen)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpMessageBody, toCallback)
{
php_http_pass_fcall_arg_t fcd;
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);
zend_fcall_info_args_clear(&fcd.fci, 1);
zval_ptr_dtor(&fcd.fcz);
- RETURN_TRUE;
+ RETURN_ZVAL(getThis(), 1, 0);
}
- 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_getBoundary, 0, 0, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpMessageBody, getBoundary)
+{
+ 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);
+
+ if (obj->body->boundary) {
+ RETURN_STRING(obj->body->boundary, 1);
+ }
+ }
+}
+
+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;
int len;
+ php_http_message_body_object_t *obj;
- 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_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len), invalid_arg, return);
- RETURN_LONG(php_http_message_body_append(obj->body, str, len));
- }
- RETURN_FALSE;
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
+ php_http_expect(len == php_http_message_body_append(obj->body, str, len), runtime, return);
+
+ RETURN_ZVAL(getThis(), 1, 0);
}
+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;
+ php_http_message_body_object_t *obj;
- 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);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!h!", &fields, &files), invalid_arg, return);
- RETURN_SUCCESS(php_http_message_body_add_form(obj->body, fields, files));
- }
- RETURN_FALSE;
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
+ php_http_expect(SUCCESS == php_http_message_body_add_form(obj->body, fields, files), runtime, return);
+
+ RETURN_ZVAL(getThis(), 1, 0);
}
+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;
+ php_http_message_body_object_t *obj;
+ php_http_message_object_t *mobj;
+ zend_error_handling zeh;
- 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);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_class_entry), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ mobj = zend_object_store_get_object(zobj TSRMLS_CC);
- php_http_message_body_add_part(obj->body, mobj->message);
- RETURN_TRUE;
+ PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj);
+
+ zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC);
+ php_http_message_body_add_part(obj->body, mobj->message);
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+
+ if (!EG(exception)) {
+ RETURN_ZVAL(getThis(), 1, 0);
}
- 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);
+ } else {
+ RETURN_FALSE;
}
}
- RETURN_FALSE;
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_stat, 0, 0, 0)
+ ZEND_ARG_INFO(0, field)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpMessageBody, stat)
{
char *field_str = NULL;
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':
RETURN_LONG(sb->sb.st_ctime);
break;
default:
- php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "unknown stat field: '%s' (should be one of [s]ize, [a]time, [m]time or [c]time)", field_str);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown stat field: '%s' (should be one of [s]ize, [a]time, [m]time or [c]time)", field_str);
break;
}
} else {
- array_init(return_value);
- add_assoc_long_ex(return_value, ZEND_STRS("size"), sb->sb.st_size);
- add_assoc_long_ex(return_value, ZEND_STRS("atime"), sb->sb.st_atime);
- add_assoc_long_ex(return_value, ZEND_STRS("mtime"), sb->sb.st_mtime);
- add_assoc_long_ex(return_value, ZEND_STRS("ctime"), sb->sb.st_ctime);
- return;
+ object_init(return_value);
+ add_property_long_ex(return_value, ZEND_STRS("size"), sb->sb.st_size TSRMLS_CC);
+ add_property_long_ex(return_value, ZEND_STRS("atime"), sb->sb.st_atime TSRMLS_CC);
+ add_property_long_ex(return_value, ZEND_STRS("mtime"), sb->sb.st_mtime TSRMLS_CC);
+ add_property_long_ex(return_value, ZEND_STRS("ctime"), sb->sb.st_ctime TSRMLS_CC);
}
}
}
- 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, getBoundary, ai_HttpMessageBody_getBoundary, 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(&ce 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;
}
/*
projects / m6w6 / ext-http / blobdiff