X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_deflatestream_object.c;h=9d99bc9aa239c9d371d520e70cb6b518d0116f15;hp=560cdc6354830fb867133af8b3c0c6678c9c3851;hb=82e8bfff78f52b0989fb865131461fe61156f507;hpb=4fcbd8e8ae31611c5197ff2369673b5939fc2b80 diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c index 560cdc6..9d99bc9 100644 --- a/http_deflatestream_object.c +++ b/http_deflatestream_object.c @@ -22,29 +22,27 @@ #include "php_http_exception_object.h" #include "php_http_deflatestream_object.h" -#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, ret_ref, req_args) -#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, ret_ref) -#define HTTP_DEFLATE_ME(method, visibility) PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility) +#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, 0, req_args) +#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, 0) +#define HTTP_DEFLATE_ME(method, visibility) PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility) -HTTP_BEGIN_ARGS(__construct, 0, 0) +HTTP_BEGIN_ARGS(__construct, 0) HTTP_ARG_VAL(flags, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(update, 0, 1) +HTTP_BEGIN_ARGS(update, 1) HTTP_ARG_VAL(data, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(flush, 0, 0) +HTTP_BEGIN_ARGS(flush, 0) HTTP_ARG_VAL(data, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(finish, 0, 0) +HTTP_BEGIN_ARGS(finish, 0) HTTP_ARG_VAL(data, 0) HTTP_END_ARGS; -#define http_deflatestream_object_declare_default_properties() _http_deflatestream_object_declare_default_properties(TSRMLS_C) -static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_D); - +#define OBJ_PROP_CE http_deflatestream_object_ce zend_class_entry *http_deflatestream_object_ce; zend_function_entry http_deflatestream_object_fe[] = { HTTP_DEFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) @@ -60,6 +58,24 @@ PHP_MINIT_FUNCTION(http_deflatestream_object) { HTTP_REGISTER_CLASS_EX(HttpDeflateStream, http_deflatestream_object, NULL, 0); http_deflatestream_object_handlers.clone_obj = _http_deflatestream_object_clone_obj; + +#ifndef WONKY + DCL_CONST(long, "TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP); + DCL_CONST(long, "TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB); + DCL_CONST(long, "TYPE_RAW", HTTP_DEFLATE_TYPE_RAW); + DCL_CONST(long, "LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF); + DCL_CONST(long, "LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN); + DCL_CONST(long, "LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX); + DCL_CONST(long, "STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF); + DCL_CONST(long, "STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT); + DCL_CONST(long, "STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF); + DCL_CONST(long, "STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE); + DCL_CONST(long, "STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED); + DCL_CONST(long, "FLUSH_NONE", HTTP_ENCODING_STREAM_FLUSH_NONE); + DCL_CONST(long, "FLUSH_SYNC", HTTP_ENCODING_STREAM_FLUSH_SYNC); + DCL_CONST(long, "FLUSH_FULL", HTTP_ENCODING_STREAM_FLUSH_FULL); +#endif + return SUCCESS; } @@ -85,7 +101,8 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e } ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); + zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); ov.handle = putObject(http_deflatestream_object, o); ov.handlers = &http_deflatestream_object_handlers; @@ -96,47 +113,29 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e zend_object_value _http_deflatestream_object_clone_obj(zval *this_ptr TSRMLS_DC) { http_encoding_stream *s; - getObject(http_deflatestream_object, obj); + zend_object_value new_ov; + http_deflatestream_object *new_obj = NULL; + getObject(http_deflatestream_object, old_obj); s = ecalloc(1, sizeof(http_encoding_stream)); - s->flags = obj->stream->flags; - deflateCopy(&s->stream, &obj->stream->stream); + s->flags = old_obj->stream->flags; + deflateCopy(&s->stream, &old_obj->stream->stream); s->stream.opaque = phpstr_dup(s->stream.opaque); - return http_deflatestream_object_new_ex(Z_OBJCE_P(this_ptr), s, NULL); -} - -static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_deflatestream_object_ce; - -#ifndef WONKY - DCL_CONST(long, "TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP); - DCL_CONST(long, "TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB); - DCL_CONST(long, "TYPE_RAW", HTTP_DEFLATE_TYPE_RAW); - DCL_CONST(long, "LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF); - DCL_CONST(long, "LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN); - DCL_CONST(long, "LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX); - DCL_CONST(long, "STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF); - DCL_CONST(long, "STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT); - DCL_CONST(long, "STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF); - DCL_CONST(long, "STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE); - DCL_CONST(long, "STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED); -#endif + new_ov = http_deflatestream_object_new_ex(old_obj->zo.ce, s, &new_obj); + zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + + return new_ov; } void _http_deflatestream_object_free(zend_object *object TSRMLS_DC) { http_deflatestream_object *o = (http_deflatestream_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } if (o->stream) { http_encoding_deflate_stream_free(&o->stream); } - efree(o); + freeObject(o); } /* {{{ proto void HttpDeflateStream::__construct([int flags = 0]) @@ -154,7 +153,7 @@ PHP_METHOD(HttpDeflateStream, __construct) getObject(http_deflatestream_object, obj); if (!obj->stream) { - obj->stream = http_encoding_deflate_stream_init(NULL, flags); + obj->stream = http_encoding_deflate_stream_init(NULL, flags & 0x0fffffff); } else { http_error_ex(HE_WARNING, HTTP_E_ENCODING, "HttpDeflateStream cannot be initialized twice"); }