X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_etag.c;h=ceb82e334f74489df046b591fcd1d425dcce5375;hp=8c6a5485f0bd2a8247d0b0f7c220aba23d803656;hb=b5800afbae98afce2841af18d9dc72d1a6bc357c;hpb=28d7c572181c8c3c335edd3df539f75c3bbde0fd

diff --git a/src/php_http_etag.c b/src/php_http_etag.c
index 8c6a548..ceb82e3 100644
--- a/src/php_http_etag.c
+++ b/src/php_http_etag.c
@@ -12,8 +12,8 @@
 
 #include "php_http_api.h"
 
-#ifdef PHP_HTTP_HAVE_HASH
-#	include "php_hash.h"
+#if PHP_HTTP_HAVE_HASH
+#	include "ext/hash/php_hash.h"
 #endif
 
 #include "ext/standard/crc32.h"
@@ -33,7 +33,7 @@ php_http_etag_t *php_http_etag_init(const char *mode)
 	} else if (mode && !strcasecmp(mode, "md5")) {
 		PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
 	} else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
 		const php_hash_ops *eho = NULL;
 
 		if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -76,10 +76,10 @@ char *php_http_etag_finish(php_http_etag_t *e)
 		PHP_MD5Final(digest, e->ctx);
 		etag = php_http_etag_digest(digest, 16);
 	} else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
 		const php_hash_ops *eho = NULL;
 
-		if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+		if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
 			eho->hash_final(digest, e->ctx);
 			etag = php_http_etag_digest(digest, eho->digest_size);
 		}
@@ -106,10 +106,10 @@ size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t dat
 	} else if ((!strcasecmp(e->mode, "md5"))) {
 		PHP_MD5Update(e->ctx, (const unsigned char *) data_ptr, data_len);
 	} else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
 		const php_hash_ops *eho = NULL;
 
-		if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+		if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
 			eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
 		}
 #endif