X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=adba374d5c65ef90726a5e4d4f9100a07a092709;hp=1c967895ad80e35e285fd1b38719c761cca017bf;hb=c1cf3f178414800e4010735765ac8d727672584e;hpb=a47793c85f727ca292c03d4779fac3d5e8805f11 diff --git a/http_cache_api.c b/http_cache_api.c index 1c96789..adba374 100644 --- a/http_cache_api.c +++ b/http_cache_api.c @@ -1,106 +1,59 @@ /* - +----------------------------------------------------------------------+ - | 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-2006, 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 "ext/standard/sha1.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" - -#ifdef HTTP_HAVE_MHASH -# include -#endif - -ZEND_EXTERN_MODULE_GLOBALS(http); - -STATUS _http_cache_global_init(INIT_FUNC_ARGS) -{ - HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5); - HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1); - HTTP_LONG_CONSTANT("HTTP_ETAG_CRC32", HTTP_ETAG_CRC32); - -#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); - } - } - } -#endif - - return SUCCESS; -} +#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}; - size_t ssb_len; void *ctx = http_etag_init(); - switch (data_mode) - { - case SEND_DATA: - http_etag_update(ctx, data_ptr, data_len); - break; - - case SEND_RSRC: - { - if (php_stream_stat((php_stream *) data_ptr, &ssb)) { - efree(ctx); - return NULL; - } - 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); + 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(ctx); - return NULL; - } - ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size); + + if (SUCCESS != ss) { + efree(ctx); + return NULL; + } else { + size_t ssb_len; + char ssb_buf[128] = {0}; + + ssb_len = snprintf(ssb_buf, 127, "%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; } - + return http_etag_finish(ctx); } /* }}} */ @@ -110,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; } @@ -129,10 +81,11 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, HTTP_GSC(zmodified, entry, !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; } @@ -151,15 +104,14 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, 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,6 +122,10 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, { char *sent_header = NULL; + if (SG(headers_sent)) { + return FAILURE; + } + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { return FAILURE; } @@ -194,6 +150,10 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, { char *sent_header = NULL; + if (SG(headers_sent)) { + return FAILURE; + } + if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { return FAILURE; } @@ -210,20 +170,38 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, return SUCCESS; } + /* start ob_etaghandler */ + return http_start_ob_etaghandler(); +} +/* }}} */ + +PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D) +{ /* already running? */ 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; } - /* we want the etag handler to run */ - HTTP_G(etag).started = 1; - return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC); + HTTP_G->etag.started = 1; + return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC); +} + +PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D) +{ + 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; } -/* }}} */ /* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */ -PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, +void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) { /* passthru */ @@ -231,24 +209,28 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, *handled_output = estrndup(output, output_len); /* are we supposed to run? */ - if (HTTP_G(etag).started) { + if (HTTP_G->etag.started) { /* initialize the etag context */ if (mode & PHP_OUTPUT_HANDLER_START) { - HTTP_G(etag).ctx = http_etag_init(); + HTTP_G->etag.ctx = http_etag_init(); } /* update */ - http_etag_update(HTTP_G(etag).ctx, output, output_len); + 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); + 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_ex(etag, strlen(etag), &sent_header); if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { + /* force exit; ob within ob does not work */ + HTTP_G->force_exit = 1; http_exit_ex(304, sent_header, etag, 0); }