X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=a52e8264acb741c6651ce471265f8eaff1485e19;hp=783e76d42a3580ce4283f505a3331d6510ea0d99;hb=20a7c37b273e313e53a37f4406eb49898dd50b6d;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0 diff --git a/php_http_message_body.c b/php_http_message_body.c index 783e76d..a52e826 100644 --- a/php_http_message_body.c +++ b/php_http_message_body.c @@ -6,12 +6,10 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http_message_body.c 292841 2009-12-31 08:48:57Z mike $ */ - #include "php_http.h" #include @@ -79,6 +77,7 @@ PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_messag 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); @@ -93,7 +92,7 @@ PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body) } } -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); @@ -115,7 +114,7 @@ PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t 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) { @@ -124,10 +123,10 @@ PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body) 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); } } @@ -159,6 +158,7 @@ PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod { 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); @@ -166,8 +166,7 @@ PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod 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); @@ -181,6 +180,7 @@ PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod 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) @@ -212,7 +212,6 @@ PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, 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); @@ -233,7 +232,10 @@ PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, Has 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( @@ -312,6 +314,7 @@ static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na 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; @@ -327,7 +330,7 @@ static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na --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); } @@ -339,12 +342,13 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam { 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)); @@ -376,6 +380,7 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam } } } 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; } @@ -428,7 +433,7 @@ 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_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; @@ -470,7 +475,7 @@ zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC) 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; @@ -492,7 +497,7 @@ PHP_METHOD(HttpMessageBody, __construct) 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); @@ -546,12 +551,16 @@ 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 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);