X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=6efe1d834199cb23295f6175a112a9918cb068c0;hp=c9344837178bc26266925c7570fe349155aff0e0;hb=4e2ecc5ed84649ce20fd1f11319626e0b1befa0a;hpb=dc7248a073febcade23e6a1a296ab1b2bb752298

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index c934483..6efe1d8 100644
--- 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-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,27 +15,25 @@
 #ifndef PHP_HTTP_CACHE_API_H
 #define PHP_HTTP_CACHE_API_H
 
-#include "zend_ini.h"
+#include "php_http_send_api.h"
 
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-
-#include "php_http_std_defs.h"
-#include "php_http.h"
-#include "php_http_api.h"
-#include "php_http_send_api.h"
-
-#ifdef HTTP_HAVE_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
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
 static inline char *_http_etag_digest(const unsigned char *digest, int len)
 {
-	static const char hexdigits[16] = "0123456789abcdef";
+	static const char hexdigits[17] = "0123456789abcdef";
 	int i;
 	char *hex = emalloc(len * 2 + 1);
 	char *ptr = hex;
@@ -53,7 +51,7 @@ static inline char *_http_etag_digest(const unsigned char *digest, int len)
 static inline void *_http_etag_init(TSRMLS_D)
 {
 	void *ctx = NULL;
-	char *mode = HTTP_G(etag).mode;
+	char *mode = HTTP_G->etag.mode;
 	
 #ifdef HTTP_HAVE_EXT_HASH
 	php_hash_ops *eho = NULL;
@@ -79,7 +77,7 @@ static inline void *_http_etag_init(TSRMLS_D)
 static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 {
 	unsigned char digest[128] = {0};
-	char *etag = NULL, *mode = HTTP_G(etag).mode;
+	char *etag = NULL, *mode = HTTP_G->etag.mode;
 	
 #ifdef HTTP_HAVE_EXT_HASH
 	php_hash_ops *eho = NULL;
@@ -107,7 +105,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 #define http_etag_update(c, d, l) _http_etag_update((c), (d), (l) TSRMLS_CC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {
-	char *mode = HTTP_G(etag).mode;
+	char *mode = HTTP_G->etag.mode;
 #ifdef HTTP_HAVE_EXT_HASH
 	php_hash_ops *eho = NULL;
 	
@@ -118,7 +116,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"))) {