X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_misc.h;h=19eb75cb894276f3021452b330e413dbea2e7c61;hp=35de35ef385428be67f4949955148322d2adcd33;hb=4776c4e3a82a34f21cd5c4f5cc246621e5f498f3;hpb=ad1dfac848dbbb295151c22b4f6fbcad13ce7a56

diff --git a/src/php_http_misc.h b/src/php_http_misc.h
index 35de35e..19eb75c 100644
--- a/src/php_http_misc.h
+++ b/src/php_http_misc.h
@@ -99,35 +99,51 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 
 #if PHP_DEBUG
 #	undef  HASH_OF
-#	define HASH_OF(p) ((HashTable*)(Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p)) : NULL))))
+#	define HASH_OF(p) ((HashTable*)(Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties(Z_OBJ_P(p)) : NULL))))
 #endif
 
-#ifndef GC_SET_REFCOUNT
-#	define GC_SET_REFCOUNT(gc, rc) GC_REFCOUNT(gc) = rc
-#endif
-#ifndef GC_ADDREF
-#	define GC_ADDREF(gc) ++GC_REFCOUNT(gc)
-#endif
-#ifndef GC_DELREF
-#	define GC_DELREF(gc) --GC_REFCOUNT(gc)
-#endif
-
-#ifdef ZEND_HASH_GET_APPLY_COUNT
-#	define HT_IS_RECURSIVE(ht) (ZEND_HASH_GET_APPLY_COUNT(ht) > 0)
-#else
-#	define HT_IS_RECURSIVE(ht) GC_IS_RECURSIVE(ht)
-#endif
-#ifdef ZEND_HASH_INC_APPLY_COUNT
-#	define HT_PROTECT_RECURSION(ht) ZEND_HASH_INC_APPLY_COUNT(ht)
-#else
-#	define HT_PROTECT_RECURSION(ht) GC_PROTECT_RECURSION(ht)
-#endif
-#ifdef ZEND_HASH_DEC_APPLY_COUNT
-#	define HT_UNPROTECT_RECURSION(ht) ZEND_HASH_DEC_APPLY_COUNT(ht)
+#if PHP_VERSION_ID >= 80100
+# define php_http_mem_stream_open(type, zstr) php_stream_memory_open((type), (zstr))
 #else
-#	define HT_UNPROTECT_RECURSION(ht) GC_UNPROTECT_RECURSION(ht)
+# define php_http_mem_stream_open(type, zstr) php_stream_memory_open((type), (zstr)->val, (zstr)->len)
 #endif
 
+#define HT_IS_RECURSIVE(ht) GC_IS_RECURSIVE(ht)
+#define HT_PROTECT_RECURSION(ht) GC_PROTECT_RECURSION(ht)
+#define HT_UNPROTECT_RECURSION(ht) GC_UNPROTECT_RECURSION(ht)
+
+#ifndef convert_to_explicit_type
+# define convert_to_explicit_type(pzv, type) \
+	do { \
+		switch (type) { \
+			case IS_NULL: \
+				convert_to_null(pzv); \
+				break; \
+			case IS_LONG: \
+				convert_to_long(pzv); \
+				break; \
+			case IS_DOUBLE: \
+				convert_to_double(pzv); \
+				break; \
+			case _IS_BOOL: \
+				convert_to_boolean(pzv); \
+				break; \
+			case IS_ARRAY: \
+				convert_to_array(pzv); \
+				break; \
+			case IS_OBJECT: \
+				convert_to_object(pzv); \
+				break; \
+			case IS_STRING: \
+				convert_to_string(pzv); \
+				break; \
+			default: \
+				assert(0); \
+				break; \
+		} \
+	} while (0);
+
+#endif
 static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv)
 {
 	if (!zo) {
@@ -138,16 +154,8 @@ static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv)
 
 static inline zend_string *php_http_cs2zs(char *s, size_t l)
 {
-	zend_string *str = erealloc(s, sizeof(*str) + l);
-
-	memmove(str->val, str, l);
-	str->val[l] = 0;
-	str->len = l;
-	str->h = 0;
-
-	GC_SET_REFCOUNT(str, 1);
-	GC_TYPE_INFO(str) = IS_STRING;
-
+	zend_string *str = zend_string_init(s, l, 0);
+	efree(s);
 	return str;
 }
 
@@ -168,9 +176,6 @@ static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t n
 	return FAILURE;
 }
 
-#define Z_ISUSER(zv) (Z_TYPE(zv) <= 10)
-#define Z_ISUSER_P(zvp) Z_ISUSER(*(zvp))
-
 /* return object(values) */
 #define ZVAL_OBJECT(z, o, addref) \
 	ZVAL_OBJ(z, o); \