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) {
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) {
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) {
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);
return print_len;
}
-PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, HashTable *fields, HashTable *files)
+PHP_HTTP_API 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)
+{
+ TSRMLS_FETCH_FROM_CTX(body->ts);
+
+ BOUNDARY_OPEN(body);
+ php_http_message_to_callback(part, (php_http_pass_callback_t) php_http_message_body_append, body);
+ BOUNDARY_CLOSE(body);
+}
-PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len)
+
+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)
{
char *safe_name;
TSRMLS_FETCH_FROM_CTX(body->ts);
return SUCCESS;
}
-PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in)
+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(
"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;
}
}
} else {
zval *cpy = php_http_ztyp(IS_STRING, value);
- php_http_message_body_add_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
+ php_http_message_body_add_form_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
zval_ptr_dtor(&cpy);
}
} else {
zval *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype);
char *key = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
- STATUS ret = php_http_message_body_add_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream);
+ STATUS ret = php_http_message_body_add_form_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream);
efree(key);
zval_ptr_dtor(&znc);
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_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(add, 0)
+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;
-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(add, 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
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;
}
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);
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;
RETURN_FALSE;
}
-struct fcd {
- zval *fcz;
- zend_fcall_info fci;
- zend_fcall_info_cache fcc;
-#ifdef ZTS
- void ***ts;
-#endif
-};
-
-static size_t pass(void *cb_arg, const char *str, size_t len)
-{
- struct fcd *fcd = cb_arg;
- zval *zdata;
- TSRMLS_FETCH_FROM_CTX(fcd->ts);
-
- MAKE_STD_ZVAL(zdata);
- ZVAL_STRINGL(zdata, str, len, 1);
- if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) {
- zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC);
- zend_fcall_info_args_clear(&fcd->fci, 0);
- }
- zval_ptr_dtor(&zdata);
- return len;
-}
PHP_METHOD(HttpMessageBody, toCallback)
{
- struct fcd fcd;
+ php_http_pass_fcall_arg_t fcd;
long offset = 0, forlen = 0;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) {
Z_ADDREF_P(fcd.fcz);
TSRMLS_SET_CTX(fcd.ts);
- php_http_message_body_to_callback(obj->body, pass, &fcd, offset, forlen);
+ php_http_message_body_to_callback(obj->body, php_http_pass_fcall_callback, &fcd, offset, forlen);
zend_fcall_info_args_clear(&fcd.fci, 1);
zval_ptr_dtor(&fcd.fcz);
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;
RETURN_FALSE;
}
-PHP_METHOD(HttpMessageBody, add)
+PHP_METHOD(HttpMessageBody, addForm)
{
HashTable *fields = NULL, *files = NULL;
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(obj->body, fields, files));
+ RETURN_SUCCESS(php_http_message_body_add_form(obj->body, fields, files));
+ }
+ RETURN_FALSE;
+}
+
+PHP_METHOD(HttpMessageBody, addPart)
+{
+ zval *zobj;
+
+ 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_message_body_add_part(obj->body, mobj->message);
+ RETURN_TRUE;
}
RETURN_FALSE;
}