X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_inflatestream_object.c;h=851980ec43a345a355d6680f962ad39d9de4166c;hp=b89a77b7398deeaa5a5fc8062ebe870b4e281bee;hb=e37040ebf8a470c77c7ae3498ee582ca20db259c;hpb=b2e9ffe535660f5de2ec850ddc0dd6e99a34724d diff --git a/http_inflatestream_object.c b/http_inflatestream_object.c index b89a77b..851980e 100644 --- a/http_inflatestream_object.c +++ b/http_inflatestream_object.c @@ -6,17 +6,12 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define HTTP_WANT_ZLIB #include "php_http.h" @@ -27,35 +22,49 @@ #include "php_http_exception_object.h" #include "php_http_inflatestream_object.h" -#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpInflateStream, method, ret_ref, req_args) -#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, ret_ref) -#define HTTP_INFLATE_ME(method, visibility) PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, method), visibility) +#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpInflateStream, method, 0, req_args) +#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, 0) +#define HTTP_INFLATE_ME(method, visibility) PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, 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_EMPTY_ARGS(finish, 0); +HTTP_BEGIN_ARGS(flush, 0) + HTTP_ARG_VAL(data, 0) +HTTP_END_ARGS; + +HTTP_BEGIN_ARGS(finish, 0) + HTTP_ARG_VAL(data, 0) +HTTP_END_ARGS; +#define OBJ_PROP_CE http_inflatestream_object_ce zend_class_entry *http_inflatestream_object_ce; zend_function_entry http_inflatestream_object_fe[] = { + HTTP_INFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) HTTP_INFLATE_ME(update, ZEND_ACC_PUBLIC) + HTTP_INFLATE_ME(flush, ZEND_ACC_PUBLIC) HTTP_INFLATE_ME(finish, ZEND_ACC_PUBLIC) EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_inflatestream_object_handlers; -static inline void http_inflatestream_object_declare_default_properties() { return; } - PHP_MINIT_FUNCTION(http_inflatestream_object) { HTTP_REGISTER_CLASS_EX(HttpInflateStream, http_inflatestream_object, NULL, 0); http_inflatestream_object_handlers.clone_obj = _http_inflatestream_object_clone_obj; + +#ifndef WONKY + 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; } @@ -116,6 +125,30 @@ void _http_inflatestream_object_free(zend_object *object TSRMLS_DC) efree(o); } +/* {{{ proto void HttpInflateStream::__construct([int flags = 0]) + * + * Creates a new HttpInflateStream object instance. + * + * Accepts an optional int parameter specifying how to initialize the inflate stream. + */ +PHP_METHOD(HttpInflateStream, __construct) +{ + long flags = 0; + + SET_EH_THROW_HTTP(); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags)) { + getObject(http_inflatestream_object, obj); + + if (!obj->stream) { + obj->stream = http_encoding_inflate_stream_init(NULL, flags & 0x0fffffff); + } else { + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "HttpInflateStream cannot be initialized twice"); + } + } + SET_EH_NORMAL(); +} +/* }}} */ + /* {{{ proto string HttpInflateStream::update(string data) * * Passes more data through the inflate stream. @@ -139,11 +172,10 @@ PHP_METHOD(HttpInflateStream, update) RETURN_STRING("", 1); } - if (!obj->stream) { - if (!(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { - RETURN_FALSE; - } + if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { + RETURN_FALSE; } + if (SUCCESS == http_encoding_inflate_stream_update(obj->stream, data, data_len, &decoded, &decoded_len)) { RETURN_STRINGL(decoded, decoded_len, 0); } else { @@ -152,7 +184,39 @@ PHP_METHOD(HttpInflateStream, update) } /* }}} */ -/* {{{ proto string HttpInflateStream::finish() +/* {{{ proto string HttpInflateStream::flush([string data]) + * + * Flush the inflate stream. + * + * Returns some inflated data as string on success or FALSE on failure. + */ +PHP_METHOD(HttpInflateStream, flush) +{ + int data_len = 0; + size_t decoded_len = 0; + char *decoded = NULL, *data = NULL; + getObject(http_inflatestream_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { + RETURN_FALSE; + } + + if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { + RETURN_FALSE; + } + + /* flushing the inflate stream is a no-op */ + if (!data_len) { + RETURN_STRINGL("", 0, 1); + } else if (SUCCESS == http_encoding_inflate_stream_update(obj->stream, data, data_len, &decoded, &decoded_len)) { + RETURN_STRINGL(decoded, decoded_len, 0); + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto string HttpInflateStream::finish([string data]) * * Finalizes the inflate stream. The inflate stream can be reused after finalizing. * @@ -160,19 +224,39 @@ PHP_METHOD(HttpInflateStream, update) */ PHP_METHOD(HttpInflateStream, finish) { - size_t decoded_len = 0; - char *decoded = NULL; + int data_len = 0; + size_t updated_len = 0, decoded_len = 0; + char *updated = NULL, *decoded = NULL, *data = NULL; getObject(http_inflatestream_object, obj); - NO_ARGS; + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { + RETURN_FALSE; + } - if (!obj->stream) { + if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { RETURN_FALSE; } + if (data_len) { + if (SUCCESS != http_encoding_inflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) { + RETURN_FALSE; + } + } + if (SUCCESS == http_encoding_inflate_stream_finish(obj->stream, &decoded, &decoded_len)) { - RETVAL_STRINGL(decoded, decoded_len, 0); + if (updated_len) { + updated = erealloc(updated, updated_len + decoded_len + 1); + updated[updated_len + decoded_len] = '\0'; + memcpy(updated + updated_len, decoded, decoded_len); + STR_FREE(decoded); + updated_len += decoded_len; + RETVAL_STRINGL(updated, updated_len, 0); + } else { + STR_FREE(updated); + RETVAL_STRINGL(decoded, decoded_len, 0); + } } else { + STR_FREE(updated); RETVAL_FALSE; }