X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_etag.c;h=c1e29c3f4c08b62e4842aaf861335b253ee95d6d;hp=4d34d57cd86571c77ebd04ee93b90ab8ffd380d1;hb=592c25cc9ea0b72843c2c2de84bd144e00a3231c;hpb=749dbbaa0e7c5e33d27121dab0f53bda85a67339

diff --git a/src/php_http_etag.c b/src/php_http_etag.c
index 4d34d57..c1e29c3 100644
--- a/src/php_http_etag.c
+++ b/src/php_http_etag.c
@@ -12,15 +12,15 @@
 
 #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"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
 
-php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC)
+php_http_etag_t *php_http_etag_init(const char *mode)
 {
 	void *ctx;
 	php_http_etag_t *e;
@@ -33,7 +33,7 @@ php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC)
 	} 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)))) {
@@ -47,7 +47,6 @@ php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC)
 	e = emalloc(sizeof(*e));
 	e->ctx = ctx;
 	e->mode = estrdup(mode);
-	TSRMLS_SET_CTX(e->ts);
 
 	return e;
 }
@@ -61,7 +60,7 @@ char *php_http_etag_finish(php_http_etag_t *e)
 		unsigned char buf[4];
 
 		*((uint *) e->ctx) = ~*((uint *) e->ctx);
-#ifdef WORDS_BIGENDIAN
+#if WORDS_BIGENDIAN
 		etag = php_http_etag_digest((unsigned char *) e->ctx, 4);
 #else
 		buf[0] = ((unsigned char *) e->ctx)[3];
@@ -77,7 +76,7 @@ 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 ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
@@ -107,7 +106,7 @@ 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 ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {