X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=0c061597010e9371bd4a3140c2fd579a147a9bae;hp=58531b8ca4d6c2f590ae19edb1b570559bcb90a9;hb=89572c25844ea2a641a6bef11b2cd1e1be699282;hpb=73ca84f4751d2197ee39b92c3b924b8e64b0ff0d

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 58531b8..0c06159 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -41,6 +41,19 @@ typedef int STATUS;
 	if(target) efree(target); \
 	target = source
 
+#define ZVAL_STRING_FREE(z, s, d) \
+	{\
+		zval *__tmp = (z); \
+		zval_dtor(__tmp); \
+		ZVAL_STRING(__tmp, (s), (d)); \
+	}
+#define ZVAL_STRINGL_FREE(z, s, l, d) \
+	{\
+		zval *__tmp = (z); \
+		zval_dtor(__tmp); \
+		ZVAL_STRINGL(__tmp, (s), (l), (d)); \
+	}
+
 /* return bool (v == SUCCESS) */
 #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
@@ -194,6 +207,10 @@ typedef int STATUS;
 #	define getObject(t, o) getObjectEx(t, o, getThis())
 #	define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
 #	define OBJ_PROP(o) o->zo.properties
+#	define DCL_STATIC_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define DCL_STATIC_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
+#	define GET_STATIC_PROP_EX(ce, n) zend_std_get_static_property(ce, (#n), sizeof(#n), 0 TSRMLS_CC)
 #	define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #	define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #	define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a) TSRMLS_CC)
@@ -204,6 +221,11 @@ typedef int STATUS;
 #	define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n)
 #	define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n), 0 TSRMLS_CC)
 
+#	define ACC_PROP_PRIVATE(ce, flags)		((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope))
+#	define ACC_PROP_PROTECTED(ce, flags)	((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope))))
+#	define ACC_PROP_PUBLIC(flags)			(flags & ZEND_ACC_PUBLIC)
+#	define ACC_PROP(ce, flags)				(ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
+
 #	define INIT_PARR(o, n) \
 	{ \
 		zval *__tmp; \