X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=14ae720d0886ce9829f430a744db8d2dc3fc554f;hp=b8120891239810c9136b9c2e79c308f17b25e311;hb=2e1cd7f9942bb07d7c3a2efb79090215fc1406d6;hpb=1b093720ee0708c101a273e739ddb774f7d7f6d0

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index b812089..14ae720 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -22,25 +22,29 @@
 
 #include "ext/standard/md5.h"
 #include "ext/standard/sha1.h"
+#include "ext/standard/crc32.h"
 
 #include "php_http_std_defs.h"
 #include "php_http.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 #	include <mhash.h>
 #endif
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+#define http_cache_global_init() _http_cache_global_init(INIT_FUNC_ARGS_PASSTHRU)
+extern STATUS _http_cache_global_init(INIT_FUNC_ARGS);
+
 typedef enum {
+	HTTP_ETAG_CRC32 = -3,
 	HTTP_ETAG_MD5 = -2,
 	HTTP_ETAG_SHA1 = -1,
-	HTTP_ETAG_MHASH = 0,
 } http_etag_mode;
 
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 static void *http_etag_alloc_mhash_digest(size_t size)
 {
 	return emalloc(size);
@@ -73,21 +77,26 @@ static inline void *_http_etag_init(TSRMLS_D)
 	
 	switch (mode)
 	{
+		case HTTP_ETAG_CRC32:
+			ctx = emalloc(sizeof(unsigned int));
+			memset(ctx, 1, sizeof(unsigned int));
+		break;
+		
 		case HTTP_ETAG_SHA1:
 			PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
 			PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 			if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
-				http_error_ex(HE_ERROR, HE_RUNTIME, "Invalid ETag mode: %ld", mode);
+				http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
 			}
 		break;
 #endif
@@ -105,6 +114,12 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 	
 	switch (mode)
 	{
+		case HTTP_ETAG_CRC32:
+			*((unsigned int *) ctx) = ~*((unsigned int *) ctx);
+			etag = http_etag_digest((const unsigned char *) ctx, sizeof(unsigned int));
+			efree(ctx);
+		break;
+		
 		case HTTP_ETAG_SHA1:
 			PHP_SHA1Final(digest, ctx);
 			etag = http_etag_digest(digest, 20);
@@ -112,7 +127,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
 			PHP_MD5Final(digest, ctx);
@@ -120,7 +135,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 			efree(ctx);
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 		{
 			unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
@@ -139,18 +154,29 @@ static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
 {
 	switch (INI_INT("http.etag_mode"))
 	{
+		case HTTP_ETAG_CRC32:
+		{
+			unsigned int i, c = *((unsigned int *) ctx);
+			
+			for (i = 0; i < data_len; ++i) {
+				c = CRC32(c, data_ptr[i]);
+			}
+			*((unsigned int *)ctx) = c;
+		}
+		break;
+		
 		case HTTP_ETAG_SHA1:
-			PHP_SHA1Update(ctx, data_ptr, data_len);
+			PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len);
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
-			PHP_MD5Update(ctx, data_ptr, data_len);
+			PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 			mhash(ctx, data_ptr, data_len);
 		break;