| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "ext/standard/crc32.h"
#include "ext/standard/sha1.h"
#include "ext/standard/md5.h"
-#if HTTP_HAVE_EXT(HASH)
-# if defined(HTTP_HAVE_EXT_HASH)
-# include "php_hash.h"
-# elif defined(HTTP_HAVE_HASH_EXT_HASH)
-# define HTTP_HAVE_EXT_HASH
-# include "hash/php_hash.h"
-# elif defined(HTTP_HAVE_EXT_HASH_EXT_HASH)
-# define HTTP_HAVE_EXT_HASH
-# include "ext/hash/php_hash.h"
-# endif
+
+#ifdef HTTP_HAVE_HASH
+# include "php_hash.h"
#endif
#define http_etag_digest(d, l) _http_etag_digest((d), (l))
void *ctx = NULL;
char *mode = HTTP_G->etag.mode;
-#if HTTP_HAVE_EXT(HASH)
- php_hash_ops *eho = NULL;
+#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);
unsigned char digest[128] = {0};
char *etag = NULL, *mode = HTTP_G->etag.mode;
-#if HTTP_HAVE_EXT(HASH)
- php_hash_ops *eho = NULL;
+#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);
static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
{
char *mode = HTTP_G->etag.mode;
-#if HTTP_HAVE_EXT(HASH)
- php_hash_ops *eho = NULL;
+#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);