X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=d7e53b77b41bc5c073ae52e6ef3c66a750919387;hp=bef8cc8b97d14cdf94548db85c82868e261e3ddb;hb=ff17beb99d61462cf1791eecdb3f68dbd2aea5e5;hpb=a347d63a12d0863cf848c2e4ffa891fe827e29bb

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index bef8cc8..d7e53b7 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -28,19 +28,21 @@
 #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_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);
@@ -68,7 +70,7 @@ static inline char *_http_etag_digest(const unsigned char *digest, int len TSRML
 #define http_etag_init() _http_etag_init(TSRMLS_C)
 static inline void *_http_etag_init(TSRMLS_D)
 {
-	void *ctx;
+	void *ctx = NULL;
 	long mode = INI_INT("http.etag_mode");
 	
 	switch (mode)
@@ -78,24 +80,19 @@ static inline void *_http_etag_init(TSRMLS_D)
 		break;
 		
 		case HTTP_ETAG_MD5:
-invalid_flag:
+#ifndef HTTP_HAVE_MHASH
+		default:
+#endif
 			PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
 		break;
 		
+#ifdef HTTP_HAVE_MHASH
 		default:
-		{
-#ifdef HAVE_LIBMHASH
-			if ((mode >= 0) && (mode <= mhash_count())) {
-				ctx = mhash_init(mode);
+			if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
+				http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
 			}
-			if ((!ctx) || (ctx == MHASH_FAILED))
-#endif
-			{
-				HTTP_G(etag).mode = HTTP_ETAG_MD5;
-				goto invalid_flag;
-			}
-		}
 		break;
+#endif
 	}
 	
 	return ctx;
@@ -117,20 +114,23 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 		break;
 		
 		case HTTP_ETAG_MD5:
+#ifndef HTTP_HAVE_MHASH
+		default:
+#endif
 			PHP_MD5Final(digest, ctx);
 			etag = http_etag_digest(digest, 16);
 			efree(ctx);
 		break;
 		
+#ifdef HTTP_HAVE_MHASH
 		default:
 		{
-#ifdef HAVE_LIBMHASH
 			unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
 			etag = http_etag_digest(mhash_digest, mhash_get_block_size(mode));
 			efree(mhash_digest);
-#endif
 		}
 		break;
+#endif
 	}
 	
 	return etag;
@@ -142,18 +142,21 @@ static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
 	switch (INI_INT("http.etag_mode"))
 	{
 		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:
-			PHP_MD5Update(ctx, data_ptr, data_len);
+#ifndef HTTP_HAVE_MHASH
+		default:
+#endif
+			PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
 		break;
 		
+#ifdef HTTP_HAVE_MHASH
 		default:
-#ifdef HAVE_LIBMHASH
 			mhash(ctx, data_ptr, data_len);
-#endif
 		break;
+#endif
 	}
 }