X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_params.c;h=ce785ecbe03efef1daad18b9acb0948fc5f9a61a;hp=b056048018de5dbb038acdccba96f27805ca92c8;hb=refs%2Fheads%2Fv2.3.x;hpb=a07b79b1871054ca17e48b69445b4dc201f24662

diff --git a/php_http_params.c b/php_http_params.c
index b056048..ce785ec 100644
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -6,262 +6,1191 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_api.c 300299 2010-06-09 06:23:16Z mike $ */
+#include "php_http_api.h"
 
-#include "php_http.h"
+static php_http_params_token_t def_param_sep = {",", 1}, *def_param_sep_ptr[] = {&def_param_sep, NULL};
+static php_http_params_token_t def_arg_sep = {";", 1}, *def_arg_sep_ptr[] = {&def_arg_sep, NULL};
+static php_http_params_token_t def_val_sep = {"=", 1}, *def_val_sep_ptr[] = {&def_val_sep, NULL};
+static php_http_params_opts_t def_opts = {
+	{NULL, 0},
+	def_param_sep_ptr,
+	def_arg_sep_ptr,
+	def_val_sep_ptr,
+	NULL,
+	PHP_HTTP_PARAMS_DEFAULT
+};
 
-PHP_HTTP_API void php_http_params_parse_default_func(void *arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC)
+php_http_params_opts_t *php_http_params_opts_default_get(php_http_params_opts_t *opts)
 {
-	zval tmp, *entry;
-	HashTable *ht = (HashTable *) arg;
+	if (!opts) {
+		opts = emalloc(sizeof(*opts));
+	}
 
-	if (ht) {
-		INIT_PZVAL_ARRAY(&tmp, ht);
+	memcpy(opts, &def_opts, sizeof(def_opts));
 
-		if (vallen) {
-			MAKE_STD_ZVAL(entry);
-			array_init(entry);
-			if (keylen) {
-				add_assoc_stringl_ex(entry, key, keylen + 1, estrndup(val, vallen), vallen, 0);
-			} else {
-				add_next_index_stringl(entry, val, vallen, 1);
-			}
-			add_next_index_zval(&tmp, entry);
-		} else {
-			add_next_index_stringl(&tmp, key, keylen, 1);
+	return opts;
+}
+
+typedef struct php_http_params_state {
+	php_http_params_token_t input;
+	php_http_params_token_t param;
+	php_http_params_token_t arg;
+	php_http_params_token_t val;
+	struct {
+		zval **param;
+		zval **args;
+		zval **val;
+	} current;
+	unsigned quotes:1;
+	unsigned escape:1;
+	unsigned rfc5987:1;
+} php_http_params_state_t;
+
+static inline void sanitize_escaped(zval *zv TSRMLS_DC)
+{
+	if (Z_STRVAL_P(zv)[0] == '"' && Z_STRVAL_P(zv)[Z_STRLEN_P(zv) - 1] == '"') {
+		size_t deq_len = Z_STRLEN_P(zv) - 2;
+		char *deq = estrndup(Z_STRVAL_P(zv) + 1, deq_len);
+
+		zval_dtor(zv);
+		ZVAL_STRINGL(zv, deq, deq_len, 0);
+	}
+
+	php_stripcslashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv));
+}
+
+static inline void prepare_escaped(zval *zv TSRMLS_DC)
+{
+	if (Z_TYPE_P(zv) == IS_STRING) {
+		int len = Z_STRLEN_P(zv);
+
+		Z_STRVAL_P(zv) = php_addcslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1,
+				ZEND_STRL("\0..\37\173\\\"") TSRMLS_CC);
+
+		if (len != Z_STRLEN_P(zv) || strpbrk(Z_STRVAL_P(zv), "()<>@,;:\"[]?={} ")) {
+			zval tmp = *zv;
+			int len = Z_STRLEN_P(zv) + 2;
+			char *str = emalloc(len + 1);
+
+			str[0] = '"';
+			memcpy(&str[1], Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+			str[len-1] = '"';
+			str[len] = '\0';
+
+			zval_dtor(&tmp);
+			ZVAL_STRINGL(zv, str, len, 0);
 		}
+	} else {
+		zval_dtor(zv);
+		ZVAL_EMPTY_STRING(zv);
 	}
 }
 
