X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_deflatestream_object.c;h=22f5c049cf7921a32b2322f7dd8753cc65a9017f;hp=01e8ae2c8e7058afb7aacfb972909bd7b1515d01;hb=7d35618105146cc620cce13454a5ef242bf52a12;hpb=8e6cf53b544342e1eaf0ec4f530e32852120294a

diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c
index 01e8ae2..22f5c04 100644
--- a/http_deflatestream_object.c
+++ b/http_deflatestream_object.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -107,9 +107,14 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e
 		o->stream = s;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	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 *));
+#endif
 
 	ov.handle = putObject(http_deflatestream_object, o);
 	ov.handlers = &http_deflatestream_object_handlers;
@@ -242,8 +247,10 @@ PHP_METHOD(HttpDeflateStream, flush)
 			STR_FREE(encoded);
 			updated_len += encoded_len;
 			RETURN_STRINGL(updated, updated_len, 0);
-		} else {
+		} else if (encoded) {
 			RETVAL_STRINGL(encoded, encoded_len, 0);
+		} else {
+			RETVAL_NULL();
 		}
 	} else {
 		RETVAL_FALSE;