#ifndef PHP_HTTP_CACHE_API_H
#define PHP_HTTP_CACHE_API_H
+#include "zend_ini.h"
+
+#include "ext/standard/md5.h"
+#include "ext/standard/sha1.h"
+#include "ext/standard/crc32.h"
+
#include "php_http_std_defs.h"
#include "php_http.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
-#include "zend_ini.h"
-
-#ifdef HAVE_LIBMHASH
+#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 {
+ HTTP_ETAG_CRC32 = -3,
HTTP_ETAG_MD5 = -2,
HTTP_ETAG_SHA1 = -1,
- HTTP_ETAG_MHASH = 0,
} http_etag_mode;
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
static void *http_etag_alloc_mhash_digest(size_t size)
{
return emalloc(size);
#define http_etag_init() _http_etag_init(TSRMLS_C)
static inline void *_http_etag_init(TSRMLS_D)
{
- void *ctx;
- long mode = INI_INT("http.etag_mode");
+ void *ctx = NULL;
+ long mode = HTTP_G(etag).mode;
switch (mode)
{
+ case HTTP_ETAG_CRC32:
+ ctx = emalloc(sizeof(unsigned int));
+ *((unsigned int *) ctx) = ~0;
+ break;
+
case HTTP_ETAG_SHA1:
PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
break;
case HTTP_ETAG_MD5:
-invalid_flag:
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
break;
+#ifdef HTTP_HAVE_MHASH
default:
- {
-#ifdef HAVE_LIBMHASH
- if ((mode >= 0) && (mode <= mhash_count())) {
- ctx = mhash_init(mode);
+ if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
+ http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
}
- if ((!ctx) || (ctx == MHASH_FAILED))
-#endif
- {
- HTTP_G(etag).mode = HTTP_ETAG_MD5;
- goto invalid_flag;
- }
- }
break;
+#endif
}
return ctx;
}
+#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)
+ {
+ 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;
+ }
+ break;
+
+ case HTTP_ETAG_MD5:
+#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;
+
+#ifdef HTTP_HAVE_MHASH
+ default:
+ /* mhash gets already freed in http_etag_finish() */
+ if (*((MHASH *) ctx_ptr)) {
+ mhash_deinit(*((MHASH *) ctx_ptr), NULL);
+ *((MHASH *) ctx_ptr) = NULL;
+ }
+ break;
+#endif
+ }
+}
+
#define http_etag_finish(c) _http_etag_finish((c) TSRMLS_CC)
-static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
+static inline char *_http_etag_finish(void **ctx_ptr TSRMLS_DC)
{
char *etag = NULL;
unsigned char digest[20];
- long mode = INI_INT("http.etag_mode");
+ 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, ctx);
+ PHP_SHA1Final(digest, *((PHP_SHA1_CTX **) ctx_ptr));
etag = http_etag_digest(digest, 20);
- efree(ctx);
break;
case HTTP_ETAG_MD5:
- PHP_MD5Final(digest, ctx);
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
+ PHP_MD5Final(digest, *((PHP_MD5_CTX **) ctx_ptr));
etag = http_etag_digest(digest, 16);
- efree(ctx);
break;
+#ifdef HTTP_HAVE_MHASH
default:
{
-#ifdef HAVE_LIBMHASH
- unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
+ unsigned char *mhash_digest = mhash_end_m(*((MHASH *) ctx_ptr), http_etag_alloc_mhash_digest);
etag = http_etag_digest(mhash_digest, mhash_get_block_size(mode));
efree(mhash_digest);
-#endif
+ /* avoid double free */
+ *((MHASH *) ctx_ptr) = NULL;
}
break;
+#endif
}
+ http_etag_free(ctx_ptr);
+
return etag;
}
{
switch (INI_INT("http.etag_mode"))
{
+ case HTTP_ETAG_CRC32:
+ {
+ unsigned int i, c = *((unsigned int *) ctx);
+
+ for (i = 0; i < data_len; ++i) {
+ c = CRC32(c, data_ptr[i]);
+ }
+ *((unsigned int *)ctx) = c;
+ }
+ break;
+
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:
- PHP_MD5Update(ctx, data_ptr, data_len);
+#ifndef HTTP_HAVE_MHASH
+ default:
+#endif
+ PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
break;
+#ifdef HTTP_HAVE_MHASH
default:
-#ifdef HAVE_LIBMHASH
mhash(ctx, data_ptr, data_len);
-#endif
break;
+#endif
}
}
+#define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC)
+extern void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC);
+
#define http_etag(p, l, m) _http_etag((p), (l), (m) TSRMLS_CC)
PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC);
#define http_cache_etag(e, el, cc, ccl) _http_cache_etag((e), (el), (cc), (ccl) TSRMLS_CC)
PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const char *cache_control, size_t cc_len TSRMLS_DC);
-#define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC)
-PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC);
+#define http_start_ob_etaghandler() _http_start_ob_etaghandler(TSRMLS_C)
+PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D);
+#define http_interrupt_ob_etaghandler() _http_interrupt_ob_etaghandler(TSRMLS_C)
+PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D);
#endif
projects / m6w6 / ext-http / blobdiff