-PHP_HTTP_API STATUS	php_http_params_parse(const char *param, int flags, php_http_params_parse_func_t cb, void *cb_arg TSRMLS_DC)
+static inline void sanitize_urlencoded(zval *zv TSRMLS_DC)
 {
-#define ST_QUOTE	1
-#define ST_VALUE	2
-#define ST_KEY		3
-#define ST_ASSIGN	4
-#define ST_ADD		5
+	Z_STRLEN_P(zv) = php_raw_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+}
+
+static inline void prepare_urlencoded(zval *zv TSRMLS_DC)
+{
+	int len;
+	char *str =	php_raw_url_encode(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &len);
 
-	int st = ST_KEY, keylen = 0, vallen = 0;
-	char *s, *c, *key = NULL, *val = NULL;
+	zval_dtor(zv);
+	ZVAL_STRINGL(zv, str, len, 0);
+}
+
+static void sanitize_dimension(zval *zv TSRMLS_DC)
+{
+	zval *arr = NULL, *tmp = NULL, **cur = NULL;
+	char *var = NULL, *ptr = Z_STRVAL_P(zv), *end = Z_STRVAL_P(zv) + Z_STRLEN_P(zv);
+	long level = 0;
 
-	if (!cb) {
-		cb = php_http_params_parse_default_func;
+	MAKE_STD_ZVAL(arr);
+	array_init(arr);
+	cur = &arr;
+
+	while (ptr < end) {
+		if (!var) {
+			var = ptr;
+		}
+
+		switch (*ptr) {
+			case '[':
+				if (++level > PG(max_input_nesting_level)) {
+					zval_ptr_dtor(&arr);
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Max input nesting level of %ld exceeded", (long) PG(max_input_nesting_level));
+					return;
+				}
+				if (ptr - var == 0) {
+					++var;
+					break;
+				}
+				/* no break */
+
+			case ']':
+
+				MAKE_STD_ZVAL(tmp);
+				ZVAL_NULL(tmp);
+				convert_to_array(*cur);
+
+				if (ptr - var) {
+					char chr = *ptr;
+					*ptr = '\0';
+					zend_symtable_update(Z_ARRVAL_PP(cur), var, ptr - var + 1, (void *) &tmp, sizeof(zval *), (void *) &cur);
+					*ptr = chr;
+				} else {
+					zend_hash_next_index_insert(Z_ARRVAL_PP(cur), (void *) &tmp, sizeof(zval *), (void *) &cur);
+				}
+
+				var = NULL;
+				break;
+		}
+
+		++ptr;
 	}
 
-	for(c = s = estrdup(param);;) {
-	continued:
-#if 0
-	{
-		char *tk = NULL, *tv = NULL;
+	if (zend_hash_num_elements(Z_ARRVAL_P(arr))) {
+		zval_dtor(zv);
+#if PHP_VERSION_ID >= 50400
+		ZVAL_COPY_VALUE(zv, arr);
+#else
+		zv->value = arr->value;
+		Z_TYPE_P(zv) = Z_TYPE_P(arr);
+#endif
+		FREE_ZVAL(arr);
+	} else {
+		zval_ptr_dtor(&arr);
+	}
+}
+
+static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC);
+static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC);
+
+static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf, zval *zvalue, const char *pss, size_t psl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+	HashTable *ht = HASH_OF(zvalue);
+	HashPosition pos;
+	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+	zval **val;
+	php_http_buffer_t prefix;
+
+	if (!ht->nApplyCount++) {
+		php_http_buffer_init(&prefix);
+		php_http_buffer_append(&prefix, keybuf->data, keybuf->used);
 
-		if (key) {
-			if (keylen) {
-				tk= estrndup(key, keylen);
+		FOREACH_HASH_KEYVAL(pos, ht, key, val) {
+			if (key.type == HASH_KEY_IS_STRING && !*key.str) {
+				/* only public properties */
+				continue;
+			}
+
+			php_http_buffer_appends(&prefix, "[");
+			if (key.type == HASH_KEY_IS_STRING) {
+				php_http_buffer_append(&prefix, key.str, key.len - 1);
 			} else {
-				tk = ecalloc(1, 7);
-				memcpy(tk, key, 3);
-				tk[3]='.'; tk[4]='.'; tk[5]='.';
+				php_http_buffer_appendf(&prefix, "%lu", key.num);
 			}
-		}
-		if (val) {
-			if (vallen) {
-				tv = estrndup(val, vallen);
+			php_http_buffer_appends(&prefix, "]");
+
+			if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) {
+				prepare_dimension(buf, &prefix, *val, pss, psl, vss, vsl, flags TSRMLS_CC);
 			} else {
-				tv = ecalloc(1, 7);
-				memcpy(tv, val, 3);
-				tv[3]='.'; tv[4]='.'; tv[5]='.';
+				zval *cpy = php_http_ztyp(IS_STRING, *val);
+
+				shift_key(buf, prefix.data, prefix.used, pss, psl, flags TSRMLS_CC);
+				shift_val(buf, cpy, vss, vsl, flags TSRMLS_CC);
+				zval_ptr_dtor(&cpy);
 			}
+
+			php_http_buffer_cut(&prefix, keybuf->used, prefix.used - keybuf->used);
 		}
-		fprintf(stderr, "[%6s] %c \"%s=%s\"\n",
-				(
-						st == ST_QUOTE ? "QUOTE" :
-						st == ST_VALUE ? "VALUE" :
-						st == ST_KEY ? "KEY" :
-						st == ST_ASSIGN ? "ASSIGN" :
-						st == ST_ADD ? "ADD":
-						"HUH?"
-				), *c?*c:'0', tk, tv
-		);
-		STR_FREE(tk); STR_FREE(tv);
+		php_http_buffer_dtor(&prefix);
+	}
+	--ht->nApplyCount;
+}
+
+static inline void sanitize_key(unsigned flags, char *str, size_t len, zval *zv, zend_bool *rfc5987 TSRMLS_DC)
+{
+	char *eos;
+
+	zval_dtor(zv);
+	php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC);
+
+	if (flags & PHP_HTTP_PARAMS_ESCAPED) {
+		sanitize_escaped(zv TSRMLS_CC);
+	}
+	
+	if (!Z_STRLEN_P(zv)) {
+		return;
+	}
+
+	eos = &Z_STRVAL_P(zv)[Z_STRLEN_P(zv)-1];
+	if (*eos == '*') {
+		*eos = '\0';
+		*rfc5987 = 1;
+		Z_STRLEN_P(zv) -= 1;
+	}
+
+	if (flags & PHP_HTTP_PARAMS_URLENCODED) {
+		sanitize_urlencoded(zv TSRMLS_CC);
+	}
+
+	if (flags & PHP_HTTP_PARAMS_DIMENSION) {
+		sanitize_dimension(zv TSRMLS_CC);
+	}
+}
+
+static inline void sanitize_rfc5987(zval *zv, char **language, zend_bool *latin1 TSRMLS_DC)
+{
+	char *ptr;
+
+	/* examples:
+	 * iso-8850-1'de'bl%f6der%20schei%df%21
+	 * utf-8'de-DE'bl%c3%b6der%20schei%c3%9f%21
+	 */
+
+	switch (Z_STRVAL_P(zv)[0]) {
+	case 'I':
+	case 'i':
+		if (!strncasecmp(Z_STRVAL_P(zv), "iso-8859-1", lenof("iso-8859-1"))) {
+			*latin1 = 1;
+			ptr = Z_STRVAL_P(zv) + lenof("iso-8859-1");
+			break;
+		}
+		/* no break */
+	case 'U':
+	case 'u':
+		if (!strncasecmp(Z_STRVAL_P(zv), "utf-8", lenof("utf-8"))) {
+			*latin1 = 0;
+			ptr = Z_STRVAL_P(zv) + lenof("utf-8");
+			break;
+		}
+		/* no break */
+	default:
+		return;
+	}
+
+	/* extract language */
+	if (*ptr == '\'') {
+		for (*language = ++ptr; *ptr && *ptr != '\''; ++ptr);
+		if (!*ptr) {
+			*language = NULL;
+			return;
+		}
+		*language = estrndup(*language, ptr - *language);
+
+		/* remainder */
+		ptr = estrdup(++ptr);
+		zval_dtor(zv);
+		ZVAL_STRING(zv, ptr, 0);
+	}
+}
+
+static void utf8encode(zval *zv)
+{
+	size_t pos, len = 0;
+	unsigned char *ptr = (unsigned char *) Z_STRVAL_P(zv);
+
+	while (*ptr) {
+		if (*ptr++ >= 0x80) {
+			++len;
+		}
+		++len;
+	}
+
+	ptr = safe_emalloc(1, len, 1);
+	for (len = 0, pos = 0; len <= Z_STRLEN_P(zv); ++len, ++pos) {
+		ptr[pos] = Z_STRVAL_P(zv)[len];
+		if ((ptr[pos]) >= 0x80) {
+			ptr[pos + 1] = 0x80 | (ptr[pos] & 0x3f);
+			ptr[pos] = 0xc0 | ((ptr[pos] >> 6) & 0x1f);
+			++pos;
+		}
+	}
+	zval_dtor(zv);
+	ZVAL_STRINGL(zv, (char *) ptr, pos-1, 0);
+}
+
+static inline void sanitize_value(unsigned flags, char *str, size_t len, zval *zv, zend_bool rfc5987 TSRMLS_DC)
+{
+	char *language = NULL;
+	zend_bool latin1 = 0;
+
+	zval_dtor(zv);
+	php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC);
+
+	if (rfc5987) {
+		sanitize_rfc5987(zv, &language, &latin1 TSRMLS_CC);
+	}
+
+	if (flags & PHP_HTTP_PARAMS_ESCAPED) {
+		sanitize_escaped(zv TSRMLS_CC);
+	}
+
+	if ((flags & PHP_HTTP_PARAMS_URLENCODED) || (rfc5987 && language)) {
+		sanitize_urlencoded(zv TSRMLS_CC);
+	}
+
+	if (rfc5987 && language) {
+		zval *tmp;
+
+		if (latin1) {
+			utf8encode(zv);
+		}
+
+		MAKE_STD_ZVAL(tmp);
+		ZVAL_COPY_VALUE(tmp, zv);
+		array_init(zv);
+		add_assoc_zval(zv, language, tmp);
+		PTR_FREE(language);
+	}
+}
+
+static inline void prepare_key(unsigned flags, char *old_key, size_t old_len, char **new_key, size_t *new_len TSRMLS_DC)
+{
+	zval zv;
+
+	INIT_PZVAL(&zv);
+	ZVAL_STRINGL(&zv, old_key, old_len, 1);
+
+	if (flags & PHP_HTTP_PARAMS_URLENCODED) {
+		prepare_urlencoded(&zv TSRMLS_CC);
+	}
+
+	if (flags & PHP_HTTP_PARAMS_ESCAPED) {
+		prepare_escaped(&zv TSRMLS_CC);
+	}
+
+	*new_key = Z_STRVAL(zv);
+	*new_len = Z_STRLEN(zv);
+}
+
+static inline void prepare_value(unsigned flags, zval *zv TSRMLS_DC)
+{
+	if (flags & PHP_HTTP_PARAMS_URLENCODED) {
+		prepare_urlencoded(zv TSRMLS_CC);
+	}
+
+	if (flags & PHP_HTTP_PARAMS_ESCAPED) {
+		prepare_escaped(zv TSRMLS_CC);
+	}
+}
+
+static void merge_param(HashTable *params, zval *zdata, zval ***current_param, zval ***current_args TSRMLS_DC)
+{
+	zval **ptr, **zdata_ptr;
+	php_http_array_hashkey_t hkey = php_http_array_hashkey_init(0);
+
+#if 0
+	{
+		zval tmp;
+		INIT_PZVAL_ARRAY(&tmp, params);
+		fprintf(stderr, "params = ");
+		zend_print_zval_r(&tmp, 1 TSRMLS_CC);
+		fprintf(stderr, "\n");
 	}
 #endif
-		switch (st) {
-			case ST_QUOTE:
-			quote:
-				if (*c == '"') {
-					if (*(c-1) == '\\') {
-						memmove(c-1, c, strlen(c)+1);
-						goto quote;
+
+	hkey.type = zend_hash_get_current_key_ex(Z_ARRVAL_P(zdata), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL);
+
+	if ((hkey.type == HASH_KEY_IS_STRING && !zend_hash_exists(params, hkey.str, hkey.len))
+	||	(hkey.type == HASH_KEY_IS_LONG && !zend_hash_index_exists(params, hkey.num))
+	) {
+		zval *tmp, *arg, **args;
+
+		/* create the entry if it doesn't exist */
+		zend_hash_get_current_data(Z_ARRVAL_P(zdata), (void *) &ptr);
+		Z_ADDREF_PP(ptr);
+		MAKE_STD_ZVAL(tmp);
+		array_init(tmp);
+		add_assoc_zval_ex(tmp, ZEND_STRS("value"), *ptr);
+
+		MAKE_STD_ZVAL(arg);
+		array_init(arg);
+		zend_hash_update(Z_ARRVAL_P(tmp), "arguments", sizeof("arguments"), (void *) &arg, sizeof(zval *), (void *) &args);
+		*current_args = args;
+
+		if (hkey.type == HASH_KEY_IS_STRING) {
+			zend_hash_update(params, hkey.str, hkey.len, (void *) &tmp, sizeof(zval *), (void *) &ptr);
+		} else {
+			zend_hash_index_update(params, hkey.num, (void *) &tmp, sizeof(zval *), (void *) &ptr);
+		}
+	} else {
+		/* merge */
+		if (hkey.type == HASH_KEY_IS_STRING) {
+			zend_hash_find(params, hkey.str, hkey.len, (void *) &ptr);
+		} else {
+			zend_hash_index_find(params, hkey.num, (void *) &ptr);
+		}
+
+		zdata_ptr = &zdata;
+
+		if (Z_TYPE_PP(ptr) == IS_ARRAY
+		&&	SUCCESS == zend_hash_find(Z_ARRVAL_PP(ptr), "value", sizeof("value"), (void *) &ptr)
+		&&	SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata_ptr), (void *) &zdata_ptr)
+		) {
+			/*
+			 * params = [arr => [value => [0 => 1]]]
+			 *                            ^- ptr
+			 * zdata  = [arr => [0 => NULL]]
+			 *                  ^- zdata_ptr
+			 */
+			zval **test_ptr;
+
+			while (Z_TYPE_PP(zdata_ptr) == IS_ARRAY
+			&&	SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata_ptr), (void *) &test_ptr)
+			) {
+				if (Z_TYPE_PP(test_ptr) == IS_ARRAY) {
+
+					/* now find key in ptr */
+					if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata_ptr), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL)) {
+						if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) &ptr)) {
+							zdata_ptr = test_ptr;
+						} else {
+							Z_ADDREF_PP(test_ptr);
+							zend_hash_update(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) test_ptr, sizeof(zval *), (void *) &ptr);
+							break;
+						}
 					} else {
-						goto add;
+						if (SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(ptr), hkey.num, (void *) &ptr)) {
+							zdata_ptr = test_ptr;
+						} else if (hkey.num) {
+							Z_ADDREF_PP(test_ptr);
+							zend_hash_index_update(Z_ARRVAL_PP(ptr), hkey.num, (void *) test_ptr, sizeof(zval *), (void *) &ptr);
+							break;
+						} else {
+							Z_ADDREF_PP(test_ptr);
+							zend_hash_next_index_insert(Z_ARRVAL_PP(ptr), (void *) test_ptr, sizeof(zval *), (void *) &ptr);
+							break;
+						}
 					}
 				} else {
-					if (!val) {
-						val = c;
+					/* this is the leaf */
+					Z_ADDREF_PP(test_ptr);
+					if (Z_TYPE_PP(ptr) != IS_ARRAY) {
+						zval_dtor(*ptr);
+						array_init(*ptr);
 					}
-					if (!*c) {
-						--val;
-						st = ST_ADD;
+					if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata_ptr), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL)) {
+						zend_hash_update(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) test_ptr, sizeof(zval *), (void *) &ptr);
+					} else if (hkey.num) {
+						zend_hash_index_update(Z_ARRVAL_PP(ptr), hkey.num, (void *) test_ptr, sizeof(zval *), (void *) &ptr);
+					} else {
+						zend_hash_next_index_insert(Z_ARRVAL_PP(ptr), (void *) test_ptr, sizeof(zval *), (void *) &ptr);
 					}
