projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- move specific initialization code to the respective modules
[m6w6/ext-http]
/
php_http_cache_api.h
diff --git
a/php_http_cache_api.h
b/php_http_cache_api.h
index b8120891239810c9136b9c2e79c308f17b25e311..d7e53b77b41bc5c073ae52e6ef3c66a750919387 100644
(file)
--- a/
php_http_cache_api.h
+++ b/
php_http_cache_api.h
@@
-28,19
+28,21
@@
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
-#ifdef H
AVE_LIB
MHASH
+#ifdef H
TTP_HAVE_
MHASH
# include <mhash.h>
#endif
ZEND_EXTERN_MODULE_GLOBALS(http);
# 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,
typedef enum {
HTTP_ETAG_MD5 = -2,
HTTP_ETAG_SHA1 = -1,
- HTTP_ETAG_MHASH = 0,
} http_etag_mode;
} http_etag_mode;
-#ifdef H
AVE_LIB
MHASH
+#ifdef H
TTP_HAVE_
MHASH
static void *http_etag_alloc_mhash_digest(size_t size)
{
return emalloc(size);
static void *http_etag_alloc_mhash_digest(size_t size)
{
return emalloc(size);
@@
-78,16
+80,16
@@
static inline void *_http_etag_init(TSRMLS_D)
break;
case HTTP_ETAG_MD5:
break;
case HTTP_ETAG_MD5:
-#ifndef H
AVE_LIB
MHASH
+#ifndef H
TTP_HAVE_
MHASH
default:
#endif
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
break;
default:
#endif
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
break;
-#ifdef H
AVE_LIB
MHASH
+#ifdef H
TTP_HAVE_
MHASH
default:
if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
default:
if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
- http_error_ex(HE_ERROR, HE_RUNTIME, "Invalid ETag mode: %ld", mode);
+ http_error_ex(HE_ERROR, H
TTP_
E_RUNTIME, "Invalid ETag mode: %ld", mode);
}
break;
#endif
}
break;
#endif
@@
-112,7
+114,7
@@
static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
break;
case HTTP_ETAG_MD5:
break;
case HTTP_ETAG_MD5:
-#ifndef H
AVE_LIB
MHASH
+#ifndef H
TTP_HAVE_
MHASH
default:
#endif
PHP_MD5Final(digest, ctx);
default:
#endif
PHP_MD5Final(digest, ctx);
@@
-120,7
+122,7
@@
static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
efree(ctx);
break;
efree(ctx);
break;
-#ifdef H
AVE_LIB
MHASH
+#ifdef H
TTP_HAVE_
MHASH
default:
{
unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
default:
{
unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
@@
-140,17
+142,17
@@
static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
switch (INI_INT("http.etag_mode"))
{
case HTTP_ETAG_SHA1:
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:
break;
case HTTP_ETAG_MD5:
-#ifndef H
AVE_LIB
MHASH
+#ifndef H
TTP_HAVE_
MHASH
default:
#endif
default:
#endif
- PHP_MD5Update(ctx, data_ptr, data_len);
+ PHP_MD5Update(ctx,
(const unsigned char *)
data_ptr, data_len);
break;
break;
-#ifdef H
AVE_LIB
MHASH
+#ifdef H
TTP_HAVE_
MHASH
default:
mhash(ctx, data_ptr, data_len);
break;
default:
mhash(ctx, data_ptr, data_len);
break;