X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=6bde00ce11952f647dd2fe2bae6440c45a39b422;hp=c297b6489b0dbb9c7dc454601cacf90008c9fc31;hb=e83a7438dc70ed96630887246a1d3aefcf155b1c;hpb=6be753a288ed7a42e0cd19551d85eb8eb14c4566

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index c297b64..6bde00c 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -177,7 +174,7 @@ typedef int STATUS;
 				} else { \
 					add_assoc_zval(dst, key, *data); \
 				} \
-				zval_add_ref(data); \
+				ZVAL_ADDREF(*data); \
 				key = NULL; \
 			} \
 		} \
@@ -360,7 +357,17 @@ typedef int STATUS;
 			static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
 #	endif /* ZEND_ENGINE_2 */
 #else
-#	define HTTP_DECLARE_ARG_PASS_INFO()
+#	ifdef ZEND_ENGINE_2
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static \
+			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
+				ZEND_ARG_PASS_INFO(0) \
+				ZEND_ARG_PASS_INFO(1) \
+			ZEND_END_ARG_INFO();
+#	else
+#		define HTTP_DECLARE_ARG_PASS_INFO() \
+			static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE};
+#	endif /* ZEND_ENGINE_2 */
 #endif /* HTTP_HAVE_CURL */
 
 
@@ -411,6 +418,31 @@ typedef int STATUS;
 #define PHP_MSHUTDOWN_CALL(func) PHP_MSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
 #define PHP_RSHUTDOWN_CALL(func) PHP_RSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
 
+#define Z_OBJ_DELREF(z) \
+	if (Z_OBJ_HT(z)->del_ref) { \
+		Z_OBJ_HT(z)->del_ref(&(z) TSRMLS_CC); \
+	}
+#define Z_OBJ_ADDREF(z) \
+	if (Z_OBJ_HT(z)->add_ref) { \
+		Z_OBJ_HT(z)->add_ref(&(z) TSRMLS_CC); \
+	}
+#define Z_OBJ_DELREF_P(z) \
+	if (Z_OBJ_HT_P(z)->del_ref) { \
+		Z_OBJ_HT_P(z)->del_ref((z) TSRMLS_CC); \
+	}
+#define Z_OBJ_ADDREF_P(z) \
+	if (Z_OBJ_HT_P(z)->add_ref) { \
+		Z_OBJ_HT_P(z)->add_ref((z) TSRMLS_CC); \
+	}
+#define Z_OBJ_DELREF_PP(z) \
+	if (Z_OBJ_HT_PP(z)->del_ref) { \
+		Z_OBJ_HT_PP(z)->del_ref(*(z) TSRMLS_CC); \
+	}
+#define Z_OBJ_ADDREF_PP(z) \
+	if (Z_OBJ_HT_PP(z)->add_ref) { \
+		Z_OBJ_HT_PP(z)->add_ref(*(z) TSRMLS_CC); \
+	}
+
 #endif /* PHP_HTTP_STD_DEFS_H */
 
 /*