+					break;
 				}
-				break;
+			}
 
-			case ST_VALUE:
-				switch (*c) {
-					case '"':
-						if (!val) {
-							st = ST_QUOTE;
-						}
-						break;
-
-					case ' ':
-						break;
-
-					case ';':
-					case '\0':
-						goto add;
-						break;
-					case ',':
-						if (flags & PHP_HTTP_PARAMS_ALLOW_COMMA) {
-							goto add;
-						}
-					default:
-						if (!val) {
-							val = c;
-						}
-						break;
-				}
-				break;
+		}
+	}
 
-			case ST_KEY:
-				switch (*c) {
-					case ',':
-						if (flags & PHP_HTTP_PARAMS_ALLOW_COMMA) {
-							goto allow_comma;
-						}
-					case '\r':
-					case '\n':
-					case '\t':
-					case '\013':
-					case '\014':
-						goto failure;
-						break;
-
-					case ' ':
-						if (key) {
-							keylen = c - key;
-							st = ST_ASSIGN;
-						}
-						break;
-
-					case ';':
-					case '\0':
-					allow_comma:
-						if (key) {
-							keylen = c-- - key;
-							st = ST_ADD;
-						}
-						break;
+	/* bubble up */
+	while (Z_TYPE_PP(ptr) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(ptr), (void *) &ptr));
+	*current_param = ptr;
+}
 
