X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_inflatestream_object.c;h=18ca266990abbdb61c2049af31ce2da9e87d311c;hp=61946b0e78b723278b41726e54e13c513fa25b2d;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3

diff --git a/http_inflatestream_object.c b/http_inflatestream_object.c
index 61946b0..18ca266 100644
--- a/http_inflatestream_object.c
+++ b/http_inflatestream_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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -47,7 +47,7 @@ HTTP_BEGIN_ARGS(finish, 0)
 	HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
 
-#define OBJ_PROP_CE http_inflatestream_object_ce
+#define THIS_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)
@@ -67,9 +67,9 @@ PHP_MINIT_FUNCTION(http_inflatestream_object)
 	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);
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_NONE")-1, HTTP_ENCODING_STREAM_FLUSH_NONE TSRMLS_CC);
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_SYNC")-1, HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC);
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_FULL")-1, HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC);
 #endif
 	
 	return SUCCESS;
@@ -96,9 +96,13 @@ zend_object_value _http_inflatestream_object_new_ex(zend_class_entry *ce, http_e
 		o->stream = s;
 	}
 
+#if PHP_VERSION_ID < 50399
 	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 *));
+#else
+	object_properties_init(&o->zo, ce);
+#endif
 
 	ov.handle = putObject(http_inflatestream_object, o);
 	ov.handlers = &http_inflatestream_object_handlers;
@@ -263,9 +267,11 @@ PHP_METHOD(HttpInflateStream, finish)
 			STR_FREE(decoded);
 			updated_len += decoded_len;
 			RETVAL_STRINGL(updated, updated_len, 0);
-		} else {
+		} else if (decoded) {
 			STR_FREE(updated);
 			RETVAL_STRINGL(decoded, decoded_len, 0);
+		} else {
+			RETVAL_NULL();
 		}
 	} else {
 		STR_FREE(updated);