projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix libcurls used SSL library detection
[m6w6/ext-http]
/
php_http_cache_api.h
diff --git
a/php_http_cache_api.h
b/php_http_cache_api.h
index 1a21dedfa84bd185687eb8250efc7fa1a1edc334..d26710eea5491d9f7aa0605ef7f515be0a4a2244 100644
(file)
--- a/
php_http_cache_api.h
+++ b/
php_http_cache_api.h
@@
-6,7
+6,7
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-200
5
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-200
7
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-20,22
+20,15
@@
#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
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
#define http_etag_digest(d, l) _http_etag_digest((d), (l))
static inline char *_http_etag_digest(const unsigned char *digest, int len)
{
#define http_etag_digest(d, l) _http_etag_digest((d), (l))
static inline char *_http_etag_digest(const unsigned char *digest, int len)
{
- static const char hexdigits[1
6
] = "0123456789abcdef";
+ static const char hexdigits[1
7
] = "0123456789abcdef";
int i;
char *hex = emalloc(len * 2 + 1);
char *ptr = hex;
int i;
char *hex = emalloc(len * 2 + 1);
char *ptr = hex;
@@
-53,10
+46,10
@@
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
- 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);
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
ctx = emalloc(eho->context_size);
@@
-79,10
+72,10
@@
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
- 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);
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
eho->hash_final(digest, ctx);
@@
-107,9
+100,9
@@
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
- php_hash_ops *eho = NULL;
+ char *mode = HTTP_G
->etag
.mode;
+#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);
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);
@@
-118,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"))) {