-					case ':':
-						if (!(flags & PHP_HTTP_PARAMS_COLON_SEPARATOR)) {
-							goto not_separator;
-						}
-						if (key) {
-							keylen = c - key;
-							st = ST_VALUE;
-						} else {
-							goto failure;
-						}
-						break;
+static void push_param(HashTable *params, php_http_params_state_t *state, const php_http_params_opts_t *opts TSRMLS_DC)
+{
+	if (state->val.str) {
+		if (0 < (state->val.len = state->input.str - state->val.str)) {
+			sanitize_value(opts->flags, state->val.str, state->val.len, *(state->current.val), state->rfc5987 TSRMLS_CC);
+		}
+		state->rfc5987 = 0;
+	} else if (state->arg.str) {
+		if (0 < (state->arg.len = state->input.str - state->arg.str)) {
+			zval *val, key;
+			zend_bool rfc5987 = 0;
 
-					case '=':
-						if (flags & PHP_HTTP_PARAMS_COLON_SEPARATOR) {
-							goto not_separator;
-						}
-						if (key) {
-							keylen = c - key;
-							st = ST_VALUE;
-						} else {
-							goto failure;
-						}
-						break;
+			INIT_PZVAL(&key);
+			ZVAL_NULL(&key);
+			sanitize_key(opts->flags, state->arg.str, state->arg.len, &key, &rfc5987 TSRMLS_CC);
+			state->rfc5987 = rfc5987;
+			if (Z_TYPE(key) == IS_STRING && Z_STRLEN(key)) {
+				MAKE_STD_ZVAL(val);
+				ZVAL_TRUE(val);
 
-					default:
-					not_separator:
-						if (!key) {
-							key = c;
-						}
-						break;
+				if (rfc5987) {
+					zval **rfc;
+
+					if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(state->current.args), ZEND_STRS("*rfc5987*"), (void *) &rfc)) {
+						zend_symtable_update(Z_ARRVAL_PP(rfc), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val);
+					} else {
+						zval *tmp;
+
+						MAKE_STD_ZVAL(tmp);
+						array_init_size(tmp, 1);
+						zend_symtable_update(Z_ARRVAL_P(tmp), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val);
+						zend_symtable_update(Z_ARRVAL_PP(state->current.args), ZEND_STRS("*rfc5987*"), (void *) &tmp, sizeof(zval *), NULL);
+					}
+				} else {
+					zend_symtable_update(Z_ARRVAL_PP(state->current.args), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val);
 				}
-				break;
+			}
+			zval_dtor(&key);
+		}
+	} else if (state->param.str) {
+		if (0 < (state->param.len = state->input.str - state->param.str)) {
+			zval *prm, *arg, *val, *key;
+			zend_bool rfc5987 = 0;
+
+			MAKE_STD_ZVAL(key);
+			ZVAL_NULL(key);
+			sanitize_key(opts->flags, state->param.str, state->param.len, key, &rfc5987 TSRMLS_CC);
+			state->rfc5987 = rfc5987;
+			if (Z_TYPE_P(key) != IS_STRING) {
+				merge_param(params, key, &state->current.val, &state->current.args TSRMLS_CC);
+			} else if (Z_STRLEN_P(key)) {
+				MAKE_STD_ZVAL(prm);
+				array_init_size(prm, 2);
 
-			case ST_ASSIGN:
-				if (*c == '=') {
-					st = ST_VALUE;
-				} else if (!*c || *c == ';' || ((flags & PHP_HTTP_PARAMS_ALLOW_COMMA) && *c == ',')) {
-					st = ST_ADD;
-				} else if (*c != ' ') {
-					goto failure;
+				MAKE_STD_ZVAL(val);
+				if (opts->defval) {
+					ZVAL_COPY_VALUE(val, opts->defval);
+					zval_copy_ctor(val);
+				} else {
+					ZVAL_TRUE(val);
+				}
+				if (rfc5987 && (opts->flags & PHP_HTTP_PARAMS_RFC5987)) {
+					zend_hash_update(Z_ARRVAL_P(prm), "*rfc5987*", sizeof("*rfc5987*"), (void *) &val, sizeof(zval *), (void *) &state->current.val);
+				} else {
+					zend_hash_update(Z_ARRVAL_P(prm), "value", sizeof("value"), (void *) &val, sizeof(zval *), (void *) &state->current.val);
 				}
-				break;
 
-			case ST_ADD:
-			add:
-				if (val) {
-					vallen = c - val;
-					if (st != ST_QUOTE) {
-						while (val[vallen-1] == ' ') --vallen;
-					}
+				MAKE_STD_ZVAL(arg);
+				array_init_size(arg, 3);
+				zend_hash_update(Z_ARRVAL_P(prm), "arguments", sizeof("arguments"), (void *) &arg, sizeof(zval *), (void *) &state->current.args);
+
+				zend_symtable_update(params, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void *) &prm, sizeof(zval *), (void *) &state->current.param);
+			}
+			zval_ptr_dtor(&key);
+		}
+	}
+}
+
+static inline zend_bool check_str(const char *chk_str, size_t chk_len, const char *sep_str, size_t sep_len) {
+	return 0 < sep_len && chk_len >= sep_len && *chk_str == *sep_str && !memcmp(chk_str + 1, sep_str + 1, sep_len - 1);
+}
+
+static size_t check_sep(php_http_params_state_t *state, php_http_params_token_t **separators)
+{
+	php_http_params_token_t **sep = separators;
+
+	if (state->quotes || state->escape) {
+		return 0;
+	}
+	
+	if (sep) while (*sep) {
+		if (check_str(state->input.str, state->input.len, (*sep)->str, (*sep)->len)) {
+			return (*sep)->len;
+		}
+		++sep;
+	}
+	return 0;
+}
+
+static void skip_sep(size_t skip, php_http_params_state_t *state, php_http_params_token_t **param, php_http_params_token_t **arg, php_http_params_token_t **val TSRMLS_DC)
+{
+	size_t sep_len;
+
+	state->input.str += skip;
+	state->input.len -= skip;
+
+	while (	(param && (sep_len = check_sep(state, param)))
+	||		(arg && (sep_len = check_sep(state, arg)))
+	||		(val && (sep_len = check_sep(state, val)))
+	) {
+		state->input.str += sep_len;
+		state->input.len -= sep_len;
+	}
+}
+
+HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC)
+{
+	php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}, 0, 0};
+
+	state.input.str = opts->input.str;
+	state.input.len = opts->input.len;
+
+	if (!params) {
+		ALLOC_HASHTABLE(params);
+		ZEND_INIT_SYMTABLE(params);
+	}
+
+	while (state.input.len) {
+		if (*state.input.str == '"' && !state.escape) {
+			state.quotes = !state.quotes;
+		} else {
+			state.escape = (*state.input.str == '\\');
+		}
+		
+		if (!state.param.str) {
+			/* initialize */
+			skip_sep(0, &state, opts->param, opts->arg, opts->val TSRMLS_CC);
+			state.param.str = state.input.str;
+		} else {
+			size_t sep_len;
+			/* are we at a param separator? */
+			if (0 < (sep_len = check_sep(&state, opts->param))) {
+				push_param(params, &state, opts TSRMLS_CC);
+
+				skip_sep(sep_len, &state, opts->param, opts->arg, opts->val TSRMLS_CC);
+
+				/* start off with a new param */
+				state.param.str = state.input.str;
+				state.param.len = 0;
+				state.arg.str = NULL;
+				state.arg.len = 0;
+				state.val.str = NULL;
+				state.val.len = 0;
+
+				continue;
+
+			} else
+			/* are we at an arg separator? */
+			if (0 < (sep_len = check_sep(&state, opts->arg))) {
+				push_param(params, &state, opts TSRMLS_CC);
+
+				skip_sep(sep_len, &state, NULL, opts->arg, opts->val TSRMLS_CC);
+
+				/* continue with a new arg */
+				state.arg.str = state.input.str;
+				state.arg.len = 0;
+				state.val.str = NULL;
+				state.val.len = 0;
+
+				continue;
+
+			} else
+			/* are we at a val separator? */
+			if (0 < (sep_len = check_sep(&state, opts->val))) {
+				/* only handle separator if we're not already reading in a val */
+				if (!state.val.str) {
+					push_param(params, &state, opts TSRMLS_CC);
+
+					skip_sep(sep_len, &state, NULL, NULL, opts->val TSRMLS_CC);
+
+					state.val.str = state.input.str;
+					state.val.len = 0;
+
+					continue;
+				}
+			}
+		}
+		
+		if (state.input.len) {
+			++state.input.str;
+			--state.input.len;
+		}
+	}
+	/* finalize */
+	push_param(params, &state, opts TSRMLS_CC);
+
+	return params;
+}
+
+static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC)
+{
+	char *str;
+	size_t len;
+
+	if (buf->used) {
+		php_http_buffer_append(buf, ass, asl);
+	}
+
+	prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC);
+	php_http_buffer_append(buf, str, len);
+	efree(str);
+}
+
+static inline void shift_rfc5987(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+	HashTable *ht = HASH_OF(zvalue);
+	zval **zdata, *tmp;
+	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+
+	if (SUCCESS == zend_hash_get_current_data(ht, (void *) &zdata)
+	&&	HASH_KEY_NON_EXISTENT != (key.type = zend_hash_get_current_key_ex(ht, &key.str, &key.len, &key.num, key.dup, NULL))
+	) {
+		php_http_array_hashkey_stringify(&key);
+		php_http_buffer_appendf(buf, "*%.*sutf-8'%.*s'",
+				(int) (vsl > INT_MAX ? INT_MAX : vsl), vss,
+				(int) (key.len > INT_MAX ? INT_MAX : key.len), key.str);
+		php_http_array_hashkey_stringfree(&key);
+
+		tmp = php_http_zsep(1, IS_STRING, *zdata);
+		prepare_value(flags | PHP_HTTP_PARAMS_URLENCODED, tmp TSRMLS_CC);
+		php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+		zval_ptr_dtor(&tmp);
+	}
+}
+
+static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+	if (Z_TYPE_P(zvalue) != IS_BOOL) {
+		zval *tmp = php_http_zsep(1, IS_STRING, zvalue);
+
+		prepare_value(flags, tmp TSRMLS_CC);
+		php_http_buffer_append(buf, vss, vsl);
+		php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+
+		zval_ptr_dtor(&tmp);
+	} else if (!Z_BVAL_P(zvalue)) {
+		php_http_buffer_append(buf, vss, vsl);
+		php_http_buffer_appends(buf, "0");
+	}
+}
+
+static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+	if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) {
+		HashPosition pos;
+		php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+		zval **val;
+		zend_bool rfc5987 = !strcmp(key_str, "*rfc5987*");
+
+		if (!rfc5987) {
+			shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC);
+		}
+		FOREACH_KEYVAL(pos, zvalue, key, val) {
+			/* did you mean recursion? */
+			php_http_array_hashkey_stringify(&key);
+			if (rfc5987 && (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT)) {
+				shift_key(buf, key.str, key.len-1, ass, asl, flags TSRMLS_CC);
+				shift_rfc5987(buf, *val, vss, vsl, flags TSRMLS_CC);
+			} else {
+				shift_arg(buf, key.str, key.len-1, *val, ass, asl, vss, vsl, flags TSRMLS_CC);
+			}
+			php_http_array_hashkey_stringfree(&key);
+		}
+	} else {
+		shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC);
+		shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC);
+	}
+}
+
+static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags, zend_bool rfc5987 TSRMLS_DC)
+{
+	if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) {
+		/* treat as arguments, unless we care for dimensions or rfc5987 */
+		if (flags & PHP_HTTP_PARAMS_DIMENSION) {
+			php_http_buffer_t *keybuf = php_http_buffer_from_string(key_str, key_len);
+			prepare_dimension(buf, keybuf, zvalue, pss, psl, vss, vsl, flags TSRMLS_CC);
+			php_http_buffer_free(&keybuf);
+		} else if (rfc5987) {
+			shift_key(buf, key_str, key_len, pss, psl, flags TSRMLS_CC);
+			shift_rfc5987(buf, zvalue, vss, vsl, flags TSRMLS_CC);
+		} else {
+			shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags TSRMLS_CC);
+		}
+	} else {
+		shift_key(buf, key_str, key_len, pss, psl, flags TSRMLS_CC);
+		shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC);
+	}
+}
+
+php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+	zval **zparam;
+	HashPosition pos, pos1;
+	php_http_array_hashkey_t key = php_http_array_hashkey_init(0), key1 = php_http_array_hashkey_init(0);
+	zend_bool rfc5987 = 0;
+
+	if (!buf) {
+		buf = php_http_buffer_init(NULL);
+	}
+
+	FOREACH_HASH_KEYVAL(pos, params, key, zparam) {
+		zval **zvalue, **zargs;
+
+		if (Z_TYPE_PP(zparam) != IS_ARRAY) {
+			zvalue = zparam;
+		} else {
+			if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("value"), (void *) &zvalue)) {
+				if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("*rfc5987*"), (void *) &zvalue)) {
+					zvalue = zparam;
 				} else {
-					val = "";
-					vallen = 0;
+					rfc5987 = 1;
 				}
