X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=43540b39de06a17d3bbf125e77cb51eeb7748cdd;hp=7d61040fc75b1e891632f77f3a0b17b4bb856ba4;hb=3177ba2e5ef642f38c01568afcaa547df65f3e74;hpb=cf9967800843ea01e77b374b4d78fad4bc18a3f6 diff --git a/http_cache_api.c b/http_cache_api.c index 7d61040..43540b3 100644 --- a/http_cache_api.c +++ b/http_cache_api.c @@ -18,23 +18,50 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include "php.h" + +#include "SAPI.h" #include "php_streams.h" +#include "php_output.h" #include "ext/standard/md5.h" #include "php_http.h" #include "php_http_std_defs.h" +#include "php_http_api.h" #include "php_http_cache_api.h" #include "php_http_send_api.h" -#include "php_http_api.h" #include "php_http_date_api.h" 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) +{ + 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); + } + } + if (free_token && cache_token) { + efree(cache_token); + } + return http_exit_ex(304, NULL, 0); +} +/* }}} */ + /* {{{ 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; @@ -49,22 +76,27 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m break; case SEND_RSRC: - if (!HTTP_G(ssb).sb.st_ino) { - if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { - return NULL; - } + { + if (php_stream_stat((php_stream *) data_ptr, &ssb)) { + efree(new_etag); + return NULL; } - snprintf(ssb_buf, 127, "%ld=%ld=%ld", - HTTP_G(ssb).sb.st_mtime, - HTTP_G(ssb).sb.st_ino, - HTTP_G(ssb).sb.st_size - ); + + 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)); + } break; default: - efree(new_etag); - return NULL; + { + if (php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &ssb)) { + efree(new_etag); + 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)); + } break; } @@ -75,33 +107,22 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m } /* }}} */ -/* {{{ time_t http_lmod(void *, http_send_mode) */ -PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC) +/* {{{ time_t http_last_modified(void *, http_send_mode) */ +PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode data_mode TSRMLS_DC) { + php_stream_statbuf ssb; + switch (data_mode) { - case SEND_DATA: - { - return time(NULL); - } - - case SEND_RSRC: - { - php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb)); - return HTTP_G(ssb).sb.st_mtime; - } - - default: - { - php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb)); - return HTTP_G(ssb).sb.st_mtime; - } + case SEND_DATA: return time(NULL); + case SEND_RSRC: return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime; + default: return php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &ssb) ? 0 : ssb.sb.st_mtime; } } /* }}} */ -/* {{{ zend_bool http_modified_match(char *, time_t) */ -PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC) +/* {{{ zend_bool http_match_last_modified(char *, time_t) */ +PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC) { zend_bool retval; zval *zmodified; @@ -119,8 +140,8 @@ PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend } /* }}} */ -/* {{{ zend_bool http_etag_match(char *, char *) */ -PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC) +/* {{{ zend_bool http_match_etag(char *, char *) */ +PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC) { zval *zetag; char *quoted_etag; @@ -149,19 +170,19 @@ PHP_HTTP_API zend_bool _http_etag_match_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) { - if (cc_len) { - http_send_cache_control(cache_control, cc_len); + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { + return FAILURE; } - if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified"); - return FAILURE; - } + if (SUCCESS != http_send_last_modified(send_modified)) { + return FAILURE; + } + + if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) { + return http_cache_exit(http_date(last_modified), 0); } - return http_send_last_modified(send_modified); + + return SUCCESS; } /* }}} */ @@ -169,36 +190,66 @@ 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) { - if (cc_len) { - http_send_cache_control(cache_control, cc_len); + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { + return FAILURE; } if (etag_len) { - http_send_etag(etag, etag_len); - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified"); - return FAILURE; - } + if (SUCCESS != http_send_etag(etag, etag_len)) { + return FAILURE; + } + if (!http_match_etag("HTTP_IF_NONE_MATCH", etag)) { + return SUCCESS; } + return http_cache_exit_ex((char *)etag, 1, 0); } /* if no etag is given and we didn't already start ob_etaghandler -- start it */ - if (!HTTP_G(etag_started)) { - if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) { - HTTP_G(etag_started) = 1; - return SUCCESS; - } else { - http_error(E_WARNING, HTTP_E_OBUFFER, "Could not start ob_etaghandler"); - return FAILURE; - } + if (HTTP_G(etag).started) { + return SUCCESS; + } + + if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) { + return SUCCESS; + } else { + return FAILURE; } - return SUCCESS; } /* }}} */ +/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */ +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) { + HTTP_G(etag).started = 1; + PHP_MD5Init(&HTTP_G(etag).md5ctx); + } + + PHP_MD5Update(&HTTP_G(etag).md5ctx, output, output_len); + + if (mode & PHP_OUTPUT_HANDLER_END) { + PHP_MD5Final(digest, &HTTP_G(etag).md5ctx); + + /* just do that if desired */ + if (HTTP_G(etag).started) { + make_digest(etag, digest); + http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); + http_send_etag(etag, 32); + + if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { + http_cache_exit_ex(etag, 1, 0); + } + } + } + + *handled_output_len = output_len; + *handled_output = estrndup(output, output_len); +} +/* }}} */ /* * Local variables: