X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_deflatestream_object.c;h=d1e0d6fe5680d911fdf85e46276e574e94d99f07;hp=b535cf5aaca536575f421f7f45b486c643b78224;hb=b46b6f8c9261ed2b7c5198169073b0ed18a9c4f5;hpb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4

diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c
index b535cf5..d1e0d6f 100644
--- a/http_deflatestream_object.c
+++ b/http_deflatestream_object.c
@@ -30,6 +30,11 @@ HTTP_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_VAL(flags, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(factory, 0)
+	HTTP_ARG_VAL(flags, 0)
+	HTTP_ARG_VAL(class_name, 0)
+HTTP_END_ARGS;
+
 HTTP_BEGIN_ARGS(update, 1)
 	HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
@@ -50,6 +55,8 @@ zend_function_entry http_deflatestream_object_fe[] = {
 	HTTP_DEFLATE_ME(flush, ZEND_ACC_PUBLIC)
 	HTTP_DEFLATE_ME(finish, ZEND_ACC_PUBLIC)
 	
+	HTTP_DEFLATE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	
 	EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers http_deflatestream_object_handlers;
@@ -101,7 +108,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;
@@ -112,14 +120,19 @@ 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);
+	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)
@@ -133,11 +146,7 @@ void _http_deflatestream_object_free(zend_object *object TSRMLS_DC)
 }
 
 /* {{{ proto void HttpDeflateStream::__construct([int flags = 0])
- *
- * Creates a new HttpDeflateStream object instance.
- * 
- * Accepts an optional int parameter specifying how to initialize the deflate stream.
- */ 
+	Creates a new HttpDeflateStream object instance. */
 PHP_METHOD(HttpDeflateStream, __construct)
 {
 	long flags = 0;
@@ -156,14 +165,29 @@ PHP_METHOD(HttpDeflateStream, __construct)
 }
 /* }}} */
 
+/* {{{ proto HttpDeflateStream HttpDeflateStream::factory([int flags[, string class = "HttpDeflateStream"]])
+	Creates a new HttpDeflateStream object instance. */
+PHP_METHOD(HttpDeflateStream, factory)
+{
+	long flags = 0;
+	char *cn = NULL;
+	int cl = 0;
+	
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &flags, &cn, &cl)) {
+		zend_object_value ov;
+		http_encoding_stream *s = http_encoding_deflate_stream_init(NULL, flags & 0x0fffffff);
+		
+		if (SUCCESS == http_object_new(&ov, cn, cl, _http_deflatestream_object_new_ex, http_deflatestream_object_ce, s, NULL)) {
+			RETVAL_OBJVAL(ov, 0);
+		}
+	}
+	SET_EH_NORMAL();
+}
+/* }}} */
+
 /* {{{ proto string HttpDeflateStream::update(string data)
- *
- * Passes more data through the deflate stream.
- * 
- * Expects a string parameter containing (a part of) the data to deflate.
- * 
- * Returns deflated data on success or FALSE on failure.
- */
+	Passes more data through the deflate stream. */
 PHP_METHOD(HttpDeflateStream, update)
 {
 	int data_len;
@@ -188,11 +212,7 @@ PHP_METHOD(HttpDeflateStream, update)
 /* }}} */
 
 /* {{{ proto string HttpDeflateStream::flush([string data])
- *
- * Flushes the deflate stream.
- * 
- * Returns some deflated data as string on success or FALSE on failure.
- */ 
+	Flushes the deflate stream. */
 PHP_METHOD(HttpDeflateStream, flush)
 {
 	int data_len = 0;
@@ -233,11 +253,7 @@ PHP_METHOD(HttpDeflateStream, flush)
 /* }}} */
 
 /* {{{ proto string HttpDeflateStream::finish([string data])
- *
- * Finalizes the deflate stream.  The deflate stream can be reused after finalizing.
- * 
- * Returns the final part of deflated data.
- */ 
+	Finalizes the deflate stream.  The deflate stream can be reused after finalizing. */
 PHP_METHOD(HttpDeflateStream, finish)
 {
 	int data_len = 0;
@@ -281,7 +297,6 @@ PHP_METHOD(HttpDeflateStream, finish)
 }
 /* }}} */
 
-
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_ZLIB*/
 
 /*