+			}
+		}
 
-				cb(cb_arg, key, keylen, val, vallen TSRMLS_CC);
+		php_http_array_hashkey_stringify(&key);
+		shift_param(buf, key.str, key.len - 1, *zvalue, pss, psl, ass, asl, vss, vsl, flags, rfc5987 TSRMLS_CC);
+		php_http_array_hashkey_stringfree(&key);
 
-				st = ST_KEY;
-				key = val = NULL;
-				keylen = vallen = 0;
-				break;
+		if (Z_TYPE_PP(zparam) == IS_ARRAY && SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zvalue)) {
+			if (zvalue == zparam) {
+				continue;
+			}
+			zvalue = zparam;
+		}
+
+		if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
+			FOREACH_KEYVAL(pos1, *zvalue, key1, zargs) {
+				if (zvalue == zparam && key1.type == HASH_KEY_IS_STRING && !strcmp(key1.str, "value")) {
+					continue;
+				}
+
+				php_http_array_hashkey_stringify(&key1);
+				shift_arg(buf, key1.str, key1.len - 1, *zargs, ass, asl, vss, vsl, flags TSRMLS_CC);
+				php_http_array_hashkey_stringfree(&key1);
+			}
 		}
-		if (*c) {
-			++c;
-		} else if (st == ST_ADD) {
-			goto add;
+	}
+
+	php_http_buffer_shrink(buf);
+	php_http_buffer_fix(buf);
+
+	return buf;
+}
+
+php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC)
+{
+	zval **sep;
+	HashPosition pos;
+	php_http_params_token_t **ret, **tmp;
+
+	if (!zv) {
+		return NULL;
+	}
+
+	zv = php_http_ztyp(IS_ARRAY, zv);
+	ret = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(zv)) + 1, sizeof(*ret));
+
+	tmp = ret;
+	FOREACH_VAL(pos, zv, sep) {
+		zval *zt = php_http_ztyp(IS_STRING, *sep);
+
+		if (Z_STRLEN_P(zt)) {
+			*tmp = emalloc(sizeof(**tmp));
+			(*tmp)->str = estrndup(Z_STRVAL_P(zt), (*tmp)->len = Z_STRLEN_P(zt));
+			++tmp;
+		}
+		zval_ptr_dtor(&zt);
+	}
+	zval_ptr_dtor(&zv);
+
+	*tmp = NULL;
+	return ret;
+}
+
+void php_http_params_separator_free(php_http_params_token_t **separator)
+{
+	php_http_params_token_t **sep = separator;
+	if (sep) {
+		while (*sep) {
+			PTR_FREE((*sep)->str);
+			efree(*sep);
+			++sep;
+		}
+		efree(separator);
+	}
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams___construct, 0, 0, 0)
+	ZEND_ARG_INFO(0, params)
+	ZEND_ARG_INFO(0, param_sep)
+	ZEND_ARG_INFO(0, arg_sep)
+	ZEND_ARG_INFO(0, val_sep)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, __construct)
+{
+	zval *zcopy, *zparams = NULL, *param_sep = NULL, *arg_sep = NULL, *val_sep = NULL;
+	long flags = PHP_HTTP_PARAMS_DEFAULT;
+	zend_error_handling zeh;
+
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z/z/z/l", &zparams, &param_sep, &arg_sep, &val_sep, &flags), invalid_arg, return);
+
+	zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC);
+	{
+		switch (ZEND_NUM_ARGS()) {
+			case 5:
+				zend_update_property_long(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), flags TSRMLS_CC);
+				/* no break */
+			case 4:
+				zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), val_sep TSRMLS_CC);
+				/* no break */
+			case 3:
+				zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), arg_sep TSRMLS_CC);
+				/* no break */
+			case 2:
+				zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), param_sep TSRMLS_CC);
+				/* no break */
+		}
+
+		if (zparams) {
+			switch (Z_TYPE_P(zparams)) {
+				case IS_OBJECT:
+				case IS_ARRAY:
+					zcopy = php_http_zsep(1, IS_ARRAY, zparams);
+					zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zcopy TSRMLS_CC);
+					zval_ptr_dtor(&zcopy);
+					break;
+				default:
+					zcopy = php_http_ztyp(IS_STRING, zparams);
+					if (Z_STRLEN_P(zcopy)) {
+						php_http_params_opts_t opts = {
+							{Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)},
+							php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+							php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+							php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+							NULL, flags
+						};
+
+						MAKE_STD_ZVAL(zparams);
+						array_init(zparams);
+						php_http_params_parse(Z_ARRVAL_P(zparams), &opts TSRMLS_CC);
+						zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC);
+						zval_ptr_dtor(&zparams);
+
+						php_http_params_separator_free(opts.param);
+						php_http_params_separator_free(opts.arg);
+						php_http_params_separator_free(opts.val);
+					}
+					zval_ptr_dtor(&zcopy);
+					break;
+			}
 		} else {
-			break;
+			MAKE_STD_ZVAL(zparams);
+			array_init(zparams);
+			zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC);
+			zval_ptr_dtor(&zparams);
 		}
 	}
