/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
#include "php_http_api.h"
#include "php_http_send_api.h"
+#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH) && defined(HTTP_HAVE_HASH_EXT_INCLUDES)
+# define HTTP_HAVE_HASH_EXT
+# include "php_hash.h"
+# include "php_hash_sha.h"
+# include "php_hash_ripemd.h"
+#endif
+
#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 {
+#ifdef HTTP_HAVE_HASH_EXT
+ HTTP_ETAG_RIPEMD160 = -8,
+ HTTP_ETAG_RIPEMD128 = -7,
+ HTTP_ETAG_SHA512 = -6,
+ HTTP_ETAG_SHA384 = -5,
+ HTTP_ETAG_SHA256 = -4,
+#endif
HTTP_ETAG_CRC32 = -3,
HTTP_ETAG_MD5 = -2,
HTTP_ETAG_SHA1 = -1,
} http_etag_mode;
+extern PHP_MINIT_FUNCTION(http_cache);
+
#ifdef HTTP_HAVE_MHASH
static void *http_etag_alloc_mhash_digest(size_t size)
{
#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)
{
+ static const char hexdigits[16] = "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';
return hex;
}
+#undef CASE_HTTP_ETAG_HASH
+#define CASE_HTTP_ETAG_HASH(HASH) \
+ case HTTP_ETAG_##HASH: \
+ PHP_##HASH##Init(ctx = emalloc(sizeof(PHP_##HASH##_CTX))); \
+ break;
#define http_etag_init() _http_etag_init(TSRMLS_C)
static inline void *_http_etag_init(TSRMLS_D)
{
void *ctx = NULL;
long mode = HTTP_G(etag).mode;
-
+
switch (mode)
{
case HTTP_ETAG_CRC32:
- ctx = emalloc(sizeof(unsigned int));
- memset(ctx, 1, sizeof(unsigned int));
- break;
-
- case HTTP_ETAG_SHA1:
- PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
+ ctx = emalloc(sizeof(uint));
+ *((uint *) ctx) = ~0;
break;
- case HTTP_ETAG_MD5:
+#ifdef HTTP_HAVE_HASH_EXT
+ CASE_HTTP_ETAG_HASH(RIPEMD160);
+ CASE_HTTP_ETAG_HASH(RIPEMD128);
+ CASE_HTTP_ETAG_HASH(SHA512);
+ CASE_HTTP_ETAG_HASH(SHA384);
+ CASE_HTTP_ETAG_HASH(SHA256);
+#endif
+ CASE_HTTP_ETAG_HASH(SHA1);
#ifndef HTTP_HAVE_MHASH
default:
#endif
- PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
- break;
+ CASE_HTTP_ETAG_HASH(MD5);
#ifdef HTTP_HAVE_MHASH
default:
return ctx;
}
+#undef CASE_HTTP_ETAG_HASH
+#define CASE_HTTP_ETAG_HASH(HASH) \
+ case HTTP_ETAG_##HASH: \
+ if (*((PHP_##HASH##_CTX **) ctx_ptr)) { \
+ efree(*((PHP_##HASH##_CTX **) ctx_ptr)); \
+ *((PHP_##HASH##_CTX **) ctx_ptr) = NULL; \
+ } \
+ break;
#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)
+ switch (HTTP_G(etag).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;
+ if (*((uint **) ctx_ptr)) {
+ efree(*((uint **) ctx_ptr));
+ *((uint **) ctx_ptr) = NULL;
}
break;
-
- case HTTP_ETAG_MD5:
+
+#ifdef HTTP_HAVE_HASH_EXT
+ CASE_HTTP_ETAG_HASH(RIPEMD160);
+ CASE_HTTP_ETAG_HASH(RIPEMD128);
+ CASE_HTTP_ETAG_HASH(SHA512);
+ CASE_HTTP_ETAG_HASH(SHA384);
+ CASE_HTTP_ETAG_HASH(SHA256);
+#endif
+ CASE_HTTP_ETAG_HASH(SHA1);
#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;
+ CASE_HTTP_ETAG_HASH(MD5);
#ifdef HTTP_HAVE_MHASH
default:
}
}
+#undef CASE_HTTP_ETAG_HASH
+#define CASE_HTTP_ETAG_HASH(HASH, len) \
+ case HTTP_ETAG_##HASH##: \
+ PHP_##HASH##Final(digest, *((PHP_##HASH##_CTX **) ctx_ptr)); \
+ etag = http_etag_digest(digest, len); \
+ break;
#define http_etag_finish(c) _http_etag_finish((c) TSRMLS_CC)
static inline char *_http_etag_finish(void **ctx_ptr TSRMLS_DC)
{
char *etag = NULL;
- unsigned char digest[20];
+ unsigned char digest[128];
long 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);
+ **((uint **) ctx_ptr) = ~**((uint **) ctx_ptr);
+ etag = http_etag_digest(*((const unsigned char **) ctx_ptr), sizeof(uint));
break;
-
- case HTTP_ETAG_MD5:
+
+#ifdef HTTP_HAVE_HASH_EXT
+ CASE_HTTP_ETAG_HASH(RIPEMD160, 20);
+ CASE_HTTP_ETAG_HASH(RIPEMD128, 16);
+ CASE_HTTP_ETAG_HASH(SHA512, 64);
+ CASE_HTTP_ETAG_HASH(SHA384, 48);
+ CASE_HTTP_ETAG_HASH(SHA256, 32);
+#endif
+ CASE_HTTP_ETAG_HASH(SHA1, 20);
#ifndef HTTP_HAVE_MHASH
default:
#endif
- PHP_MD5Final(digest, *((PHP_MD5_CTX **) ctx_ptr));
- etag = http_etag_digest(digest, 16);
- break;
+ CASE_HTTP_ETAG_HASH(MD5, 16);
#ifdef HTTP_HAVE_MHASH
default:
return etag;
}
+#undef CASE_HTTP_ETAG_HASH
+#define CASE_HTTP_ETAG_HASH(HASH) \
+ case HTTP_ETAG_##HASH: \
+ PHP_##HASH##Update(ctx, (const unsigned char *) data_ptr, data_len); \
+ break;
#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"))
+ switch (HTTP_G(etag).mode)
{
case HTTP_ETAG_CRC32:
{
- unsigned int i, c = *((unsigned int *) ctx);
+ uint i, c = *((uint *) ctx);
for (i = 0; i < data_len; ++i) {
c = CRC32(c, data_ptr[i]);
}
- *((unsigned int *)ctx) = c;
+ *((uint *)ctx) = c;
}
break;
- case HTTP_ETAG_SHA1:
- PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len);
- break;
-
- case HTTP_ETAG_MD5:
+#ifdef HTTP_HAVE_HASH_EXT
+ CASE_HTTP_ETAG_HASH(RIPEMD160);
+ CASE_HTTP_ETAG_HASH(RIPEMD128);
+ CASE_HTTP_ETAG_HASH(SHA512);
+ CASE_HTTP_ETAG_HASH(SHA384);
+ CASE_HTTP_ETAG_HASH(SHA256);
+#endif
+ CASE_HTTP_ETAG_HASH(SHA1);
#ifndef HTTP_HAVE_MHASH
default:
#endif
- PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
- break;
+ CASE_HTTP_ETAG_HASH(MD5);
#ifdef HTTP_HAVE_MHASH
default:
projects / m6w6 / ext-http / blobdiff