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 dc9b515bd6897f4dde680a1dc31d07850164347a..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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -49,7 +49,7 @@ static inline void *_http_etag_init(TSRMLS_D)
        char *mode = HTTP_G->etag.mode;
        
 #ifdef HTTP_HAVE_HASH
-       php_hash_ops *eho = NULL;
+       const php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                ctx = emalloc(eho->context_size);
@@ -75,7 +75,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
        char *etag = NULL, *mode = HTTP_G->etag.mode;
        
 #ifdef HTTP_HAVE_HASH
-       php_hash_ops *eho = NULL;
+       const php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_final(digest, ctx);
@@ -102,7 +102,7 @@ static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
 {
        char *mode = HTTP_G->etag.mode;
 #ifdef HTTP_HAVE_HASH
-       php_hash_ops *eho = NULL;
+       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);