+	zend_restore_error_handling(&zeh TSRMLS_CC);
+}
 
-	efree(s);
-	return SUCCESS;
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toArray, 0, 0, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, toArray)
+{
+	zval *zparams;
+
+	if (SUCCESS != zend_parse_parameters_none()) {
+		return;
+	}
+	zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC);
+	RETURN_ZVAL(zparams, 1, 0);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toString, 0, 0, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, toString)
+{
+	zval **tmp, *zparams, *zpsep, *zasep, *zvsep, *zflags;
+	php_http_buffer_t buf;
+
+	zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+	zflags = php_http_ztyp(IS_LONG, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0 TSRMLS_CC));
 
-failure:
-	if (flags & PHP_HTTP_PARAMS_RAISE_ERROR) {
-		php_http_error(HE_WARNING, PHP_HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s));
+	zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC);
+	if (Z_TYPE_P(zpsep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zpsep), (void *) &tmp)) {
+		zpsep = php_http_ztyp(IS_STRING, *tmp);
+	} else {
+		zpsep = php_http_ztyp(IS_STRING, zpsep);
 	}
-	if (flags & PHP_HTTP_PARAMS_ALLOW_FAILURE) {
-		if (st == ST_KEY) {
-			if (key) {
-				keylen = c - key;
+	zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC);
+	if (Z_TYPE_P(zasep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zasep), (void *) &tmp)) {
+		zasep = php_http_ztyp(IS_STRING, *tmp);
+	} else {
+		zasep = php_http_ztyp(IS_STRING, zasep);
+	}
+	zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC);
+	if (Z_TYPE_P(zvsep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zvsep), (void *) &tmp)) {
+		zvsep = php_http_ztyp(IS_STRING, *tmp);
+	} else {
+		zvsep = php_http_ztyp(IS_STRING, zvsep);
+	}
+
+	php_http_buffer_init(&buf);
+	php_http_params_to_string(&buf, Z_ARRVAL_P(zparams), Z_STRVAL_P(zpsep), Z_STRLEN_P(zpsep), Z_STRVAL_P(zasep), Z_STRLEN_P(zasep), Z_STRVAL_P(zvsep), Z_STRLEN_P(zvsep), Z_LVAL_P(zflags) TSRMLS_CC);
+
+	zval_ptr_dtor(&zparams);
+	zval_ptr_dtor(&zpsep);
+	zval_ptr_dtor(&zasep);
+	zval_ptr_dtor(&zvsep);
+	zval_ptr_dtor(&zflags);
+
+	RETVAL_PHP_HTTP_BUFFER_VAL(&buf);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetExists, 0, 0, 1)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, offsetExists)
+{
+	char *name_str;
+	int name_len;
+	zval **zparam, *zparams;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) {
+		return;
+	}
+
+	zparams = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+
+	if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) {
+		RETVAL_BOOL(Z_TYPE_PP(zparam) != IS_NULL);
+	} else {
+		RETVAL_FALSE;
+	}
+	zval_ptr_dtor(&zparams);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetGet, 0, 0, 1)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, offsetGet)
+{
+	char *name_str;
+	int name_len;
+	zval **zparam, *zparams;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) {
+		return;
+	}
+
+	zparams = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+
+	if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) {
+		RETVAL_ZVAL(*zparam, 1, 0);
+	}
+
+	zval_ptr_dtor(&zparams);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetUnset, 0, 0, 1)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, offsetUnset)
+{
+	char *name_str;
+	int name_len;
+	zval *zparams;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) {
+		return;
+	}
+
+	zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+
+	zend_symtable_del(Z_ARRVAL_P(zparams), name_str, name_len + 1);
+	zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC);
+
+	zval_ptr_dtor(&zparams);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetSet, 0, 0, 2)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpParams, offsetSet)
+{
+	zval *nvalue;
+	char *name_str;
+	int name_len;
+	zval **zparam, *zparams;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name_str, &name_len, &nvalue)) {
+		return;
+	}
+
+	zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+
+	if (name_len) {
+		if (Z_TYPE_P(nvalue) == IS_ARRAY) {
+			zval *new_zparam;
+
+			if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) {
+				new_zparam = php_http_zsep(1, IS_ARRAY, *zparam);
+				array_join(Z_ARRVAL_P(nvalue), Z_ARRVAL_P(new_zparam), 0, 0);
 			} else {
-				key = c;
+				new_zparam = nvalue;
+				Z_ADDREF_P(new_zparam);
 			}
+			add_assoc_zval_ex(zparams, name_str, name_len + 1, new_zparam);
 		} else {
-			--c;
+			zval *tmp;
+
+			if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) {
+				tmp = php_http_zsep(1, IS_ARRAY, *zparam);
+			} else {
+				MAKE_STD_ZVAL(tmp);
+				array_init(tmp);
+			}
+
+			Z_ADDREF_P(nvalue);
+			add_assoc_zval_ex(tmp, ZEND_STRS("value"), nvalue);
+			add_assoc_zval_ex(zparams, name_str, name_len + 1, tmp);
 		}
