#include "php_http_api.h"
#include "php_http_send_api.h"
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
# include <mhash.h>
#endif
ZEND_EXTERN_MODULE_GLOBALS(http);
+#define http_cache_global_init() _http_cache_global_init(INIT_FUNC_ARGS_PASSTHRU)
+extern STATUS _http_cache_global_init(INIT_FUNC_ARGS);
+
typedef enum {
HTTP_ETAG_MD5 = -2,
HTTP_ETAG_SHA1 = -1,
- HTTP_ETAG_MHASH = 0,
} http_etag_mode;
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
static void *http_etag_alloc_mhash_digest(size_t size)
{
return emalloc(size);
#define http_etag_init() _http_etag_init(TSRMLS_C)
static inline void *_http_etag_init(TSRMLS_D)
{
- void *ctx;
+ void *ctx = NULL;
long mode = INI_INT("http.etag_mode");
switch (mode)
break;
case HTTP_ETAG_MD5:
-invalid_flag:
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
break;
+#ifdef HTTP_HAVE_MHASH
default:
- {
-#ifdef HAVE_LIBMHASH
- if ((mode >= 0) && (mode <= mhash_count())) {
- ctx = mhash_init(mode);
+ if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
+ http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
}
- if ((!ctx) || (ctx == MHASH_FAILED))
-#endif
- {
- HTTP_G(etag).mode = HTTP_ETAG_MD5;
- goto invalid_flag;
- }
- }
break;
+#endif
}
return ctx;
break;
case HTTP_ETAG_MD5:
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
PHP_MD5Final(digest, ctx);
etag = http_etag_digest(digest, 16);
efree(ctx);
break;
+#ifdef HTTP_HAVE_MHASH
default:
{
-#ifdef HAVE_LIBMHASH
unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
etag = http_etag_digest(mhash_digest, mhash_get_block_size(mode));
efree(mhash_digest);
-#endif
}
break;
+#endif
}
return etag;
switch (INI_INT("http.etag_mode"))
{
case HTTP_ETAG_SHA1:
- PHP_SHA1Update(ctx, data_ptr, data_len);
+ PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len);
break;
case HTTP_ETAG_MD5:
- PHP_MD5Update(ctx, data_ptr, data_len);
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
+ PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
break;
+#ifdef HTTP_HAVE_MHASH
default:
-#ifdef HAVE_LIBMHASH
mhash(ctx, data_ptr, data_len);
-#endif
break;
+#endif
}
}