Add libFuzzer harnesses for the HTTP header and cache-index parsers (#508)

P3-5 fuzz Tier-2. Two more harnesses over hostile-input parsers that read
structured bytes into fixed buffers: fuzz-header drives treatfirstline plus
treathead on each response-header line (the Content-Type/-Encoding path hardened
in #506, and the cookie/Location/Content-Range fields); fuzz-cachendx drives the
hts-cache/*.ndx length-prefixed scan that cache_readex_new loads on --update.

fuzz-cachendx found the over-advance fixed in the parent commit; its seed corpus
carries the two crash reproducers as replay regressions. The cache harness stops
at the scan rather than the trailing coucal insert, whose murmur hash trips a
separate pointer-overflow the .ndx parser does not own.

Signed-off-by: Xavier Roche <roche@httrack.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

.github/workflows/codeql.yml

@@ -43,12 +43,6 @@ jobs:
           languages: c-cpp
           build-mode: manual
           queries: security-extended
-          # fopen's umask-controlled 0666 is intended for mirror/cache/log
-          # output; the one credential file (cookies.txt) is kept 0600 on Unix.
-          config: |
-            query-filters:
-              - exclude:
-                  id: cpp/world-writable-file-creation
 
       # Manual build: CodeQL traces the compiler, so build exactly what ships.
       - name: Build

fuzz/Makefile.am

@@ -36,7 +36,6 @@ EXTRA_DIST = README.md run-fuzzers.sh \
 	corpus/unescape/percent.txt \
 	corpus/filters/filter.bin corpus/filters/filter-size.bin \
 	corpus/filters/regress-empty-subject-unique.bin \
-	corpus/filters/redos-star-classes.bin \
 	corpus/url/http-url.txt corpus/url/relative-path.txt \
 	corpus/url/regress-file-empty-path.txt corpus/url/regress-long-path-abort.txt \
 	corpus/header/full-response.txt corpus/header/redirect.txt \

fuzz/fuzz-cachendx.c

@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 2026 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -27,7 +27,7 @@ Please visit our Website: http://www.httrack.com
 
 /* Fuzz the cache-index (.ndx) parser: a corrupt or truncated index must not
    walk the length-prefixed cache_brstr/cache_binput scan past the buffer.
-   Mirrors the -#C cache-listing scan (htscoremain.c). */
+   Mirrors the loader in cache_readex_new (htscache.c). */
 #include "fuzz.h"
 #include "htscache.h"
 #include "htslib.h"
@@ -42,8 +42,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   a += cache_brstr(a, firstline, sizeof(firstline));
   a += cache_brstr(a, firstline, sizeof(firstline));
 
-  /* body: newline-delimited host/file/position triples; the length-prefixed
-     scan must stay inside the buffer */
+  /* body: newline-delimited host/file/position triples. The coucal insert
+     the real loader ends with is a separate library's concern; this harness
+     targets the length-prefixed scan that must stay inside the buffer. */
   while (a != NULL && a < end) {
     char BIGSTK line[HTS_URLMAXSIZE * 2];
     char linepos[256];

fuzz/fuzz-header.c

@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 2026 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -50,13 +50,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   while (p != NULL && *p != '\0') {
     char *nl = strchr(p, '\n');
     size_t n = (nl != NULL) ? (size_t) (nl - p) : strlen(p);
-    size_t i, len = 0;
 
-    /* binput drops every '\r' on the wire; mirror it */
-    for (i = 0; i < n; i++)
-      if (p[i] != '\r')
-        line[len++] = p[i];
-    line[len] = '\0';
+    memcpy(line, p, n);
+    line[n] = '\0';
     if (first) {
       treatfirstline(&r, line);
       first = 0;

fuzz/run-fuzzers.sh

@@ -2,8 +2,8 @@
 # Drive every built harness against its seed corpus.
 #   run-fuzzers.sh <build-fuzz-dir> check       deterministic replay (CI smoke)
 #   run-fuzzers.sh <build-fuzz-dir> [seconds]   timed mutation run (discovery)
-# Replay is crash/leak-only and never mutates; the per-unit -timeout guards
-# both modes against pathological slowdowns (e.g. pre-#501 strjoker).
+# Replay is crash/leak-only and never mutates, so it can't hit strjoker's
+# catastrophic backtracking; the timed mode can, hence the per-unit -timeout.
 set -euo pipefail
 
 srcdir=$(cd "$(dirname "$0")" && pwd)

src/htsback.c

@@ -1646,104 +1646,138 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
       }
     }
     // tester cache
-    if ((strcmp(adr, "file://")) /* pas fichier */
-        && ((!test) ||
-            (cache->type == 1)) /* cache prioritaire, laisser passer en test! */
-        &&
-        ((strnotempty(save)) || (strcmp(fil, "/robots.txt") ==
-                                 0))) { // si en test on ne doit pas utiliser le
-                                        // cache sinon telescopage avec le 302..
+    if ((strcmp(adr, "file://"))        /* pas fichier */
+        &&((!test) || (cache->type == 1))       /* cache prioritaire, laisser passer en test! */
+        &&((strnotempty(save)) || (strcmp(fil, "/robots.txt") == 0))) { // si en test on ne doit pas utiliser le cache sinon telescopage avec le 302..
+#if HTS_FAST_CACHE
       intptr_t hash_pos;
       int hash_pos_return = 0;
-
+#else
+      char *a = NULL;
+#endif
+#if HTS_FAST_CACHE
       if (cache->hashtable) {
+#else
+      if (cache->use) {
+#endif
         char BIGSTK buff[HTS_URLMAXSIZE * 4];
 
+#if HTS_FAST_CACHE
         strcpybuff(buff, adr);
         strcatbuff(buff, fil);
         hash_pos_return = coucal_read(cache->hashtable, buff, &hash_pos);
+#else
+        buff[0] = '\0';
+        strcatbuff(buff, "\n");
+        strcatbuff(buff, adr);
+        strcatbuff(buff, "\n");
+        strcatbuff(buff, fil);
+        strcatbuff(buff, "\n");
+        a = strstr(cache->use, buff);
+#endif
 
+        // Ok, noté en cache->. mais bien présent dans le cache ou sur disque?
+#if HTS_FAST_CACHE
         // negative values when data is not in cache
         if (hash_pos_return < 0) {
-          if (!test) { // not test mode
-            /* note: no check with IS_DELAYED_EXT() enabled - postcheck by
-             * client please! */
-            if (save[0] != '\0' && !IS_DELAYED_EXT(save) &&
-                fsize_utf8(fconv(catbuff, sizeof(catbuff), save)) <=
-                    0) { // final file missing or empty
-              int found = 0;
+#else
+        if (a) {
+#endif
+          if (!test) {          // non mode test
+#if HTS_FAST_CACHE==0
+            int pos = -1;
 
-              /* It is possible that the file has been moved due to changes in
-               * build structure */
-              {
-                char BIGSTK previous_save[HTS_URLMAXSIZE * 2];
-                htsblk r;
+            a += strlen(buff);
+            sscanf(a, "%d", &pos);      // lire position
+#endif
 
-                previous_save[0] = '\0';
-                r = cache_readex(opt, cache, adr, fil, /*head */ NULL,
+#if HTS_FAST_CACHE==0
+            if (pos < 0) {      // pas de mise en cache data, vérifier existence
+#endif
+              /* note: no check with IS_DELAYED_EXT() enabled - postcheck by client please! */
+              if (save[0] != '\0' && !IS_DELAYED_EXT(save) && fsize_utf8(fconv(catbuff, sizeof(catbuff), save)) <= 0) {  // fichier final n'existe pas ou est vide!
+                int found = 0;
+
+                /* It is possible that the file has been moved due to changes in build structure */
+                {
+                  char BIGSTK previous_save[HTS_URLMAXSIZE * 2];
+                  htsblk r;
+
+                  previous_save[0] = '\0';
+                  r =
+                    cache_readex(opt, cache, adr, fil, /*head */ NULL,
                                  /*bound to back[p] (temporary) */
                                  back[p].location_buffer, previous_save, /*ro */
                                  1);
-                /* Is supposed to be on disk only */
-                if (r.is_write && previous_save[0] != '\0') {
-                  /* Exists, but with another (old) filename: rename (almost)
-                   * silently */
-                  if (strcmp(previous_save, save) != 0 &&
-                      fexist_utf8(
-                          fconv(catbuff, sizeof(catbuff), previous_save))) {
-                    rename(fconv(catbuff, sizeof(catbuff), previous_save),
-                           fconv(catbuff2, sizeof(catbuff2), save));
-                    if (fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) {
-                      found = 1;
-                      hts_log_print(opt, LOG_DEBUG,
-                                    "File '%s' has been renamed since last "
-                                    "mirror to '%s' ; applying changes",
-                                    previous_save, save);
-                    } else {
-                      hts_log_print(opt, LOG_ERROR,
-                                    "Could not rename '%s' to '%s' ; will have "
-                                    "to retransfer it",
-                                    previous_save, save);
+                  /* Is supposed to be on disk only */
+                  if (r.is_write && previous_save[0] != '\0') {
+                    /* Exists, but with another (old) filename: rename (almost) silently */
+                    if (strcmp(previous_save, save) != 0
+                        && fexist_utf8(fconv(catbuff, sizeof(catbuff), previous_save))) {
+                      rename(fconv(catbuff, sizeof(catbuff), previous_save),
+                             fconv(catbuff2, sizeof(catbuff2), save));
+                      if (fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) {
+                        found = 1;
+                        hts_log_print(opt, LOG_DEBUG,
+                                      "File '%s' has been renamed since last mirror to '%s' ; applying changes",
+                                      previous_save, save);
+                      } else {
+                        hts_log_print(opt, LOG_ERROR,
+                                      "Could not rename '%s' to '%s' ; will have to retransfer it",
+                                      previous_save, save);
+                      }
                     }
                   }
+                  back[p].location_buffer[0] = '\0';
                 }
-                back[p].location_buffer[0] = '\0';
-              }
 
-              /* Not found ? */
-              if (!found) {
-                // invalidate: gone from disk, force a refetch
-                hash_pos_return = 0;
-                if (opt->norecatch) {
-                  if (!fexist_utf8(fconv(
-                          catbuff, sizeof(catbuff),
-                          save))) { // declared but missing: user erased it
-                    FILE *fp =
-                        FOPEN(fconv(catbuff, sizeof(catbuff), save), "wb");
+                /* Not found ? */
+                if (!found) {
+#if HTS_FAST_CACHE
+                  hash_pos_return = 0;
+#else
+                  a = NULL;
+#endif
+                  // dévalider car non présent sur disque dans structure originale!!!
+                  // sinon, le fichier est ok à priori, mais on renverra un if-modified-since pour
+                  // en être sûr
+                  if (opt->norecatch) { // tester norecatch
+                    if (!fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) {   // fichier existe pas mais déclaré: on l'a effacé
+                      FILE *fp = FOPEN(fconv(catbuff, sizeof(catbuff), save), "wb");
 
-                    if (fp)
-                      fclose(fp);
+                      if (fp)
+                        fclose(fp);
+                      hts_log_print(opt, LOG_WARNING,
+                                    "Previous file '%s' not found (erased by user ?), ignoring: %s%s",
+                                    save, back[p].url_adr, back[p].url_fil);
+                    }
+                  } else {
                     hts_log_print(opt, LOG_WARNING,
-                                  "Previous file '%s' not found (erased by "
-                                  "user ?), ignoring: %s%s",
+                                  "Previous file '%s' not found (erased by user ?), recatching: %s%s",
                                   save, back[p].url_adr, back[p].url_fil);
                   }
-                } else {
-                  hts_log_print(opt, LOG_WARNING,
-                                "Previous file '%s' not found (erased by user "
-                                "?), recatching: %s%s",
-                                save, back[p].url_adr, back[p].url_fil);
                 }
-              }
-            } // fsize() <= 0
+              }                 // fsize() <= 0
+#if HTS_FAST_CACHE==0
+            }
+#endif
           }
         }
         //
       } else {
+#if HTS_FAST_CACHE
         hash_pos_return = 0;
+#else
+        a = NULL;
+#endif
       }
 
-      if (hash_pos_return) { // in cache, with data
+      // Existe pas en cache, ou bien pas de cache présent
+#if HTS_FAST_CACHE
+      if (hash_pos_return) {    // OK existe en cache (et données aussi)!
+#else
+      if (a != NULL) {          // OK existe en cache (et données aussi)!
+#endif
         const int cache_is_prioritary = cache->type == 1
           || opt->state.stop != 0;
         if (cache_is_prioritary) {      // cache prioritaire (pas de test if-modified..)
@@ -1864,8 +1898,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
 #endif
         }
       }
-      /* Not in cache ; maybe in temporary cache ? Warning: non-movable
-         "url_sav" */
+      /* Not in cache ; maybe in temporary cache ? Warning: non-movable "url_sav" */
       else if (back_unserialize_ref(opt, adr, fil, &itemback) == 0) {
         const off_t file_size = fsize_utf8(itemback->url_sav);
 

src/htsbauth.c

@@ -307,25 +307,14 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
   return -1;
 }
 
-/* Write cookies.txt; returns 0 on success. The jar holds live session
-   cookies, so keep it owner-only on Unix (Windows inherits folder ACLs). */
+// écrire cookies.txt
+// !=0 : erreur
 int cookie_save(t_cookie * cookie, const char *name) {
   char catbuff[CATBUFF_SIZE];
 
   if (strnotempty(cookie->data)) {
     char BIGSTK line[8192];
-#ifdef _WIN32
     FILE *fp = fopen(fconv(catbuff, sizeof(catbuff), name), "wb");
-#else
-    const int fd = open(fconv(catbuff, sizeof(catbuff), name),
-                        O_WRONLY | O_CREAT | O_TRUNC, HTS_PROTECT_FILE);
-    FILE *fp = fd != -1 ? fdopen(fd, "wb") : NULL;
-
-    if (fd != -1 && fp == NULL)
-      close(fd);    /* fdopen failed: don't leak the descriptor */
-    if (fp != NULL) /* O_CREAT's mode skips pre-existing jars: tighten those */
-      (void) fchmod(fd, HTS_PROTECT_FILE);
-#endif
 
     if (fp) {
       char *a = cookie->data;

src/htscache.h

@@ -89,6 +89,11 @@ typedef enum {
    the involved files are absent. */
 void hts_cache_reconcile(httrackp *opt, hts_cache_reconcile_mode mode);
 
+int cache_writedata(FILE * cache_ndx, FILE * cache_dat, const char *str1,
+                    const char *str2, char *outbuff, int len);
+int cache_readdata(cache_back * cache, const char *str1, const char *str2,
+                   char **inbuff, int *len);
+
 void cache_rstr(FILE *fp, char *s, size_t s_size);
 char *cache_rstr_addr(FILE * fp);
 int cache_brstr(char *adr, char *s, size_t s_size);

src/htscache_selftest.c

@@ -78,6 +78,14 @@ static void selftest_open_for_read(cache_back *cache, httrackp *opt) {
 }
 
 static void selftest_close(cache_back *cache) {
+  if (cache->dat != NULL) {
+    fclose(cache->dat);
+    cache->dat = NULL;
+  }
+  if (cache->ndx != NULL) {
+    fclose(cache->ndx);
+    cache->ndx = NULL;
+  }
   if (cache->zipOutput != NULL) {
     zipClose(cache->zipOutput,
              "Created by HTTrack Website Copier (cache self-test)");
@@ -981,15 +989,26 @@ int cache_reconcile_selftest(httrackp *opt, const char *dir) {
   failures +=
       reconcile_expect(opt, "hts-cache/old.zip", SOLID, "promote-zip-noop");
 
-  /* PROMOTE: the removed pre-3.31 legacy pair is left alone */
+  /* PROMOTE: a pure-legacy old generation is promoted too (was dead when no
+     zip cache existed) */
   reconcile_wipe(opt);
   reconcile_put(opt, "hts-cache/old.dat", SOLID);
   reconcile_put(opt, "hts-cache/old.ndx", TINY);
   hts_cache_reconcile(opt, CACHE_RECONCILE_PROMOTE);
-  failures += reconcile_expect(opt, "hts-cache/new.dat", -1, "promote-dat");
-  failures += reconcile_expect(opt, "hts-cache/new.ndx", -1, "promote-dat");
-  failures += reconcile_expect(opt, "hts-cache/old.dat", SOLID, "promote-dat");
-  failures += reconcile_expect(opt, "hts-cache/old.ndx", TINY, "promote-dat");
+  failures += reconcile_expect(opt, "hts-cache/new.dat", SOLID, "promote-dat");
+  failures += reconcile_expect(opt, "hts-cache/new.ndx", TINY, "promote-dat");
+  failures += reconcile_expect(opt, "hts-cache/old.dat", -1, "promote-dat");
+
+  /* PROMOTE: a half-written legacy new pair is replaced by the old pair */
+  reconcile_wipe(opt);
+  reconcile_put(opt, "hts-cache/new.dat", TINY);
+  reconcile_put(opt, "hts-cache/old.dat", SOLID);
+  reconcile_put(opt, "hts-cache/old.ndx", TINY);
+  hts_cache_reconcile(opt, CACHE_RECONCILE_PROMOTE);
+  failures +=
+      reconcile_expect(opt, "hts-cache/new.dat", SOLID, "promote-dat-partial");
+  failures +=
+      reconcile_expect(opt, "hts-cache/new.ndx", TINY, "promote-dat-partial");
 
   /* INTERRUPTED: no lock file, no action */
   reconcile_wipe(opt);
@@ -1039,7 +1058,7 @@ int cache_reconcile_selftest(httrackp *opt, const char *dir) {
   failures +=
       reconcile_expect(opt, "hts-cache/new.zip", MID, "interrupted-bignew");
 
-  /* INTERRUPTED: the removed pre-3.31 legacy pair is left alone */
+  /* INTERRUPTED: the legacy pair follows the same size rule (was dead code) */
   reconcile_wipe(opt);
   reconcile_put(opt, "hts-in_progress.lock", 0);
   reconcile_put(opt, "hts-cache/new.dat", TINY);
@@ -1048,13 +1067,9 @@ int cache_reconcile_selftest(httrackp *opt, const char *dir) {
   reconcile_put(opt, "hts-cache/old.ndx", MID);
   hts_cache_reconcile(opt, CACHE_RECONCILE_INTERRUPTED);
   failures +=
-      reconcile_expect(opt, "hts-cache/new.dat", TINY, "interrupted-dat");
+      reconcile_expect(opt, "hts-cache/new.dat", SOLID, "interrupted-dat");
   failures +=
-      reconcile_expect(opt, "hts-cache/new.ndx", TINY, "interrupted-dat");
-  failures +=
-      reconcile_expect(opt, "hts-cache/old.dat", SOLID, "interrupted-dat");
-  failures +=
-      reconcile_expect(opt, "hts-cache/old.ndx", MID, "interrupted-dat");
+      reconcile_expect(opt, "hts-cache/new.ndx", MID, "interrupted-dat");
 
   /* ROLLBACK: the old zip generation is restored (a zip cache used to lose
      its only good generation here) */
@@ -1074,18 +1089,17 @@ int cache_reconcile_selftest(httrackp *opt, const char *dir) {
   failures += reconcile_expect(opt, "hts-cache/new.lst", MID, "rollback-lst");
   failures += reconcile_expect(opt, "hts-cache/new.txt", MID, "rollback-txt");
 
-  /* ROLLBACK: sidecars restored, the removed pre-3.31 pair left alone */
+  /* ROLLBACK: full legacy generation incl. sidecars (historical behavior) */
   reconcile_wipe(opt);
   reconcile_put(opt, "hts-cache/new.dat", TINY);
+  reconcile_put(opt, "hts-cache/new.ndx", TINY);
   reconcile_put(opt, "hts-cache/old.dat", SOLID);
   reconcile_put(opt, "hts-cache/old.ndx", MID);
   reconcile_put(opt, "hts-cache/old.lst", MID);
   reconcile_put(opt, "hts-cache/old.txt", MID);
   hts_cache_reconcile(opt, CACHE_RECONCILE_ROLLBACK);
-  failures += reconcile_expect(opt, "hts-cache/new.dat", TINY, "rollback-dat");
-  failures += reconcile_expect(opt, "hts-cache/new.ndx", -1, "rollback-dat");
-  failures += reconcile_expect(opt, "hts-cache/old.dat", SOLID, "rollback-dat");
-  failures += reconcile_expect(opt, "hts-cache/old.ndx", MID, "rollback-dat");
+  failures += reconcile_expect(opt, "hts-cache/new.dat", SOLID, "rollback-dat");
+  failures += reconcile_expect(opt, "hts-cache/new.ndx", MID, "rollback-dat");
   failures += reconcile_expect(opt, "hts-cache/new.lst", MID, "rollback-dat");
   failures += reconcile_expect(opt, "hts-cache/new.txt", MID, "rollback-dat");
 
@@ -1099,101 +1113,6 @@ int cache_reconcile_selftest(httrackp *opt, const char *dir) {
   return failures;
 }
 
-/* The pre-3.31 .dat/.ndx import was removed: cache_init must refuse the
-   legacy pair, leave the files in place, and not flag an update run. */
-int cache_legacy_refused_selftest(httrackp *opt, const char *dir) {
-  int failures = 0;
-  int variant;
-
-  selftest_tag = "cache-legacy";
-  golden_setup(opt, dir);
-#ifdef _WIN32
-  mkdir(reconcile_st_path(opt, "hts-cache"));
-#else
-  mkdir(reconcile_st_path(opt, "hts-cache"), HTS_PROTECT_FOLDER);
-#endif
-
-  /* variant 0: old.dat/old.ndx (--update layout); 1: new.dat/new.ndx (ro) */
-  for (variant = 0; variant < 2; variant++) {
-    cache_back cache;
-    const char *const dat =
-        variant == 0 ? "hts-cache/old.dat" : "hts-cache/new.dat";
-    const char *const ndx =
-        variant == 0 ? "hts-cache/old.ndx" : "hts-cache/new.ndx";
-
-    reconcile_wipe(opt);
-    reconcile_put(opt, dat, 4096);
-    reconcile_put(opt, ndx, 4096);
-    opt->is_update = 0;
-    selftest_open(&cache, opt, /*ro*/ variant == 1);
-    if (cache_readable(&cache)) {
-      printf("cache-legacy: variant %d imported a removed format\n", variant);
-      failures++;
-    }
-    if (coucal_nitems(cache.hashtable) != 0) { /* no phantom index entries */
-      printf("cache-legacy: variant %d imported index entries\n", variant);
-      failures++;
-    }
-    if (opt->is_update) {
-      printf("cache-legacy: variant %d flagged an update\n", variant);
-      failures++;
-    }
-    if (fsize(reconcile_st_path(opt, dat)) != 4096 ||
-        fsize(reconcile_st_path(opt, ndx)) != 4096) {
-      printf("cache-legacy: variant %d touched the legacy files\n", variant);
-      failures++;
-    }
-    if (cache.lst != NULL) {
-      fclose(cache.lst);
-      cache.lst = NULL;
-    }
-    if (cache.txt != NULL) {
-      fclose(cache.txt);
-      cache.txt = NULL;
-    }
-    selftest_close(&cache);
-  }
-
-  /* a healthy zip must win over stray legacy files, with no refusal */
-  {
-    cache_back cache;
-    const char *const body = "<html>zip wins</html>";
-
-    reconcile_wipe(opt);
-    selftest_open_for_write(&cache, opt);
-    store_entry(opt, &cache, "example.com", "/", "example.com/index.html", 200,
-                "OK", "text/html", "utf-8", "", "", "", "", body, strlen(body));
-    selftest_close(&cache);
-    reconcile_put(opt, "hts-cache/old.ndx", 4096);
-    reconcile_put(opt, "hts-cache/old.dat", 4096);
-    selftest_open_for_read(&cache, opt);
-    if (!cache_readable(&cache)) {
-      printf("cache-legacy: stray legacy files shadowed the zip cache\n");
-      failures++;
-    }
-    failures +=
-        check_entry(opt, &cache, "example.com", "/", 200, "OK", "text/html",
-                    "utf-8", "", "", "", "", body, strlen(body));
-    if (fsize(reconcile_st_path(opt, "hts-cache/old.ndx")) != 4096 ||
-        fsize(reconcile_st_path(opt, "hts-cache/old.dat")) != 4096) {
-      printf("cache-legacy: zip-wins pass touched the legacy files\n");
-      failures++;
-    }
-    if (cache.lst != NULL) {
-      fclose(cache.lst);
-      cache.lst = NULL;
-    }
-    if (cache.txt != NULL) {
-      fclose(cache.txt);
-      cache.txt = NULL;
-    }
-    selftest_close(&cache);
-  }
-
-  reconcile_wipe(opt);
-  return failures;
-}
-
 /* --- read-side corruption injection --------------------------------------- */
 
 /* canary read back intact after each corruption; victim gets the byte surgery

src/htscache_selftest.h

@@ -60,10 +60,6 @@ int cache_write_failure_selftest(httrackp *opt, const char *dir);
    under <dir>. Returns the failed-check count. */
 int cache_reconcile_selftest(httrackp *opt, const char *dir);
 
-/* Verify cache_init refuses a pre-3.31 .dat/.ndx cache without touching it.
-   Returns the number of failed checks (0 = pass). */
-int cache_legacy_refused_selftest(httrackp *opt, const char *dir);
-
 /* Inject read-side corruption (zip byte surgery: bad size, header, deflate)
    under <dir> and assert every case degrades to STATUSCODE_INVALID without
    tainting a sibling entry. */

src/htsconfig.h

@@ -76,6 +76,9 @@ Please visit our Website: http://www.httrack.com
 // always direct-to-disk (0/1)
 #define HTS_DIRECTDISK_ALWAYS 1
 
+// fast cache (build hash table)
+#define HTS_FAST_CACHE 1
+
 // le > peut être considéré comme un tag de fermeture de commentaire (<!-- > est
 // valide)
 #define GT_ENDS_COMMENT 1

src/htscore.c

@@ -134,6 +134,18 @@ RUN_CALLBACK0(opt, end); \
     back_delete_all(opt, &cache, sback);                                       \
     back_free(&sback);                                                         \
     checkrobots_free(&robots);                                                 \
+    if (cache.use) {                                                           \
+      freet(cache.use);                                                        \
+      cache.use = NULL;                                                        \
+    }                                                                          \
+    if (cache.dat) {                                                           \
+      fclose(cache.dat);                                                       \
+      cache.dat = NULL;                                                        \
+    }                                                                          \
+    if (cache.ndx) {                                                           \
+      fclose(cache.ndx);                                                       \
+      cache.ndx = NULL;                                                        \
+    }                                                                          \
     if (cache.zipOutput) {                                                     \
       zipClose(cache.zipOutput,                                                \
                "Created by HTTrack Website Copier/" HTTRACK_VERSION);          \
@@ -143,6 +155,10 @@ RUN_CALLBACK0(opt, end); \
       unzClose(cache.zipInput);                                                \
       cache.zipInput = NULL;                                                   \
     }                                                                          \
+    if (cache.olddat) {                                                        \
+      fclose(cache.olddat);                                                    \
+      cache.olddat = NULL;                                                     \
+    }                                                                          \
     if (cache.lst) {                                                           \
       fclose(cache.lst);                                                       \
       cache.lst = opt->state.strc.lst = NULL;                                  \
@@ -472,11 +488,32 @@ void hts_finish_makeindex(httrackp *opt, int *makeindex_done,
   *makeindex_done = 1;
 }
 
-/* Flush the parsed HTML output buffer to disk. */
+/* Flush the parsed HTML output buffer to disk, skipping the rewrite when the
+ * on-disk MD5 is unchanged. */
 void hts_finish_html_file(httrackp *opt, cache_back *cache, htsblk *r,
                           FILE **fp, const char *ht_buff, size_t ht_len,
                           const char *adr, const char *fil, const char *save) {
-  {
+  char digest[32 + 2];
+  off_t fsize_old =
+      fsize(fconv(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), save));
+  int ok = 0;
+
+  digest[0] = '\0';
+  domd5mem(ht_buff, ht_len, digest, 1);
+  if (fsize_old == (off_t) ht_len) {
+    int mlen = 0;
+    char *mbuff;
+
+    cache_readdata(cache, "//[HTML-MD5]//", save, &mbuff, &mlen);
+    if (mlen)
+      mbuff[mlen] = '\0';
+    if ((mlen == 32) && (strcmp(((mbuff != NULL) ? mbuff : ""), digest) == 0)) {
+      ok = 1;
+      hts_log_print(opt, LOG_DEBUG, "File not re-written (md5): %s", save);
+    }
+    freet(mbuff);
+  }
+  if (!ok) {
     file_notify(opt, adr, fil, save, 1, 1, r->notmodified);
     *fp = filecreate(&opt->state.strc, save);
     if (*fp) {
@@ -508,7 +545,13 @@ void hts_finish_html_file(httrackp *opt, cache_back *cache, htsblk *r,
       if (fcheck)
         hts_log_print(opt, LOG_ERROR, "* * Fatal write error, giving up");
     }
+  } else {
+    file_notify(opt, adr, fil, save, 0, 0, r->notmodified);
+    filenote(&opt->state.strc, save, NULL);
   }
+  if (cache->ndx)
+    cache_writedata(cache->ndx, cache->dat, "//[HTML-MD5]//", save, digest,
+                    (int) strlen(digest));
 }
 
 /* does it look like XML ? (SVG et al.) */

src/htscore.h

@@ -193,7 +193,8 @@ struct cache_back {
   /* */
   int type;
   int ro;                   /**< read-only: no new cache is written */
-
+  FILE *dat, *ndx, *olddat; /**< new data, new index, old data files */
+  char *use;                /**< in-memory list of cached adr+fil keys */
   FILE *lst;                /**< file list, used for purge */
   FILE *txt;                /**< human-readable file list (info) */
   char lastmodified[256];
@@ -287,12 +288,12 @@ struct filecreate_params {
 
 /* True if a new cache is being written (plain or zip backend). */
 HTS_STATIC int cache_writable(cache_back * cache) {
-  return (cache != NULL && cache->zipOutput != NULL);
+  return (cache != NULL && (cache->dat != NULL || cache->zipOutput != NULL));
 }
 
 /* True if an old cache is available to read (plain or zip backend). */
 HTS_STATIC int cache_readable(cache_back * cache) {
-  return (cache != NULL && cache->zipInput != NULL);
+  return (cache != NULL && (cache->olddat != NULL || cache->zipInput != NULL));
 }
 
 #endif

src/htsfilters.c

@@ -48,7 +48,6 @@ Please visit our Website: http://www.httrack.com
 #include "htsbase.h"
 #include "htslib.h"
 #include <ctype.h>
-#include <stdint.h>
 /* END specific definitions */
 
 // à partir d'un tableau de {"+*.toto","-*.zip","+*.tata"} définit si nom est autorisé
@@ -121,81 +120,16 @@ int fa_strjoker_dual(int type, char **filters, int nfil, const char *nom1,
   return use1 ? jok1 : jok2;
 }
 
-/* Failure memo for the recursive matcher: one bit per (chaine, joker) offset
-   pair keeps star-heavy patterns polynomial instead of exponential (#501). */
-typedef struct strjoker_memo {
-  const char *chaine0, *joker0; /* offsets are relative to these bases */
-  size_t stride;                /* strlen(joker0) + 1 */
-  unsigned char *failed;        /* failed-pair bitmap; NULL: no memo */
-} strjoker_memo;
-
-static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
-                                 const char *joker, LLint *size,
-                                 int *size_flag);
-
-/* A pair that failed once fails forever (*size is only written on the success
-   path), so record NULL results and cut the re-exploration. */
-static const char *strjoker_rec(const strjoker_memo *memo, const char *chaine,
-                                const char *joker, LLint *size,
-                                int *size_flag) {
-  size_t bit = 0;
-  const char *adr;
-
-  if (memo->failed) {
-    bit = (size_t) (chaine - memo->chaine0) * memo->stride +
-          (size_t) (joker - memo->joker0);
-    if (memo->failed[bit >> 3] & (unsigned char) (1u << (bit & 7)))
-      return NULL;
-  }
-  adr = strjoker_impl(memo, chaine, joker, size, size_flag);
-  if (adr == NULL && memo->failed)
-    memo->failed[bit >> 3] |= (unsigned char) (1u << (bit & 7));
-  return adr;
-}
-
-// wildcard comparator: match chaine against joker (pattern), case-insensitive
-// returns the address of the first matched letter past any leading joker
-// (ie. *[..]toto.. returns the address of toto within chaine), NULL on mismatch
+// supercomparateur joker (tm)
+// compare a et b (b=avec joker dedans), case insensitive [voir CI]
+// renvoi l'adresse de la première lettre de la chaine
+// (càd *[..]toto.. renvoi adresse de toto dans la chaine)
+// accepte les délires du genre www.*.*/ * / * truc*.*
+// cet algo est 'un peu' récursif mais ne consomme pas trop de tm
+// * = toute lettre
+// --?-- : spécifique à HTTrack et aux ?
 HTS_INLINE const char *strjoker(const char *chaine, const char *joker,
                                 LLint *size, int *size_flag) {
-  strjoker_memo memo = {chaine, joker, 0, NULL};
-  unsigned char stackbits[2048];
-  hts_boolean onheap = HTS_FALSE;
-  const char *adr;
-
-  if (chaine != NULL && joker != NULL) {
-    const size_t n1 = strlen(chaine) + 1;
-
-    memo.stride = strlen(joker) + 1;
-    if (n1 <= (SIZE_MAX - 7) / memo.stride) { // overflow-safe bitmap size
-      const size_t bytes = (n1 * memo.stride + 7) / 8;
-
-      if (bytes <= sizeof(stackbits)) {
-        memset(stackbits, 0, bytes);
-        memo.failed = stackbits;
-      } else {
-        memo.failed = (unsigned char *) calloct(bytes, 1);
-        onheap = memo.failed != NULL ? HTS_TRUE : HTS_FALSE;
-      }
-    }
-  }
-  adr = strjoker_rec(&memo, chaine, joker, size, size_flag);
-  if (onheap)
-    freet(memo.failed);
-  return adr;
-}
-
-/* Test-only oracle: the same matcher without the failure memo. */
-const char *strjoker_nomemo(const char *chaine, const char *joker, LLint *size,
-                            int *size_flag) {
-  const strjoker_memo memo = {chaine, joker, 0, NULL};
-
-  return strjoker_rec(&memo, chaine, joker, size, size_flag);
-}
-
-static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
-                                 const char *joker, LLint *size,
-                                 int *size_flag) {
   if (strnotempty(joker) == 0) {        // fin de chaine joker
     if (strnotempty(chaine) == 0)       // fin aussi pour la chaine: ok
       return chaine;
@@ -369,7 +303,7 @@ static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
 
       // tester sans le joker (pas ()+ mais ()*)
       if (!unique) {
-        if ((adr = strjoker_rec(memo, chaine, joker + jmp, size, size_flag))) {
+        if ((adr = strjoker(chaine, joker + jmp, size, size_flag))) {
           return adr;
         }
       }
@@ -381,8 +315,7 @@ static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
         max = strnotempty(chaine) ? 1 : 0; /* empty chaine: no char to eat */
       while(i < (int) max) {
         if (pass[(int) (unsigned char) chaine[i]]) {    // caractère autorisé
-          if ((adr = strjoker_rec(memo, chaine + i + 1, joker + jmp, size,
-                                  size_flag))) {
+          if ((adr = strjoker(chaine + i + 1, joker + jmp, size, size_flag))) {
             return adr;
           }
           i++;
@@ -392,8 +325,7 @@ static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
 
       // tester chaîne vide
       if (i != max + 2)         // avant c'est ok
-        if ((adr = strjoker_rec(memo, chaine + max, joker + jmp, size,
-                                size_flag)))
+        if ((adr = strjoker(chaine + max, joker + jmp, size, size_flag)))
           return adr;
 
       return NULL;              // perdu
@@ -415,7 +347,7 @@ static const char *strjoker_impl(const strjoker_memo *memo, const char *chaine,
       // comparaison ok?
       if (ok) {
         // continuer la comparaison.
-        if (strjoker_rec(memo, chaine + jmp, joker + jmp, size, size_flag))
+        if (strjoker(chaine + jmp, joker + jmp, size, size_flag))
           return chaine;        // retourner 1e lettre
       }
 

src/htsfilters.h

@@ -48,10 +48,6 @@ int fa_strjoker_dual(int type, char **filters, int nfil, const char *nom1,
                      const char *nom2, LLint *size, int *size_flag, int *depth);
 HTS_INLINE const char *strjoker(const char *chaine, const char *joker, LLint * size,
                           int *size_flag);
-/* strjoker() without the failure memo (exponential worst case); test-only
-   oracle for the memoized matcher. */
-const char *strjoker_nomemo(const char *chaine, const char *joker, LLint *size,
-                            int *size_flag);
 const char *strjokerfind(const char *chaine, const char *joker);
 #endif
 

src/htsglobal.h

@@ -422,10 +422,9 @@ typedef int T_SOC;
 #endif
 
 /* Permission bits for created folders and files (mkdir and chmod).
-   PROTECT_FOLDER/FILE are owner-only. With HTS_ACCESS set (the default) the
-   ACCESS_ modes also grant group/other read; otherwise they stay owner-only. */
+   PROTECT_FOLDER is owner-only. With HTS_ACCESS set (the default) the ACCESS_
+   modes also grant group/other read; otherwise they stay owner-only. */
 #define HTS_PROTECT_FOLDER (S_IRUSR | S_IWUSR | S_IXUSR)
-#define HTS_PROTECT_FILE (S_IRUSR | S_IWUSR)
 
 #if HTS_ACCESS
 #define HTS_ACCESS_FILE (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)

src/htsselftest.c

@@ -621,105 +621,6 @@ static int st_filtersize(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-/* Mime-type filter verdict via fa_strjoker(type=1): only mime: rules apply. */
-static int st_filtermime(httrackp *opt, int argc, char **argv) {
-  int verdict;
-
-  (void) opt;
-  if (argc < 2) {
-    fprintf(stderr, "filtermime: needs <mime> <filter> [filter...]\n");
-    return 1;
-  }
-  verdict = fa_strjoker(1, &argv[1], argc - 1, argv[0], NULL, NULL, NULL);
-  printf("verdict=%s\n", verdict > 0   ? "allowed"
-                         : verdict < 0 ? "forbidden"
-                                       : "unknown");
-  return 0;
-}
-
-/* SplitMix64: deterministic, platform-independent case generator. */
-static uint64_t st_mix64(uint64_t *state) {
-  uint64_t z = (*state += UINT64_C(0x9E3779B97F4A7C15));
-
-  z = (z ^ (z >> 30)) * UINT64_C(0xBF58476D1CE4B5B9);
-  z = (z ^ (z >> 27)) * UINT64_C(0x94D049BB133111EB);
-  return z ^ (z >> 31);
-}
-
-/* Differential test: memoized strjoker vs the no-memo oracle on seeded random
-   pattern/subject/size cases must agree on result, *size and *size_flag. */
-static int st_filtermemo(httrackp *opt, int argc, char **argv) {
-  static const char *const pieces[] = {
-      "a",       "b",        "A",    "c",      ".",       "/",
-      "?",       "*",        "*[a]", "*[ab]",  "*[a-c]",  "*[A-Z]",
-      "*[<5]",   "*[>5]",    "*(a)", "*(a,b)", "*[file]", "*[path]",
-      "*[name]", "*[param]", "*[]",  "*[\\a]", "*[a-"};
-  static const char subject_chars[] = "abAc./?";
-  uint64_t rng = UINT64_C(0x501);
-  int iters = 20000, matched = 0, unmatched = 0;
-  int it;
-
-  (void) opt;
-  if (argc >= 1)
-    sscanf(argv[0], "%d", &iters);
-  for (it = 0; it < iters; it++) {
-    char pat[64], str[16];
-    size_t pl = 0;
-    const int npieces = (int) (st_mix64(&rng) % 5);
-    const int slen = (int) (st_mix64(&rng) % 13);
-    const int szsel = (int) (st_mix64(&rng) % 4); /* none/unknown/3/20 */
-    LLint sz1, sz2, off1, off2;
-    int i, flag1 = 0, flag2 = 0;
-    char *hpat, *hstr;
-    const char *adr;
-
-    for (i = 0; i < npieces; i++) {
-      const char *p =
-          pieces[st_mix64(&rng) % (sizeof(pieces) / sizeof(pieces[0]))];
-      const size_t len = strlen(p);
-
-      if (len >= sizeof(pat) - pl)
-        break;
-      memcpy(pat + pl, p, len);
-      pl += len;
-    }
-    pat[pl] = '\0';
-    for (i = 0; i < slen; i++)
-      str[i] = subject_chars[st_mix64(&rng) % (sizeof(subject_chars) - 1)];
-    str[slen] = '\0';
-    sz1 = sz2 = (szsel <= 1) ? -1 : (szsel == 2) ? 3 : 20;
-    /* exact-size heap copies per run so a sanitizer traps any over-read */
-    hpat = strdupt(pat);
-    hstr = strdupt(str);
-    adr = strjoker(hstr, hpat, szsel ? &sz1 : NULL, szsel ? &flag1 : NULL);
-    off1 = adr != NULL ? (LLint) (adr - hstr) : -1;
-    freet(hpat);
-    freet(hstr);
-    hpat = strdupt(pat);
-    hstr = strdupt(str);
-    adr =
-        strjoker_nomemo(hstr, hpat, szsel ? &sz2 : NULL, szsel ? &flag2 : NULL);
-    off2 = adr != NULL ? (LLint) (adr - hstr) : -1;
-    freet(hpat);
-    freet(hstr);
-    if (off1 != off2 || sz1 != sz2 || flag1 != flag2) {
-      printf("filtermemo MISMATCH pat=[%s] str=[%s] szsel=%d: "
-             "off %d/%d size %d/%d flag %d/%d\n",
-             pat, str, szsel, (int) off1, (int) off2, (int) sz1, (int) sz2,
-             flag1, flag2);
-      return 1;
-    }
-    if (off1 >= 0)
-      matched++;
-    else
-      unmatched++;
-  }
-  /* both polarities must actually occur or the test proves nothing */
-  assertf(matched > 0 && unmatched > 0);
-  printf("filtermemo: %d cases OK\n", iters);
-  return 0;
-}
-
 /* Merged two-form filter verdict via fa_strjoker_dual (see htsfilters.h). */
 static int st_filterdual(httrackp *opt, int argc, char **argv) {
   int depth = -1, verdict;
@@ -1599,18 +1500,6 @@ static int st_cache_corrupt(httrackp *opt, int argc, char **argv) {
   return err;
 }
 
-static int st_cache_legacy(httrackp *opt, int argc, char **argv) {
-  int err;
-
-  if (argc < 1) {
-    fprintf(stderr, "cache-legacy: needs a directory\n");
-    return 1;
-  }
-  err = cache_legacy_refused_selftest(opt, argv[0]);
-  printf("cache-legacy: %s\n", err ? "FAIL" : "OK");
-  return err;
-}
-
 static int st_reconcile(httrackp *opt, int argc, char **argv) {
   int err;
 
@@ -1662,26 +1551,6 @@ static int st_cookies(httrackp *opt, int argc, char **argv) {
     err = 1;
   if (strstr(hdr, "junk") != NULL) // wrong-domain cookie leaked
     err = 1;
-#ifndef _WIN32
-  /* the jar holds live session cookies: cookie_save must keep it 0600 */
-  {
-    const char *jar = "st-cookies-jar.txt";
-    struct stat st;
-
-    (void) UNLINK(jar);
-    assertf(cookie_save(&cookie, jar) == 0);
-    assertf(stat(jar, &st) == 0);
-    assertf((st.st_mode & 07777) == HTS_PROTECT_FILE);
-    assertf(st.st_size > 0); /* mode-only checks would pass an empty jar */
-    /* a pre-existing world-readable jar must be tightened, not kept */
-    assertf(chmod(jar, 0644) == 0);
-    assertf(cookie_save(&cookie, jar) == 0);
-    assertf(stat(jar, &st) == 0);
-    assertf((st.st_mode & 07777) == HTS_PROTECT_FILE);
-    assertf(st.st_size > 0);
-    (void) UNLINK(jar);
-  }
-#endif
   printf("cookie-header: %s\n", err ? "FAIL" : "OK");
   if (err)
     printf("  got: %s\n", hdr);
@@ -2378,10 +2247,6 @@ static const struct selftest_entry {
     {"filtersize", "<size> <string> <filter>...",
      "size-aware filter verdict (negative size = unknown/scan time)",
      st_filtersize},
-    {"filtermime", "<mime> <filter>...",
-     "mime-type filter verdict (fa_strjoker type=1)", st_filtermime},
-    {"filtermemo", "[iterations]",
-     "memoized vs unmemoized matcher differential", st_filtermemo},
     {"filterdual", "<string1> <string2> <filter>...",
      "merged two-form filter verdict (fa_strjoker_dual)", st_filterdual},
     {"simplify", "<path>", "collapse ./ and ../ in a path", st_simplify},
@@ -2429,8 +2294,6 @@ static const struct selftest_entry {
      st_cache_writefail},
     {"reconcile", "<dir>", "cache generation reconcile policy self-test",
      st_reconcile},
-    {"cache-legacy", "<dir>", "pre-3.31 legacy cache refusal self-test",
-     st_cache_legacy},
     {"cache-corrupt", "<dir>", "cache read-side corruption self-test",
      st_cache_corrupt},
     {"dns", "", "DNS resolver/cache self-test", st_dns},

tests/01_engine-filter.test

@@ -131,64 +131,3 @@ match '*.aspx' 'page.aspx?y=2'
 # empty subject against a unique-match allow-all pattern (heap over-read regress)
 nomatch_empty '*(('
 nomatch_empty '**(('
-
-# near-miss negatives: word order, exact tails, range boundaries, class case
-nomatch 'foo*bar' 'foobaz'
-nomatch '*foo*bar' 'barfoo' # both words present, wrong order
-nomatch '*.gif' 'a.gifx'    # trailing junk after the extension
-nomatch '*.gif' 'a.gi'
-nomatch '*[b-y]' 'a'
-nomatch '*[b-y]' 'z'
-nomatch '*[a-z].txt' 'B.txt' # classes are case-sensitive...
-match 'FoO*' 'foobar'        # ...literals are not
-
-# a star may match an empty run, but never skip a required literal
-match '*[0-9].gif' '.gif'
-nomatch '*[0-9].gif' 'x.gif'
-
-# a descending range *[c-a] is an empty class, not c..a reversed
-match '*[c-a]x' 'x'
-nomatch '*[c-a]x' 'cx'
-
-# *[param] is all-or-nothing on '?': spans everything after one, else nothing
-match 'a*[param]' 'a?x=1'
-nomatch 'a*[param]' 'ab?x=1'
-
-# the latest matching rule wins, regardless of sign
-fsize 'verdict=forbidden size_flag=0' -1 a.gif '+*.gif' '-*.gif'
-fsize 'verdict=allowed size_flag=0' -1 a.gif '-*.gif' '+*.gif'
-
-# a failed size test sets size_flag but leaves the rule unmatched
-fsize 'verdict=unknown size_flag=1' 5 foo.jpg '-*.jpg*[>10]'
-
-# mime filters (-#test=filtermime = fa_strjoker type=1): only mime: rules
-# apply to a mime type, and mime: rules never apply to a URL
-fmime() {
-    local want="$1"
-    shift
-    test "$(httrack -O /dev/null -#test=filtermime "$@")" == "verdict=$want" || exit 1
-}
-fmime allowed 'image/png' '+mime:image/*'
-fmime unknown 'text/html' '+mime:image/*'
-fmime forbidden 'image/png' '+mime:image/*' '-mime:image/png' # last wins
-fmime allowed 'image/png' '-mime:image/png' '+mime:image/*'
-fmime unknown 'image/png' '+image/*'                               # URL rule: skipped
-fsize 'verdict=unknown size_flag=0' -1 'image/png' '+mime:image/*' # and vice versa
-
-# memoized vs no-memo differential over seeded random patterns and subjects,
-# matching and non-matching (the self-test asserts both polarities occurred)
-test "$(httrack -O /dev/null -#test=filtermemo)" == "filtermemo: 20000 cases OK" || exit 1
-
-# star-heavy non-match must stay polynomial (#501); 400 chars also exercises
-# the heap-allocated memo. timeout (where available) turns a hang into a FAIL.
-with_timeout() {
-    if command -v timeout >/dev/null; then timeout 60 "$@"; else "$@"; fi
-}
-pat=$(printf '*[a]%.0s' $(seq 1 12))b
-subj=$(printf 'a%.0s' $(seq 1 400))
-test "$(with_timeout httrack -O /dev/null -#test=filter "$pat" "$subj")" == "$subj does NOT match $pat" || exit 1
-
-# a later star's class dead-end must re-extend the earlier star, not give up
-# (guards against a single-backtrack-point matcher rewrite)
-match '*[aX]X*[a]Y' 'aXaXaY'
-nomatch '*[aX]X*[a]Y' 'aXbXaY'

tests/01_zlib-cache-legacy.test

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# The pre-3.31 .dat/.ndx cache import was removed: cache_init must refuse the
-# legacy pair and leave the files untouched (httrack -#test=cache-legacy <dir>).
-
-set -eu
-
-dir=$(mktemp -d)
-trap 'rm -rf "$dir"' EXIT
-
-# the refusal errors land on stdout (no log file); pin them and the verdict
-out=$(httrack -#test=cache-legacy "$dir" 2>/dev/null)
-cnt=$(printf '%s\n' "$out" | grep -c 'no longer supported' || true)
-test "$cnt" = 2 || {
-    echo "expected 2 refusal messages, got $cnt" >&2
-    exit 1
-}
-out=$(printf '%s\n' "$out" | tail -n1)
-
-test "$out" = "cache-legacy: OK" || {
-    echo "expected 'cache-legacy: OK', got: $out" >&2
-    exit 1
-}

tests/Makefile.am

@@ -68,7 +68,6 @@ TESTS = \
 	01_zlib-acceptencoding.test \
 	01_zlib-cache.test \
 	01_zlib-cache-corrupt.test \
-	01_zlib-cache-legacy.test \
 	01_zlib-cache-golden.test \
 	01_zlib-cache-writefail.test \
 	01_zlib-savename-cached.test \