-		st = ST_ADD;
-		goto continued;
+	} else {
+		zval *tmp = php_http_ztyp(IS_STRING, nvalue), *arr;
+
+		MAKE_STD_ZVAL(arr);
+		array_init(arr);
+		add_assoc_bool_ex(arr, ZEND_STRS("value"), 1);
+		add_assoc_zval_ex(zparams, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) + 1, arr);
+		zval_ptr_dtor(&tmp);
 	}
-	efree(s);
-	return FAILURE;
+
+	zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC);
+	zval_ptr_dtor(&zparams);
 }
 
+static zend_function_entry php_http_params_methods[] = {
+	PHP_ME(HttpParams, __construct,   ai_HttpParams___construct,   ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
+
+	PHP_ME(HttpParams, toArray,       ai_HttpParams_toArray,       ZEND_ACC_PUBLIC)
+	PHP_ME(HttpParams, toString,      ai_HttpParams_toString,      ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpParams, __toString, toString, ai_HttpParams_toString, ZEND_ACC_PUBLIC)
+
+	PHP_ME(HttpParams, offsetExists,  ai_HttpParams_offsetExists,  ZEND_ACC_PUBLIC)
+	PHP_ME(HttpParams, offsetUnset,   ai_HttpParams_offsetUnset,   ZEND_ACC_PUBLIC)
+	PHP_ME(HttpParams, offsetSet,     ai_HttpParams_offsetSet,     ZEND_ACC_PUBLIC)
+	PHP_ME(HttpParams, offsetGet,     ai_HttpParams_offsetGet,     ZEND_ACC_PUBLIC)
+
+	EMPTY_FUNCTION_ENTRY
+};
+
+zend_class_entry *php_http_params_class_entry;
+
+PHP_MINIT_FUNCTION(http_params)
+{
+	zend_class_entry ce = {0};
+
+	INIT_NS_CLASS_ENTRY(ce, "http", "Params", php_http_params_methods);
+	php_http_params_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+	php_http_params_class_entry->create_object = php_http_params_object_new;
+	zend_class_implements(php_http_params_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess);
+
+	zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_PARAM_SEP"), ZEND_STRL(",") TSRMLS_CC);
+	zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_ARG_SEP"), ZEND_STRL(";") TSRMLS_CC);
+	zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_VAL_SEP"), ZEND_STRL("=") TSRMLS_CC);
+	zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("COOKIE_PARAM_SEP"), ZEND_STRL("") TSRMLS_CC);
+
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_PARAMS_RAW TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_ESCAPED"), PHP_HTTP_PARAMS_ESCAPED TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_URLENCODED"), PHP_HTTP_PARAMS_URLENCODED TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DIMENSION"), PHP_HTTP_PARAMS_DIMENSION TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RFC5987"), PHP_HTTP_PARAMS_RFC5987 TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_QUERY"), PHP_HTTP_PARAMS_QUERY TSRMLS_CC);
+
+	zend_declare_property_null(php_http_params_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("param_sep"), ZEND_STRL(","), ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("arg_sep"), ZEND_STRL(";"), ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("val_sep"), ZEND_STRL("="), ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_long(php_http_params_class_entry, ZEND_STRL("flags"), PHP_HTTP_PARAMS_DEFAULT, ZEND_ACC_PUBLIC TSRMLS_CC);
+
+	return SUCCESS;
+}
 
 /*
  * Local variables: