X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cookie_api.c;h=360b79390325237e6d8f8b77e8bde99ae4aa7a7b;hp=b487e205cdf0fbc01e741ae24c5cea2addd07fe9;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=82e8bfff78f52b0989fb865131461fe61156f507

diff --git a/http_cookie_api.c b/http_cookie_api.c
index b487e20..360b793 100644
--- a/http_cookie_api.c
+++ b/http_cookie_api.c
@@ -316,17 +316,14 @@ PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str,
 {
 	phpstr buf;
 	zval **val;
-	ulong idx = 0;
-	uint keylen = 0;
-	char *key = NULL;
+	HashKey key = initHashKey(0);
 	HashPosition pos;
 	
 	phpstr_init(&buf);
 	
-	FOREACH_HASH_KEYLENVAL(pos, &list->cookies, key, keylen, idx, val) {
-		if (key && keylen) {
-			append_encoded(&buf, key, keylen-1, Z_STRVAL_PP(val), Z_STRLEN_PP(val));
-			key = NULL;
+	FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) {
+		if (key.type == HASH_KEY_IS_STRING && key.len) {
+			append_encoded(&buf, key.str, key.len-1, Z_STRVAL_PP(val), Z_STRLEN_PP(val));
 		}
 	}
 	
@@ -342,10 +339,9 @@ PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str,
 		efree(date);
 	}
 	
-	FOREACH_HASH_KEYLENVAL(pos, &list->extras, key, keylen, idx, val) {
-		if (key && keylen) {
-			append_encoded(&buf, key, keylen-1, Z_STRVAL_PP(val), Z_STRLEN_PP(val));
-			key = NULL;
+	FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) {
+		if (key.type == HASH_KEY_IS_STRING && key.len) {
+			append_encoded(&buf, key.str, key.len-1, Z_STRVAL_PP(val), Z_STRLEN_PP(val));
 		}
 	}