X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=a15a32acd61e11309b80ae91cf60ecb99d55b2ec;hp=b4aee3f144607ea1cc0bbcc5b4849954efcfad9f;hb=2b7331c5fdb73cb48f7f60a8e4ec88766581ced3;hpb=6a9c33f395f4293eb122c6e884a35c0153537446

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index b4aee3f..a15a32a 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -34,7 +34,10 @@ typedef int STATUS;
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 
 /* function accepts no args */
-#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT
+#define NO_ARGS \
+	if (ZEND_NUM_ARGS()) { \
+		zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
+	}
 
 /* CR LF */
 #define HTTP_CRLF "\r\n"
@@ -81,6 +84,34 @@ typedef int STATUS;
 
 #define array_copy(src, dst)	zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
 #define array_merge(src, dst)	zend_hash_merge(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 1)
+#define array_append(src, dst)	\
+	{ \
+		ulong idx; \
+		uint klen; \
+		char *key = NULL; \
+		zval **data; \
+		 \
+		for (	zend_hash_internal_pointer_reset(Z_ARRVAL_P(src)); \
+				zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, NULL) != HASH_KEY_NON_EXISTANT && \
+				zend_hash_get_current_data(Z_ARRVAL_P(src), (void **) &data) == SUCCESS; \
+				zend_hash_move_forward(Z_ARRVAL_P(src))) \
+		{ \
+			if (key) { \
+				zval **tmp; \
+				 \
+				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void **) &tmp)) { \
+					if (Z_TYPE_PP(tmp) != IS_ARRAY) { \
+						convert_to_array_ex(tmp); \
+					} \
+					add_next_index_zval(*tmp, *data); \
+				} else { \
+					add_assoc_zval(dst, key, *data); \
+				} \
+				zval_add_ref(data); \
+				key = NULL; \
+			} \
+		} \
+	}
 /* }}} */
 
 #define HTTP_LONG_CONSTANT(name, const) REGISTER_LONG_CONSTANT(name, const, CONST_CS | CONST_PERSISTENT);
@@ -142,13 +173,13 @@ typedef int STATUS;
 #	define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC)
 #	define SET_EH_NORMAL() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
 
-#	ifndef E_THROW
-#		define E_THROW 0
-#	endif
-
 #endif /* ZEND_ENGINE_2 */
 /* }}} */
 
+#ifndef E_THROW
+#	define E_THROW 0
+#endif
+
 #define HTTP_E_UNKOWN		0L
 #define HTTP_E_PARSE		1L
 #define HTTP_E_HEADER		2L
@@ -157,6 +188,7 @@ typedef int STATUS;
 #define HTTP_E_ENCODE		5L
 #define HTTP_E_PARAM		6L
 #define HTTP_E_URL			7L
+#define HTTP_E_MSG			8L
 
 #endif /* PHP_HTTP_STD_DEFS_H */