X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_std_defs.h;h=2f92c871dbefbd8f552d8c1fec80a7ec354de293;hb=0e998acc9b529b67de3b1a772e016dd85bbc8eb2;hp=a3a3056f168e49ca52608f4162d3305fce859ac8;hpb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;p=m6w6%2Fext-http

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index a3a3056..2f92c87 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -96,12 +96,6 @@ typedef int STATUS;
 		zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
 	}
 
-/* check if return value is used */
-#define IF_RETVAL_USED \
-	if (!return_value_used) { \
-		return; \
-	} else
-
 /* CR LF */
 #define HTTP_CRLF "\r\n"
 
@@ -252,7 +246,27 @@ 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 putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) _ ##t## _free, NULL TSRMLS_CC);
+#	ifndef WONKY
+#		define freeObject(o) \
+			if (OBJ_GUARDS(o)) { \
+				zend_hash_destroy(OBJ_GUARDS(o)); \
+				FREE_HASHTABLE(OBJ_GUARDS(o)); \
+			} \
+			if (OBJ_PROP(o)) { \
+				zend_hash_destroy(OBJ_PROP(o)); \
+				FREE_HASHTABLE(OBJ_PROP(o)); \
+			} \
+			efree(o);
+#	else
+#		define freeObject(o) \
+			if (OBJ_PROP(o)) { \
+				zend_hash_destroy(OBJ_PROP(o)); \
+				FREE_HASHTABLE(OBJ_PROP(o)); \
+			} \
+			efree(o);
+#	endif
 #	define OBJ_PROP(o) (o)->zo.properties
+#	define OBJ_GUARDS(o) (o)->zo.guards
 
 #	define DCL_STATIC_PROP(a, t, n, v)		zend_declare_property_ ##t(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #	define DCL_STATIC_PROP_Z(a, n, v)		zend_declare_property(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
@@ -292,6 +306,26 @@ typedef int STATUS;
 #endif /* ZEND_ENGINE_2 */
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
+#	define with_error_handling(eh, ec) \
+	{ \
+		error_handling_t __eh = PG(error_handling); \
+		zend_class_entry *__ec= PG(exception_class); \
+		php_set_error_handling(eh, ec TSRMLS_CC);
+#	define end_error_handling() \
+		php_set_error_handling(__eh, __ec TSRMLS_CC); \
+	}
+#else
+#	define with_error_handling(eh, ec)
+#	define end_error_handling()
+#endif
+
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION > 5
+#	define	ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default(TSRMLS_C)
+#else
+#	define	ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default()
+#endif
+
 #ifndef E_THROW
 #	define E_THROW 0
 #endif