X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=b6bc23714bd292882716ae66692118290b66095e;hp=109a568372352e4877ffbb79136a540da70a2a5b;hb=refs%2Fheads%2Fv1.7.x;hpb=d36da8206d10ff49fd0123ab67f976ca29cb5ba9 diff --git a/http_cache_api.c b/http_cache_api.c index 109a568..b6bc237 100644 --- a/http_cache_api.c +++ b/http_cache_api.c @@ -1,109 +1,60 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2010, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" +#define HTTP_WANT_SAPI +#include "php_http.h" -#include "SAPI.h" -#include "php_streams.h" #include "php_output.h" -#include "ext/standard/md5.h" +#include "php_streams.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_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); -} -/* }}} */ +#include "php_http_send_api.h" /* {{{ 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); - - switch (data_mode) - { - case SEND_DATA: - PHP_MD5Update(&ctx, data_ptr, data_len); - break; - - case SEND_RSRC: - { - if (php_stream_stat((php_stream *) 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)); + void *ctx = http_etag_init(); + + if (data_mode == SEND_DATA) { + http_etag_update(ctx, data_ptr, data_len); + } else { + STATUS ss = FAILURE; + php_stream_statbuf ssb; + + if (data_mode == SEND_RSRC) { + ss = php_stream_stat((php_stream *) data_ptr, &ssb); + } else { + ss = php_stream_stat_path((char *) data_ptr, &ssb); } - break; - - default: - { - if (php_stream_stat_path((char *) 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)); + + if (SUCCESS != ss) { + efree(ctx); + return NULL; + } else { + size_t ssb_len; + char ssb_buf[128]; + + ssb_len = snprintf(ssb_buf, sizeof(ssb_buf), "%ld=%ld=%ld", (long) ssb.sb.st_mtime, + (long) ssb.sb.st_ino, + (long) 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); } /* }}} */ @@ -112,9 +63,8 @@ PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode dat { php_stream_statbuf ssb; - switch (data_mode) - { - case SEND_DATA: return time(NULL); + switch (data_mode) { + case SEND_DATA: return HTTP_G->request.time; case SEND_RSRC: return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime; default: return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime; } @@ -128,13 +78,16 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zval *zmodified; char *modified, *chr_ptr; - HTTP_GSC(zmodified, entry, !enforce_presence); + if (!(zmodified = http_get_server_var(entry, 1))) { + return !enforce_presence; + } modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified)); - if (chr_ptr = strrchr(modified, ';')) { + if ((chr_ptr = strrchr(modified, ';'))) { chr_ptr = 0; } - retval = (t <= http_parse_date(modified)); + + retval = (t <= http_parse_date_ex(modified, 1)); efree(modified); return retval; } @@ -147,21 +100,22 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, char *quoted_etag; zend_bool result; - HTTP_GSC(zetag, entry, !enforce_presence); + if (!(zetag = http_get_server_var_ex(entry, strlen(entry)+1, 1))) { + return !enforce_presence; + } if (NULL != strchr(Z_STRVAL_P(zetag), '*')) { return 1; } - quoted_etag = (char *) emalloc(strlen(etag) + 3); - sprintf(quoted_etag, "\"%s\"", etag); - + spprintf("ed_etag, 0, "\"%s\"", etag); if (!strchr(Z_STRVAL_P(zetag), ',')) { result = !strcmp(Z_STRVAL_P(zetag), quoted_etag); } else { result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag)); } efree(quoted_etag); + return result; } /* }}} */ @@ -170,16 +124,24 @@ 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 (SG(headers_sent)) { + return FAILURE; + } + 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,64 +152,107 @@ 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 (SG(headers_sent)) { + return FAILURE; + } + 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); - } - - /* if no etag is given and we didn't already start ob_etaghandler -- start it */ - if (HTTP_G(etag).started) { return SUCCESS; } + + /* start ob_etaghandler */ + return http_start_ob_etaghandler(); +} +/* }}} */ - if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) { - return SUCCESS; - } else { +PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D) +{ + /* already running? */ +#ifdef PHP_OUTPUT_NEWAPI + STATUS rv; + + if (php_output_handler_conflict(ZEND_STRL("ob_etaghandler"), ZEND_STRL("ob_etaghandler") TSRMLS_CC)) { + return FAILURE; + } +#else + if (php_ob_handler_used("ob_etaghandler" TSRMLS_CC)) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once"); return FAILURE; } +#endif + HTTP_G->etag.started = 1; +#ifdef PHP_OUTPUT_NEWAPI + return php_output_start_internal(ZEND_STRL("ob_etaghandler"), _http_ob_etaghandler, HTTP_G->send.buffer_size, 0 TSRMLS_CC); +#else + return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC); +#endif } -/* }}} */ -/* {{{ 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) +PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D) { - 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); + if (HTTP_G->etag.started) { + HTTP_G->etag.started = 0; + if (HTTP_G->etag.ctx) { + efree(HTTP_G->etag.ctx); + HTTP_G->etag.ctx = NULL; + } + return 1; } + return 0; +} - 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); +/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */ +void _http_ob_etaghandler(char *output, uint output_len, + char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) +{ + /* passthru */ + *handled_output_len = output_len; + *handled_output = estrndup(output, output_len); + + /* are we supposed to run? */ + if (HTTP_G->etag.started) { + /* initialize the etag context */ + if (mode & PHP_OUTPUT_HANDLER_START) { + HTTP_G->etag.ctx = http_etag_init(); + } + + /* update */ + http_etag_update(HTTP_G->etag.ctx, output, output_len); + + /* finish */ + if (mode & PHP_OUTPUT_HANDLER_END) { + char *sent_header = NULL; + char *etag = http_etag_finish(HTTP_G->etag.ctx); + + HTTP_G->etag.ctx = 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); + /* force exit; ob within ob does not work */ + HTTP_G->force_exit = 1; + http_exit_ex(304, sent_header, etag, 0); } + + STR_FREE(sent_header); + STR_FREE(etag); } } - - *handled_output_len = output_len; - *handled_output = estrndup(output, output_len); } /* }}} */