head 1.1; access; symbols pkgsrc-2026Q2:1.1.0.194 pkgsrc-2026Q2-base:1.1 pkgsrc-2026Q1:1.1.0.192 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.190 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.188 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.186 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.184 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.182 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.180 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.178 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.176 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.174 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.172 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.170 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.168 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.166 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.164 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.162 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.160 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.158 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.156 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.154 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.152 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.150 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.148 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.144 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.124 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.146 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.142 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.140 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.138 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.136 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.134 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.132 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.130 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.128 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.126 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.122 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.120 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.118 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.116 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.114 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.112 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.110 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.108 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.106 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.104 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.102 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.100 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.98 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.96 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.94 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.92 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.90 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.88 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.86 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.84 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.82 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.80 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.78 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.76 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.1 date 2001.04.05.14.24.40; author wiz; state Exp; branches; next ; desc @@ 1.1 log @Standardize patch file names. @ text @$NetBSD: patch-CacheCheckSize,v 1.2 1999/05/09 21:12:32 tron Exp $ *** /dev/null Tue Feb 6 11:05:04 1996 --- README-CACHE_CHECK_SIZE Tue Feb 6 13:27:32 1996 *************** *** 0 **** --- 1,11 ---- + Patch to avoid serving truncated files from the cache. + + Apply the patch, modify WWW/All//Makefile.include (for your model + system) and add '-DCACHE_CHECK_SIZE' to CFLAGS. + + With the patch, the server checks the size of a file in the cache before + returning it to the user; if the size is incorrect, the server will + refresh the file in the cache. + + -- + -- 19960205, Gertjan van Oosten, gertjan@@West.NL, West Consulting bv *** WWW/Daemon/Implementation/HTCache.c.orig Fri Aug 12 12:36:11 1994 --- Daemon/Implementation/HTCache.c Mon Feb 5 14:02:11 1996 *************** *** 382,387 **** --- 382,437 ---- } + #ifdef CACHE_CHECK_SIZE + /* + ** Check whether cache file has correct size + ** + ** On exit: + ** return YES + ** if size is good + ** return NO + ** if size is too small or too large + ** + */ + PRIVATE BOOL cache_check_size ARGS2(char *, cfn, + struct stat *, stat_info) + { + char buf[BUF_SIZE+2]; + FILE *cf; + long cl = 0, pos, size, actual; + + if (!cfn) + return NO; + + cf = fopen(cfn, "r"); + if (!cf) + return NO; + + while (fgets(buf, sizeof(buf), cf)) { + if (!buf[0] + || (buf[0] == '\n' && !buf[1]) + || (buf[0] == '\r' && buf[1] == '\n' && !buf[2])) + break; + + if (!strncasecomp(buf, "content-length:", 15)) + sscanf(buf+15, "%ld", &cl); + } + pos = ftell(cf); + fclose(cf); + + size = stat_info->st_size; + + actual = size - pos; + if (TRACE) { + fprintf(stderr,"Cache....... checking \"%s\": content-length %ld =?= %ld\n", + cfn,cl,actual); + } + + return (cl == actual ? YES : NO); + } + #endif /* CACHE_CHECK_SIZE */ + + PRIVATE BOOL do_caching ARGS1(char *, url) { HTList * cur = cc.no_caching; *************** *** 460,465 **** --- 510,518 ---- time_t *, expires) { struct stat stat_info; + #ifdef CACHE_CHECK_SIZE + BOOL size_ok; + #endif if (!url || !cfn || !cf || !if_ms) return CACHE_NO; *cfn = NULL; *************** *** 497,503 **** --- 550,563 ---- } success = HTCacheInfo_for(*cfn, &ld, &lc, &ex, &mu, &lm); + #ifdef CACHE_CHECK_SIZE + /* Check whether file in cache has correct size */ + size_ok = cache_check_size(*cfn, &stat_info); + #endif if (!success /* no entry */ + #ifdef CACHE_CHECK_SIZE + || !size_ok /* wrong size */ + #endif || ex - cc.cache_time_margin <= cur_time /* expired */ || cur_time - lc >= refresh_interval /* time to refresh */ || in.no_cache_pragma) { /* override cache */ *************** *** 507,512 **** --- 567,576 ---- if (TRACE) { if (!success) fprintf(stderr, "NoEntry..... %s -- expiring\n",*cfn); + #ifdef CACHE_CHECK_SIZE + else if (!size_ok) + fprintf(stderr, "Truncated...... %s -- refresh\n",*cfn); + #endif else if (in.no_cache_pragma) fprintf(stderr, "Forced...... refresh of %s\n",*cfn); else if (ex - cc.cache_time_margin <= cur_time) *************** *** 527,533 **** --- 591,601 ---- if (cc.cache_no_connect) { CTRACE(stderr, "Standalone.. caching mode but expired\n"); cache_hit = YES; + #ifdef CACHE_CHECK_SIZE + return size_ok ? CACHE_IF_MODIFIED : CACHE_CREATE; + #else return CACHE_IF_MODIFIED; + #endif } if (!(*cf = do_lock(*cfn))) { *************** *** 550,556 **** --- 618,628 ---- CTRACE(stderr,"IfModSince.. time: %s", ctime(if_ms)); free(backup); + #ifdef CACHE_CHECK_SIZE + return size_ok ? CACHE_IF_MODIFIED : CACHE_CREATE; + #else return CACHE_IF_MODIFIED; + #endif } else { CTRACE(stderr, "Cache....... not expired %s\n", *cfn); @