- add bool must_revalidate param to HttpResponse::setCacheControl()

[m6w6/ext-http] / php_http_cache_api.h

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 7ca8998dd1d5453aa4706e1ad7d3647ad4bfcff6..6c2121c9c787f9571aeb454317ba47b560e01b9c 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -33,7 +33,7 @@
 #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[16] = "0123456789abcdef";
+       static const char hexdigits[17] = "0123456789abcdef";
        int i;
        char *hex = emalloc(len * 2 + 1);
        char *ptr = hex;
@@ -51,7 +51,7 @@ static inline char *_http_etag_digest(const unsigned char *digest, int len)
 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;
@@ -77,7 +77,7 @@ static inline void *_http_etag_init(TSRMLS_D)
 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;
@@ -105,7 +105,7 @@ 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)
 {
-       char *mode = HTTP_G(etag).mode;
+       char *mode = HTTP_G->etag.mode;
 #ifdef HTTP_HAVE_EXT_HASH
        php_hash_ops *eho = NULL;