X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=953d4ac22e6db6a7d04ed65eb9bf47176b6d2975;hp=03911a83a02a3eba670a1e2f72c5e497fc08c8bd;hb=e434da0fad7db62d86c236c68b22150165f2647a;hpb=47c525716db7a03c84af5efc9953db3634084263

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 03911a8..953d4ac 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -59,9 +59,26 @@ typedef int STATUS;
 /* CURL buffer size */
 #define HTTP_CURLBUF_SIZE 16384
 
+/* known methods */
+#define HTTP_KNOWN_METHODS \
+		/* HTTP 1.1 */ \
+		"GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, " \
+		/* WebDAV - RFC 2518 */ \
+		"PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, " \
+		/* WebDAV Versioning - RFC 3253 */ \
+		"VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, " \
+		"MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, " \
+		/* WebDAV Access Control - RFC 3744 */ \
+		"ACL, " \
+		/* END */
+
+
 /* server vars shorthand */
 #define HTTP_SERVER_VARS Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])
 
+#define HTTP_INI_ENTRY(entry, default, scope, global) \
+	STD_PHP_INI_ENTRY(entry, default, scope, http_update_##global, global, zend_http_globals, http_globals)
+
 /* {{{ arrays */
 #define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val)
 #define FOREACH_HASH_VAL(hash, val) \
@@ -84,6 +101,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);
@@ -160,6 +205,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 */