} else {
php_http_etag_t *etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC);
- php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0);
- return php_http_etag_finish(etag);
+ if (etag) {
+ php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0);
+ return php_http_etag_finish(etag);
+ } else {
+ return NULL;
+ }
}
}
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);
BOUNDARY_OPEN(body);
php_http_message_body_appendf(
body,
- "Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF
- "" PHP_HTTP_CRLF,
- safe_name);
+ "Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF
+ "" PHP_HTTP_CRLF,
+ safe_name
+ );
php_http_message_body_append(body, value_str, value_len);
BOUNDARY_CLOSE(body);
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)
{
- php_stream_statbuf ssb = {{0}};
- php_stream_filter *tef = NULL;
char *safe_name, *path_dup = estrdup(path);
TSRMLS_FETCH_FROM_CTX(body->ts);
BOUNDARY_OPEN(body);
php_http_message_body_appendf(
body,
- "Content-Disposition: attachment; name=\"%s\"; filename=\"%s\"" PHP_HTTP_CRLF
- "Content-Type: %s" PHP_HTTP_CRLF,
+ "Content-Disposition: form-data; name=\"%s\"; filename=\"%s\"" PHP_HTTP_CRLF
+ "Content-Transfer-Encoding: binary" PHP_HTTP_CRLF
+ "Content-Type: %s" PHP_HTTP_CRLF
+ PHP_HTTP_CRLF,
safe_name, basename(path_dup), ctype
);
-
- if (SUCCESS == php_stream_stat(in, &ssb)) {
- php_http_message_body_appendf(
- body,
- "Content-Length: %zu" PHP_HTTP_CRLF
- "" PHP_HTTP_CRLF,
- ssb.sb.st_size
- );
- } else {
- php_http_message_body_append(
- body,
- ZEND_STRL(
- "Transfer-Encoding: chunked" PHP_HTTP_CRLF
- "" PHP_HTTP_CRLF
- )
- );
-
- if ((tef = php_http_filter_factory.create_filter("http.chunked_encode", NULL, 0 TSRMLS_CC))) {
- php_stream_filter_append(&in->readfilters, tef);
- }
- }
-
php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL);
BOUNDARY_CLOSE(body);
- if (tef) {
- php_stream_filter_remove(tef, 1 TSRMLS_CC);
- php_stream_filter_free(tef TSRMLS_CC);
- }
-
efree(safe_name);
efree(path_dup);
} else if (type == HASH_KEY_IS_STRING) {
new_key = estrdup(str);
} else {
- estrdup("");
+ new_key = estrdup("");
}
return new_key;
}
} 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);
}
if (!ht->nApplyCount) {
++ht->nApplyCount;
FOREACH_HASH_KEYVAL(pos, ht, key, val) {
- char *str = format_key(key.type, key.str, key.num, name);
- if (SUCCESS != add_recursive_files(body, str, *val)) {
+ if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) {
+ char *str = format_key(key.type, key.str, key.num, name);
+
+ if (SUCCESS != add_recursive_files(body, str, *val)) {
+ efree(str);
+ --ht->nApplyCount;
+ return FAILURE;
+ }
efree(str);
- --ht->nApplyCount;
- return FAILURE;
}
- efree(str);
}
--ht->nApplyCount;
}
} else {
zval *tmp = php_http_ztyp(IS_STRING, *zdata);
- if ((stream = php_stream_temp_new())) {
- php_stream_write(stream, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- }
+ stream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
zval_ptr_dtor(&tmp);
}
} else {
} 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);
+ zval_ptr_dtor(&ztc);
zval_ptr_dtor(&zfc);
if (!zdata || Z_TYPE_PP(zdata) != IS_RESOURCE) {
php_stream_close(stream);
}
}
+struct splitbody_arg {
+ php_http_buffer_t buf;
+ php_http_message_parser_t *parser;
+ char *boundary_str;
+ size_t boundary_len;
+ size_t consumed;
+};
+
+static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC)
+{
+ struct splitbody_arg *arg = opaque;
+ const char *boundary = NULL;
+ size_t consumed = 0;
+ int first_boundary;
+
+ do {
+ first_boundary = !(consumed || arg->consumed);
+
+ if ((boundary = php_http_locate_str(buf, len, arg->boundary_str + first_boundary, arg->boundary_len - first_boundary))) {
+ size_t real_boundary_len = arg->boundary_len - 1, cut;
+ const char *real_boundary = boundary + !first_boundary;
+ int eol_len = 0;
+
+ if (buf + len <= real_boundary + real_boundary_len) {
+ /* if we just have enough data for the boundary, it's just a byte too less */
+ arg->consumed += consumed;
+ return consumed;
+ }
+
+ if (!first_boundary) {
+ /* this is not the first boundary, read rest of this message */
+ php_http_buffer_append(&arg->buf, buf, real_boundary - buf);
+ php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+ }
+
+ /* move after the boundary */
+ cut = real_boundary - buf + real_boundary_len;
+ buf += cut;
+ len -= cut;
+ consumed += cut;
+
+ if (buf == php_http_locate_bin_eol(buf, len, &eol_len)) {
+ /* skip CRLF */
+ buf += eol_len;
+ len -= eol_len;
+ consumed += eol_len;
+
+ if (!first_boundary) {
+ /* advance messages */
+ php_http_message_t *msg;
+
+ msg = php_http_message_init(NULL, 0 TSRMLS_CC);
+ msg->parent = arg->parser->message;
+ arg->parser->message = msg;
+ }
+ } else {
+ /* is this the last boundary? */
+ if (*buf == '-') {
+ /* ignore the rest */
+ consumed += len;
+ len = 0;
+ } else {
+ /* let this be garbage */
+ php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Malformed multipart boundary at pos %zu", consumed);
+ return -1;
+ }
+ }
+ }
+ } while (boundary && len);
+
+ /* let there be room for the next boundary */
+ if (len > arg->boundary_len) {
+ consumed += len - arg->boundary_len;
+ php_http_buffer_append(&arg->buf, buf, len - arg->boundary_len);
+ php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+ }
+
+ arg->consumed += consumed;
+ return consumed;
+}
+
+PHP_HTTP_API 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_message_t *msg = NULL;
+ struct splitbody_arg arg;
+ TSRMLS_FETCH_FROM_CTX(body->ts);
+
+ php_http_buffer_init(&arg.buf);
+ arg.parser = php_http_message_parser_init(NULL TSRMLS_CC);
+ arg.boundary_len = spprintf(&arg.boundary_str, 0, "\n--%s", boundary);
+ arg.consumed = 0;
+
+ php_stream_rewind(s);
+ while (!php_stream_eof(s)) {
+ php_http_buffer_passthru(&tmp, 0x1000, (php_http_buffer_pass_func_t) _php_stream_read, s, splitbody, &arg TSRMLS_CC);
+ }
+
+ msg = arg.parser->message;
+ arg.parser->message = NULL;
+
+ php_http_buffer_free(&tmp);
+ php_http_message_parser_free(&arg.parser);
+ php_http_buffer_dtor(&arg.buf);
+ STR_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)
PHP_HTTP_ARG_VAL(string, 0)
PHP_HTTP_END_ARGS;
-PHP_HTTP_BEGIN_ARGS(add, 0)
- PHP_HTTP_ARG_VAL(fields, 0)
- PHP_HTTP_ARG_VAL(files, 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_MESSAGE_BODY_ME(toStream, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_BODY_ME(toCallback, 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_METHOD(HttpMessageBody, toCallback)
{
- struct fcd fcd = {0};
+ struct fcd fcd;
long offset = 0, forlen = 0;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) {
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, "|hh", &fields, &files)) {
+ 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_form(obj->body, fields, files));
+ }
+ RETURN_FALSE;
+}
+
+PHP_METHOD(HttpMessageBody, addPart)
+{
+ php_http_message_object_t *mobj;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &mobj, php_http_message_class_entry)) {
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));
+ php_http_message_body_add_part(obj->body, mobj->message);
+ RETURN_TRUE;
}
RETURN_FALSE;
}
projects / m6w6 / ext-http / blobdiff