| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#define HTTP_WANT_ZLIB
#include "php_http.h"
#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_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 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)
};
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;
}
{
http_inflatestream_object *o = (http_inflatestream_object *) object;
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
if (o->stream) {
http_encoding_inflate_stream_free(&o->stream);
}
- efree(o);
+ freeObject(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)
*
char *decoded = NULL, *data = NULL;
getObject(http_inflatestream_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len));
+ 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;
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);
- STR_FREE(decoded);
} else {
- RETVAL_STRINGL(decoded, decoded_len, 0);
STR_FREE(updated);
+ RETVAL_STRINGL(decoded, decoded_len, 0);
}
} else {
+ STR_FREE(updated);
RETVAL_FALSE;
}