X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=c7196c1891acb0018cadadce19e1cde8bcedff5f;hp=109a568372352e4877ffbb79136a540da70a2a5b;hb=b97243b9bffae6ec360cfa7ea2dd1c7f1c3a556f;hpb=d36da8206d10ff49fd0123ab67f976ca29cb5ba9 diff --git a/http_cache_api.c b/http_cache_api.c index 109a568..c7196c1 100644 --- a/http_cache_api.c +++ b/http_cache_api.c @@ -24,6 +24,7 @@ #include "php_streams.h" #include "php_output.h" #include "ext/standard/md5.h" +#include "ext/standard/sha1.h" #include "php_http.h" #include "php_http_std_defs.h" @@ -32,78 +33,74 @@ #include "php_http_send_api.h" #include "php_http_date_api.h" +#ifdef HTTP_HAVE_MHASH +# include +#endif + ZEND_EXTERN_MODULE_GLOBALS(http); -/* {{{ STATUS http_cache_exit(char *, zend_bool) */ -STATUS _http_cache_exit_ex(char *cache_token, zend_bool etag, zend_bool free_token TSRMLS_DC) +STATUS _http_cache_global_init(INIT_FUNC_ARGS) { - if (HTTP_G(log).cache && strlen(HTTP_G(log).cache)) { - php_stream *log = php_stream_open_wrapper(HTTP_G(log).cache, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); - - if (log) { - time_t now; - struct tm nowtm; - char datetime[128]; - - time(&now); - strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm)); - php_stream_printf(log TSRMLS_CC, "%s [%s] %32s %s\n", datetime, etag ? "ETAG":"LMOD", cache_token, SG(request_info).request_uri); - php_stream_close(log); + HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5); + HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1); + +#ifdef HTTP_HAVE_MHASH + { + int l, i, c = mhash_count(); + + for (i = 0; i < c; ++i) { + char const_name[256] = {0}; + const char *hash_name = mhash_get_hash_name_static(i); + + if (hash_name) { + l = snprintf(const_name, 255, "HTTP_ETAG_MHASH_%s", hash_name); + zend_register_long_constant(const_name, l + 1, i, CONST_CS|CONST_PERSISTENT, module_number TSRMLS_CC); + } } } - if (free_token && cache_token) { - efree(cache_token); - } - return http_exit_ex(304, NULL, 0); +#endif + + return SUCCESS; } -/* }}} */ /* {{{ char *http_etag(void *, size_t, http_send_mode) */ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) { php_stream_statbuf ssb; char ssb_buf[128] = {0}; - unsigned char digest[16]; - PHP_MD5_CTX ctx; - char *new_etag = ecalloc(1, 33); - - PHP_MD5Init(&ctx); - + size_t ssb_len; + void *ctx = http_etag_init(); + switch (data_mode) { case SEND_DATA: - PHP_MD5Update(&ctx, data_ptr, data_len); + http_etag_update(ctx, data_ptr, data_len); break; case SEND_RSRC: { if (php_stream_stat((php_stream *) data_ptr, &ssb)) { - efree(new_etag); + efree(ctx); return NULL; } - - snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size); - PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); + ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size); + http_etag_update(ctx, ssb_buf, ssb_len); } break; default: { if (php_stream_stat_path((char *) data_ptr, &ssb)) { - efree(new_etag); + efree(ctx); return NULL; } - - snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size); - PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); + ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size); + http_etag_update(ctx, ssb_buf, ssb_len); } break; } - PHP_MD5Final(digest, &ctx); - make_digest(new_etag, digest); - - return new_etag; + return http_etag_finish(ctx); } /* }}} */ @@ -170,16 +167,20 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC) { + char *sent_header = NULL; + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { return FAILURE; } - if (SUCCESS != http_send_last_modified(send_modified)) { + if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) { return FAILURE; } if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) { - return http_cache_exit(http_date(last_modified), 0); + http_exit_ex(304, sent_header, NULL, 0); + } else { + STR_FREE(sent_header); } return SUCCESS; @@ -190,18 +191,22 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const char *cache_control, size_t cc_len TSRMLS_DC) { + char *sent_header = NULL; + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { return FAILURE; } if (etag_len) { - if (SUCCESS != http_send_etag(etag, etag_len)) { + if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) { return FAILURE; } - if (!http_match_etag("HTTP_IF_NONE_MATCH", etag)) { - return SUCCESS; + if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { + http_exit_ex(304, sent_header, NULL, 0); + } else { + STR_FREE(sent_header); } - return http_cache_exit_ex((char *)etag, 1, 0); + return SUCCESS; } /* if no etag is given and we didn't already start ob_etaghandler -- start it */ @@ -221,29 +226,35 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) { - char etag[33] = { 0 }; - unsigned char digest[16]; - if (mode & PHP_OUTPUT_HANDLER_START) { + if (HTTP_G(etag).started) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once"); + return; + } HTTP_G(etag).started = 1; - PHP_MD5Init(&HTTP_G(etag).md5ctx); + HTTP_G(etag).ctx = http_etag_init(); } - PHP_MD5Update(&HTTP_G(etag).md5ctx, output, output_len); + http_etag_update(HTTP_G(etag).ctx, output, output_len); if (mode & PHP_OUTPUT_HANDLER_END) { - PHP_MD5Final(digest, &HTTP_G(etag).md5ctx); - + char *etag = http_etag_finish(HTTP_G(etag).ctx); + /* just do that if desired */ if (HTTP_G(etag).started) { - make_digest(etag, digest); + char *sent_header = NULL; + http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); - http_send_etag(etag, 32); - + http_send_etag_ex(etag, strlen(etag), &sent_header); + if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { - http_cache_exit_ex(etag, 1, 0); + efree(etag); + http_exit_ex(304, sent_header, NULL, 0); + } else { + STR_FREE(sent_header); } } + efree(etag); } *handled_output_len = output_len;