| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id: http_message_body.c 292841 2009-12-31 08:48:57Z mike $ */
-
#include "php_http.h"
#include <libgen.h>
PHP_HTTP_API void php_http_message_body_dtor(php_http_message_body_t *body)
{
+ TSRMLS_FETCH_FROM_CTX(body->ts);
/* NO FIXME: shows leakinfo in DEBUG mode */
zend_list_delete(body->stream_id);
STR_FREE(body->boundary);
}
}
-PHP_HTTP_API php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body)
+PHP_HTTP_API 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);
PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body)
{
TSRMLS_FETCH_FROM_CTX(body->ts);
- php_stream_statbuf *ssb = php_http_message_body_stat(body);
+ const php_stream_statbuf *ssb = php_http_message_body_stat(body);
/* real file or temp buffer ? */
if (body->ssb.sb.st_mtime) {
spprintf(&etag, 0, "%lx-%lx-%lx", ssb->sb.st_ino, ssb->sb.st_mtime, ssb->sb.st_size);
return etag;
} else {
- void *ctx = php_http_etag_init(TSRMLS_C);
+ 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_etag_update, ctx, 0, 0);
- return php_http_etag_finish(ctx 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);
}
}
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream *s = php_http_message_body_stream(body);
+ char *buf = emalloc(0x1000);
php_stream_seek(s, offset, SEEK_SET);
forlen = -1;
}
while (!php_stream_eof(s)) {
- char buf[0x1000];
- size_t read = php_stream_read(s, buf, MIN(forlen, sizeof(buf)));
+ size_t read = php_stream_read(s, buf, MIN(forlen, 0x1000));
if (read) {
cb(cb_arg, buf, read);
break;
}
}
+ efree(buf);
}
PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len)
PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, HashTable *fields, HashTable *files)
{
zval tmp;
- TSRMLS_FETCH_FROM_CTX(body->ts);
if (fields) {
INIT_PZVAL_ARRAY(&tmp, fields);
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)
{
- char *safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC);
+ char *safe_name;
+ TSRMLS_FETCH_FROM_CTX(body->ts);
+
+ safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC);
BOUNDARY_OPEN(body);
php_http_message_body_appendf(
zval **val;
HashPosition pos;
php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ TSRMLS_FETCH_FROM_CTX(body->ts);
if (!HASH_OF(value)->nApplyCount) {
++HASH_OF(value)->nApplyCount;
--HASH_OF(value)->nApplyCount;
}
} else {
- zval *cpy = php_http_zsep(IS_STRING, value);
+ zval *cpy = php_http_ztyp(IS_STRING, value);
php_http_message_body_add_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
zval_ptr_dtor(&cpy);
}
{
if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
zval **zfile, **zname, **ztype;
+ TSRMLS_FETCH_FROM_CTX(body->ts);
if ((SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("name"), (void *) &zname))
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("file"), (void *) &zfile))
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("type"), (void *) &ztype))
) {
- zval *zfc = php_http_zsep(IS_STRING, *zfile), *znc = php_http_zsep(IS_STRING, *zname), *ztc = php_http_zsep(IS_STRING, *ztype);
+ zval *zfc = php_http_ztyp(IS_STRING, *zfile), *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype);
char *str = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
STATUS ret = php_http_message_body_add_file(body, str, Z_STRVAL_P(zfc), Z_STRVAL_P(ztc));
}
}
} else {
+ TSRMLS_FETCH_FROM_CTX(body->ts);
php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Unrecognized array format for message body file to add");
return FAILURE;
}
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_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;
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);
- 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);
+ 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);
zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(object) TSRMLS_CC);
return new_ov;
zval *zstream = NULL;
php_stream *stream;
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
+ with_error_handling(EH_THROW, php_http_exception_class_entry) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
if (zstream) {
php_stream_from_zval(stream, &zstream);
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 TSRMLS_DC)
+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);
projects / m6w6 / ext-http / blobdiff