back to dev

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index 79c37893398bc09d860fff560de33083c21c79db..8e2227da1db0ec1a17135123ff09f7e657d719d0 100644 (file)
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -80,23 +80,23 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags)
                        }
                }
 
-               STR_FREE(haystack);
-               STR_FREE(needle);
+               PTR_FREE(haystack);
+               PTR_FREE(needle);
        }
 
        return result;
 }
 
-char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
+char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
 {
-       size_t i;
+       size_t i = 1;
        int wasalpha;
 
        if (key && key_len) {
                if ((wasalpha = PHP_HTTP_IS_CTYPE(alpha, key[0]))) {
                        key[0] = (char) (uctitle ? PHP_HTTP_TO_CTYPE(upper, key[0]) : PHP_HTTP_TO_CTYPE(lower, key[0]));
                }
-               for (i = 1; i < key_len; i++) {
+               PHP_HTTP_DUFF(key_len,
                        if (PHP_HTTP_IS_CTYPE(alpha, key[i])) {
                                key[i] = (char) (((!wasalpha) && uctitle) ? PHP_HTTP_TO_CTYPE(upper, key[i]) : PHP_HTTP_TO_CTYPE(lower, key[i]));
                                wasalpha = 1;
@@ -106,7 +106,8 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo
                                }
                                wasalpha = 0;
                        }
-               }
+                       ++i;
+               );
        }
        return key;
 }
@@ -114,7 +115,7 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo
 
 size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
 {
-       return snprintf(buf, buf_len, "%15.15F", PHP_HTTP_G->env.request.time * php_combined_lcg(TSRMLS_C));
+       return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time(TSRMLS_C) * php_combined_lcg(TSRMLS_C));
 }
 
 int php_http_select_str(const char *cmp, int argc, ...)
@@ -187,8 +188,10 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
                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_find(dst, key, hash_key->nKeyLength, (void *) &data);
-               } else {
+               } else if (hash_key->nKeyLength) {
                        zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
+               } else {
+                       zend_hash_index_find(dst, hash_key->h, (void *) &data);
                }
 
                if (flags & ARRAY_JOIN_STRINGIFY) {
@@ -204,8 +207,10 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
                        add_next_index_zval(*data, value);
                } else if (key) {
                        zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL);
-               } else {
+               } else if (hash_key->nKeyLength) {
                        zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL);
+               } else {
+                       zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
                }
 
                if (key) {
@@ -237,8 +242,10 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
                        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);
                        efree(key);
-               } else {
+               } else if (hash_key->nKeyLength) {
                        zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL);
+               } else {
+                       zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
                }
        }