- improve internal array handling

[m6w6/ext-http] / php_http_cache_api.h

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 6c2121c9c787f9571aeb454317ba47b560e01b9c..dc9b515bd6897f4dde680a1dc31d07850164347a 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -20,14 +20,9 @@
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-#if defined(HTTP_HAVE_EXT_HASH)
+
+#ifdef HTTP_HAVE_HASH
 #      include "php_hash.h"
-#elif defined(HTTP_HAVE_HASH_EXT_HASH)
-#      define HTTP_HAVE_EXT_HASH
-#      include "hash/php_hash.h"
-#elif defined(HTTP_HAVE_EXT_HASH_EXT_HASH)
-#      define HTTP_HAVE_EXT_HASH
-#      include "ext/hash/php_hash.h"
 #endif
 
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
@@ -53,7 +48,7 @@ static inline void *_http_etag_init(TSRMLS_D)
        void *ctx = NULL;
        char *mode = HTTP_G->etag.mode;
        
-#ifdef HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -79,7 +74,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
        unsigned char digest[128] = {0};
        char *etag = NULL, *mode = HTTP_G->etag.mode;
        
-#ifdef HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -106,7 +101,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {
        char *mode = HTTP_G->etag.mode;
-#ifdef HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -116,7 +111,7 @@ static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
        if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
                uint i, c = *((uint *) ctx);
                for (i = 0; i < data_len; ++i) {
-                       c = CRC32(c, data_ptr[i]);
+                       CRC32(c, data_ptr[i]);
                }
                *((uint *)ctx) = c;
        } else if (mode && (!strcasecmp(mode, "sha1"))) {