unfold cookie tests and fix variable type inconsitency

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index 0ba19f9b0ee908ea27e7de64bcf3766f6db7a1fa..79c37893398bc09d860fff560de33083c21c79db 100644 (file)
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+

-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |

     +--------------------------------------------------------------------+
 */
 
     +--------------------------------------------------------------------+
 */
 


@@ -61,7 +61,8 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags)
                        result = !strcasecmp(haystack_str, needle_str);
                }
        } else {
                        result = !strcasecmp(haystack_str, needle_str);
                }
        } else {

-               char *found, *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);
+               const char *found;
+               char *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);

 
                if (flags & PHP_HTTP_MATCH_CASE) {
                        found = zend_memnstr(haystack, needle, strlen(needle), haystack+strlen(haystack));
 
                if (flags & PHP_HTTP_MATCH_CASE) {
                        found = zend_memnstr(haystack, needle, strlen(needle), haystack+strlen(haystack));


@@ -165,12 +166,19 @@ unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...)
        return argl;
 }
 
        return argl;
 }
 

+void php_http_array_copy_strings(void *zpp)
+{
+       zval **zvpp = ((zval **) zpp);
+
+       *zvpp = php_http_zsep(1, IS_STRING, *zvpp);
+}
+

 int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
        int flags;
        char *key = NULL;
        HashTable *dst;
 int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
        int flags;
        char *key = NULL;
        HashTable *dst;

-       zval **data = NULL, **value = (zval **) pDest;
+       zval **data = NULL, *value = *((zval **) pDest);

 
        dst = va_arg(args, HashTable *);
        flags = va_arg(args, int);
 
        dst = va_arg(args, HashTable *);
        flags = va_arg(args, int);


@@ -183,16 +191,21 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
                        zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
                }
 
                        zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
                }
 

-               Z_ADDREF_P(*value);
+               if (flags & ARRAY_JOIN_STRINGIFY) {
+                       value = php_http_zsep(1, IS_STRING, value);
+               } else {
+                       Z_ADDREF_P(value);
+               }
+

                if (data) {
                        if (Z_TYPE_PP(data) != IS_ARRAY) {
                                convert_to_array(*data);
                        }
                if (data) {
                        if (Z_TYPE_PP(data) != IS_ARRAY) {
                                convert_to_array(*data);
                        }

-                       add_next_index_zval(*data, *value);
+                       add_next_index_zval(*data, value);

                } else if (key) {
                } else if (key) {

-                       zend_symtable_update(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
+                       zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL);

                } else {
                } else {

-                       zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, value, sizeof(zval *), NULL);
+                       zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL);

                }
 
                if (key) {
                }
 
                if (key) {


@@ -208,19 +221,24 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
        int flags;
        char *key = NULL;
        HashTable *dst;
        int flags;
        char *key = NULL;
        HashTable *dst;

-       zval **value = (zval **) pDest;
+       zval *value = *((zval **) pDest);

 
        dst = va_arg(args, HashTable *);
        flags = va_arg(args, int);
 
        if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) {
 
        dst = va_arg(args, HashTable *);
        flags = va_arg(args, int);
 
        if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) {

-               Z_ADDREF_P(*value);
+               if (flags & ARRAY_JOIN_STRINGIFY) {
+                       value = php_http_zsep(1, IS_STRING, value);
+               } else {
+                       Z_ADDREF_P(value);
+               }
+

                if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
                        key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
                if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
                        key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);

-                       zend_hash_update(dst, key, hash_key->nKeyLength, (void *) value, sizeof(zval *), NULL);
+                       zend_hash_update(dst, key, hash_key->nKeyLength, (void *) &value, sizeof(zval *), NULL);

                        efree(key);
                } else {
                        efree(key);
                } else {

-                       zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) value, sizeof(zval *), NULL);
+                       zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL);

                }
        }
 
                }
        }