branch off v1 as R_1_7

[m6w6/ext-http] / php_http_cache_api.h

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index dbbe0a2b78df9287c143b572c3e94719175cc0ee..8df20a0cce159931d5adf339c643044937c628f4 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -20,16 +20,9 @@
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-#if !HTTP_SHARED_EXT(HASH)
-#      if defined(HTTP_HAVE_EXT_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
+
+#ifdef HTTP_HAVE_HASH
+#      include "php_hash.h"
 #endif
 
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
@@ -55,8 +48,8 @@ static inline void *_http_etag_init(TSRMLS_D)
        void *ctx = NULL;
        char *mode = HTTP_G->etag.mode;
        
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-       php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+       const php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                ctx = emalloc(eho->context_size);
@@ -81,8 +74,8 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
        unsigned char digest[128] = {0};
        char *etag = NULL, *mode = HTTP_G->etag.mode;
        
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-       php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+       const php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_final(digest, ctx);
@@ -108,8 +101,8 @@ 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;
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-       php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+       const php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);