X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=8df20a0cce159931d5adf339c643044937c628f4;hp=d75d432125a1ef4c98b433e7e9f012ad5ea590d9;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index d75d432..8df20a0 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,50 +15,27 @@
 #ifndef PHP_HTTP_CACHE_API_H
 #define PHP_HTTP_CACHE_API_H
 
-#include "zend_ini.h"
-
-#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 HTTP_HAVE_MHASH
-#	include <mhash.h>
-#endif
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
-typedef enum {
-	HTTP_ETAG_CRC32 = -3,
-	HTTP_ETAG_MD5 = -2,
-	HTTP_ETAG_SHA1 = -1,
-} http_etag_mode;
-
-extern PHP_MINIT_FUNCTION(http_cache);
+#include "ext/standard/crc32.h"
+#include "ext/standard/sha1.h"
+#include "ext/standard/md5.h"
 
-#ifdef HTTP_HAVE_MHASH
-static void *http_etag_alloc_mhash_digest(size_t size)
-{
-	return emalloc(size);
-}
+#ifdef HTTP_HAVE_HASH
+#	include "php_hash.h"
 #endif
 
-#define http_etag_digest(d, l) _http_etag_digest((d), (l) TSRMLS_CC)
-static inline char *_http_etag_digest(const unsigned char *digest, int len TSRMLS_DC)
+#define http_etag_digest(d, l) _http_etag_digest((d), (l))
+static inline char *_http_etag_digest(const unsigned char *digest, int len)
 {
+	static const char hexdigits[17] = "0123456789abcdef";
 	int i;
 	char *hex = emalloc(len * 2 + 1);
 	char *ptr = hex;
 	
-	/* optimize this --
-		look at apache's make_etag */
 	for (i = 0; i < len; ++i) {
-		sprintf(ptr, "%02x", digest[i]);
-		ptr += 2;
+		*ptr++ = hexdigits[digest[i] >> 4];
+		*ptr++ = hexdigits[digest[i] & 0xF];
 	}
 	*ptr = '\0';
 	
@@ -69,122 +46,53 @@ static inline char *_http_etag_digest(const unsigned char *digest, int len TSRML
 static inline void *_http_etag_init(TSRMLS_D)
 {
 	void *ctx = NULL;
-	long mode = HTTP_G(etag).mode;
+	char *mode = HTTP_G->etag.mode;
 	
-	switch (mode)
-	{
-		case HTTP_ETAG_CRC32:
-			ctx = emalloc(sizeof(unsigned int));
-			*((unsigned int *) ctx) = ~0;
-		break;
-		
-		case HTTP_ETAG_SHA1:
-			PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
-		break;
-		
-		case HTTP_ETAG_MD5:
-#ifndef HTTP_HAVE_MHASH
-		default:
-#endif
-			PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
-		break;
-		
-#ifdef HTTP_HAVE_MHASH
-		default:
-			if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
-				http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
-			}
-		break;
+#ifdef HTTP_HAVE_HASH
+	const php_hash_ops *eho = NULL;
+	
+	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
+		ctx = emalloc(eho->context_size);
+		eho->hash_init(ctx);
+	} else
 #endif
+	if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
+		ctx = emalloc(sizeof(uint));
+		*((uint *) ctx) = ~0;
+	} else if (mode && !strcasecmp(mode, "sha1")) {
+		PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
+	} else {
+		PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
 	}
 	
 	return ctx;
 }
 
