X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=c7196c1891acb0018cadadce19e1cde8bcedff5f;hp=0c96f4a2593059fa274c214eb0f9e6f56b26e025;hb=b97243b9bffae6ec360cfa7ea2dd1c7f1c3a556f;hpb=061fbbe598d6e28b35c408b35beec1a6508abac9

diff --git a/http_cache_api.c b/http_cache_api.c
index 0c96f4a..c7196c1 100644
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -33,8 +33,36 @@
 #include "php_http_send_api.h"
 #include "php_http_date_api.h"
 
+#ifdef HTTP_HAVE_MHASH
+#	include <mhash.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+STATUS _http_cache_global_init(INIT_FUNC_ARGS)
+{
+	HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+
+#ifdef HTTP_HAVE_MHASH
+	{
+		int l, i, c = mhash_count();
+		
+		for (i = 0; i < c; ++i) {
+			char const_name[256] = {0};
+			const char *hash_name = mhash_get_hash_name_static(i);
+			
+			if (hash_name) {
+				l = snprintf(const_name, 255, "HTTP_ETAG_MHASH_%s", hash_name);
+				zend_register_long_constant(const_name, l + 1, i, CONST_CS|CONST_PERSISTENT, module_number TSRMLS_CC);
+			}
+		}
+	}
+#endif
+
+	return SUCCESS;
+}
+
 /* {{{ char *http_etag(void *, size_t, http_send_mode) */
 PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
 {
@@ -198,9 +226,6 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 	char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
 {
-	char etag[41] = { 0 };
-	unsigned char digest[20];
-
 	if (mode & PHP_OUTPUT_HANDLER_START) {
 		if (HTTP_G(etag).started) {
 			http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");