X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cache_api.c;h=43540b39de06a17d3bbf125e77cb51eeb7748cdd;hp=af0310e1a6fa274fa344ec125512b50292f63d8d;hb=3177ba2e5ef642f38c01568afcaa547df65f3e74;hpb=8b0cff922b0538f98364943291ce0359c3da6d88 diff --git a/http_cache_api.c b/http_cache_api.c index af0310e..43540b3 100644 --- a/http_cache_api.c +++ b/http_cache_api.c @@ -77,10 +77,10 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m case SEND_RSRC: { - if (php_stream_stat((php_stream *) data_ptr, &ssb)) { - efree(new_etag); - return NULL; - } + 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)); @@ -89,10 +89,10 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m default: { - if (php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &ssb)) { - 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)); @@ -237,7 +237,7 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, /* just do that if desired */ if (HTTP_G(etag).started) { make_digest(etag, digest); - http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL); + 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)) {