-#define http_etag_free(cp) _http_etag_free((cp) TSRMLS_CC)
-static inline void _http_etag_free(void **ctx_ptr TSRMLS_DC)
-{
-	long mode = HTTP_G(etag).mode;
-	
-	switch (mode)
-	{
-		case HTTP_ETAG_CRC32:
-			if (*((unsigned int **) ctx_ptr)) {
-				efree(*((unsigned int **) ctx_ptr));
-				*((unsigned int **) ctx_ptr) = NULL;
-			}
-		break;
-		
-		case HTTP_ETAG_SHA1:
-			if (*((PHP_SHA1_CTX **) ctx_ptr)) {
-				efree(*((PHP_SHA1_CTX **) ctx_ptr));
-				*((PHP_SHA1_CTX **) ctx_ptr) = NULL;
-			}
-		break;
-		
-		case HTTP_ETAG_MD5:
-#ifndef HTTP_HAVE_MHASH
-		default:
-#endif
-			if (*((PHP_MD5_CTX **) ctx_ptr)) {
-				efree(*((PHP_MD5_CTX **) ctx_ptr));
-				*((PHP_MD5_CTX **) ctx_ptr) = NULL;
-			}
-		break;
-		
-#ifdef HTTP_HAVE_MHASH
-		default:
-			/* mhash gets already freed in http_etag_finish() */
-			if (*((MHASH *) ctx_ptr)) {
-				mhash_deinit(*((MHASH *) ctx_ptr), NULL);
-				*((MHASH *) ctx_ptr) = NULL;
-			}
-		break;
-#endif
-	}
-}
-
 #define http_etag_finish(c) _http_etag_finish((c) TSRMLS_CC)
-static inline char *_http_etag_finish(void **ctx_ptr TSRMLS_DC)
+static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 {
-	char *etag = NULL;
-	unsigned char digest[20];
-	long mode = HTTP_G(etag).mode;
+	unsigned char digest[128] = {0};
+	char *etag = NULL, *mode = HTTP_G->etag.mode;
 	
-	switch (mode)
-	{
-		case HTTP_ETAG_CRC32:
-			**((unsigned int **) ctx_ptr) = ~**((unsigned int **) ctx_ptr);
-			etag = http_etag_digest(*((const unsigned char **) ctx_ptr), sizeof(unsigned int));
-		break;
-		
-		case HTTP_ETAG_SHA1:
-			PHP_SHA1Final(digest, *((PHP_SHA1_CTX **) ctx_ptr));
-			etag = http_etag_digest(digest, 20);
-		break;
-		
-		case HTTP_ETAG_MD5:
-#ifndef HTTP_HAVE_MHASH
-		default:
-#endif
-			PHP_MD5Final(digest, *((PHP_MD5_CTX **) ctx_ptr));
-			etag = http_etag_digest(digest, 16);
-		break;
-		
-#ifdef HTTP_HAVE_MHASH
-		default:
-		{
-			unsigned char *mhash_digest = mhash_end_m(*((MHASH *) ctx_ptr), http_etag_alloc_mhash_digest);
-			etag = http_etag_digest(mhash_digest, mhash_get_block_size(mode));
-			efree(mhash_digest);
-			/* avoid double free */
-			*((MHASH *) ctx_ptr) = NULL;
-		}
-		break;
+#ifdef HTTP_HAVE_HASH
+	const php_hash_ops *eho = NULL;
+	
+	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
+		eho->hash_final(digest, ctx);
+		etag = http_etag_digest(digest, eho->digest_size);
+	} else
 #endif
+	if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
+		*((uint *) ctx) = ~*((uint *) ctx);
+		etag = http_etag_digest((const unsigned char *) ctx, sizeof(uint));
+	} else if (mode && (!strcasecmp(mode, "sha1"))) {
+		PHP_SHA1Final(digest, ctx);
+		etag = http_etag_digest(digest, 20);
+	} else {
+		PHP_MD5Final(digest, ctx);
+		etag = http_etag_digest(digest, 16);
 	}
-	
-	http_etag_free(ctx_ptr);
+	efree(ctx);
 	
 	return etag;
 }
@@ -192,35 +100,24 @@ static inline char *_http_etag_finish(void **ctx_ptr TSRMLS_DC)
 #define http_etag_update(c, d, l) _http_etag_update((c), (d), (l) TSRMLS_CC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {
-	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, (const unsigned char *) data_ptr, data_len);
-		break;
-		
-		case HTTP_ETAG_MD5:
-#ifndef HTTP_HAVE_MHASH
-		default:
-#endif
-			PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
-		break;
-		
-#ifdef HTTP_HAVE_MHASH
-		default:
-			mhash(ctx, data_ptr, data_len);
-		break;
+	char *mode = HTTP_G->etag.mode;
+#ifdef 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);
+	} else
 #endif
+	if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
+		uint i, c = *((uint *) 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);
+	} else {
+		PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
 	}
 }