X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_etag.c;h=40757f799968a000558365347f471810270e26fd;hp=b80cc9df85ce0422d43e589e4a2d7ae8059b9468;hb=a07b79b1871054ca17e48b69445b4dc201f24662;hpb=4d708279b6956fc95b253ddc88671fb2f0e5aa39

diff --git a/php_http_etag.c b/php_http_etag.c
index b80cc9d..40757f7 100644
--- a/php_http_etag.c
+++ b/php_http_etag.c
@@ -8,10 +8,10 @@
 #include <ext/standard/sha1.h>
 #include <ext/standard/md5.h>
 
-PHP_HTTP_API void *php_http_etag_init(TSRMLS_D)
+PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC)
 {
-	void *ctx = NULL;
-	char *mode = PHP_HTTP_G->env.etag_mode;
+	void *ctx;
+	php_http_etag_t *e;
 
 #ifdef PHP_HTTP_HAVE_HASH
 	const php_hash_ops *eho = NULL;
@@ -26,61 +26,69 @@ PHP_HTTP_API void *php_http_etag_init(TSRMLS_D)
 		*((uint *) ctx) = ~0;
 	} else if (mode && !strcasecmp(mode, "sha1")) {
 		PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
-	} else {
+	} else if (mode && !strcasecmp(mode, "md5")) {
 		PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
+	} else {
+		return NULL;
 	}
 
-	return ctx;
+	e = emalloc(sizeof(*e));
+	e->ctx = ctx;
+	e->mode = estrdup(mode);
+	TSRMLS_SET_CTX(e->ts);
+
+	return e;
 }
 
-PHP_HTTP_API char *php_http_etag_finish(void *ctx TSRMLS_DC)
+PHP_HTTP_API char *php_http_etag_finish(php_http_etag_t *e)
 {
 	unsigned char digest[128] = {0};
-	char *etag = NULL, *mode = PHP_HTTP_G->env.etag_mode;
+	char *etag = NULL;
 
 #ifdef PHP_HTTP_HAVE_HASH
 	const php_hash_ops *eho = NULL;
 
-	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
-		eho->hash_final(digest, ctx);
+	if (mode && (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);
 	} else
 #endif
-	if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
-		*((uint *) ctx) = ~*((uint *) ctx);
-		etag = php_http_etag_digest((const unsigned char *) ctx, sizeof(uint));
-	} else if (mode && (!strcasecmp(mode, "sha1"))) {
-		PHP_SHA1Final(digest, ctx);
+	if (((!strcasecmp(e->mode, "crc32")) || (!strcasecmp(e->mode, "crc32b")))) {
+		*((uint *) e->ctx) = ~*((uint *) e->ctx);
+		etag = php_http_etag_digest((const unsigned char *) e->ctx, sizeof(uint));
+	} else if ((!strcasecmp(e->mode, "sha1"))) {
+		PHP_SHA1Final(digest, e->ctx);
 		etag = php_http_etag_digest(digest, 20);
 	} else {
-		PHP_MD5Final(digest, ctx);
+		PHP_MD5Final(digest, e->ctx);
 		etag = php_http_etag_digest(digest, 16);
 	}
-	efree(ctx);
+	efree(e->ctx);
+	efree(e->mode);
+	efree(e);
 
 	return etag;
 }
 
-PHP_HTTP_API size_t php_http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
+PHP_HTTP_API size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t data_len)
 {
-	char *mode = PHP_HTTP_G->env.etag_mode;
 #ifdef PHP_HTTP_HAVE_HASH
 	const php_hash_ops *eho = NULL;
 
-	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
-		eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);
+	if (mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+		eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
 	} else
 #endif
-	if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
-		uint i, c = *((uint *) ctx);
+	if (((!strcasecmp(e->mode, "crc32")) || (!strcasecmp(e->mode, "crc32b")))) {
+		uint i, c = *((uint *) e->ctx);
 		for (i = 0; i < data_len; ++i) {
 			CRC32(c, data_ptr[i]);
 		}
-		*((uint *)ctx) = c;
-	} else if (mode && (!strcasecmp(mode, "sha1"))) {
-		PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len);
+		*((uint *) e->ctx) = c;
+	} else if ((!strcasecmp(e->mode, "sha1"))) {
+		PHP_SHA1Update(e->ctx, (const unsigned char *) data_ptr, data_len);
 	} else {
-		PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
+		PHP_MD5Update(e->ctx, (const unsigned char *) data_ptr, data_len);
 	}
 
 	return data_len;