projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- changelog
[m6w6/ext-http]
/
php_http_cache_api.h
diff --git
a/php_http_cache_api.h
b/php_http_cache_api.h
index a1d62eef20d922e2431963317bd1ce793502ebfc..dc9b515bd6897f4dde680a1dc31d07850164347a 100644
(file)
--- a/
php_http_cache_api.h
+++ b/
php_http_cache_api.h
@@
-20,14
+20,9
@@
#include "ext/standard/crc32.h"
#include "ext/standard/sha1.h"
#include "ext/standard/md5.h"
#include "ext/standard/crc32.h"
#include "ext/standard/sha1.h"
#include "ext/standard/md5.h"
-#if defined(HTTP_HAVE_EXT_HASH)
+
+#ifdef HTTP_HAVE_HASH
# include "php_hash.h"
# 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
#define http_etag_digest(d, l) _http_etag_digest((d), (l))
#endif
#define http_etag_digest(d, l) _http_etag_digest((d), (l))
@@
-51,9
+46,9
@@
static inline char *_http_etag_digest(const unsigned char *digest, int len)
static inline void *_http_etag_init(TSRMLS_D)
{
void *ctx = NULL;
static inline void *_http_etag_init(TSRMLS_D)
{
void *ctx = NULL;
- char *mode = HTTP_G
(etag)
.mode;
+ char *mode = HTTP_G
->etag
.mode;
-#ifdef HTTP_HAVE_
EXT_
HASH
+#ifdef HTTP_HAVE_HASH
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@
-77,9
+72,9
@@
static inline void *_http_etag_init(TSRMLS_D)
static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
{
unsigned char digest[128] = {0};
static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
{
unsigned char digest[128] = {0};
- char *etag = NULL, *mode = HTTP_G
(etag)
.mode;
+ char *etag = NULL, *mode = HTTP_G
->etag
.mode;
-#ifdef HTTP_HAVE_
EXT_
HASH
+#ifdef HTTP_HAVE_HASH
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@
-105,8
+100,8
@@
static inline char *_http_etag_finish(void *ctx 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)
{
#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)
{
- char *mode = HTTP_G
(etag)
.mode;
-#ifdef HTTP_HAVE_
EXT_
HASH
+ char *mode = HTTP_G
->etag
.mode;
+#ifdef HTTP_HAVE_HASH
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@
-116,7
+111,7
@@
static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
uint i, c = *((uint *) ctx);
for (i = 0; i < data_len; ++i) {
if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
uint i, c = *((uint *) ctx);
for (i = 0; i < data_len; ++i) {
-
c =
CRC32(c, data_ptr[i]);
+ CRC32(c, data_ptr[i]);
}
*((uint *)ctx) = c;
} else if (mode && (!strcasecmp(mode, "sha1"))) {
}
*((uint *)ctx) = c;
} else if (mode && (!strcasecmp(mode, "sha1"))) {