Remove the dead HTS_FAST_CACHE==0 code paths

HTS_FAST_CACHE has been hard-set to 1 since the coucal hashtable became the cache index; the ==0 arms no longer even compile (they reference an undeclared variable in cache_readex). Drop the knob, the dead arms, and the cache_back 'use' field they read, which was never assigned. No behavior change: the kept code is exactly what the preprocessor selected, and the removed cache.use cleanup was a never-taken branch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Xavier Roche <roche@httrack.com>
2026-07-11 19:36:52 +03:00 · 2026-07-10 18:30:27 +02:00
26 changed files with 216 additions and 824 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.71])

-AC_INIT([httrack], [3.49.12], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.11], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_COPYRIGHT([
 HTTrack Website Copier, Offline Browser for Windows and Unix
 Copyright (C) 1998-2015 Xavier Roche and other contributors
@@ -29,11 +29,11 @@ AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([subdir-objects])
-# 3:4:0: 3.49.12 tail-appends one field (why_url) to httrackp and otherwise only
-# deletes dead comments; no struct layout or exported signature broke vs 3.49.11,
-# so it stays soname .so.3; bump revision.
+# 3:3:0: 3.49.11 only adds enum values, macros and inline helpers to the
+# installed headers (no struct layout or exported signature changed vs
+# 3.49.10), so it stays soname .so.3; bump revision.
 # (3:0:0 was the htsblk mime-buffer widening, the ABI break that moved .so.2 -> .so.3.)
-VERSION_INFO="3:4:0"
+VERSION_INFO="3:3:0"
 AM_MAINTAINER_MODE
 AC_USE_SYSTEM_EXTENSIONS

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,3 @@
-httrack (3.49.12-1) unstable; urgency=medium
-
-  * New upstream release: security and crawl-correctness fixes (remote stack
-    overflow in Content-Type/-Encoding parsing, fuzzer-found parser over-reads,
-    world-readable cookies.txt, filter-pattern denial of service) plus a new
-    --why filter diagnostic; full list in history.txt.
-  * Build with _FORTIFY_SOURCE and -fstack-protector-strong.
-
- -- Xavier Roche <xavier@debian.org>  Fri, 10 Jul 2026 21:11:09 +0200
-
 httrack (3.49.11-1) unstable; urgency=medium

  * New upstream release: crawl correctness and security fixes (network-facing
--- a/fuzz/corpus/meta/meta-content-first.html
+++ b/fuzz/corpus/meta/meta-content-first.html
@@ -1 +0,0 @@
-<meta content="text/html; charset=gb2312" http-equiv="content-type">
--- a/fuzz/corpus/meta/meta-truncated.html
+++ b/fuzz/corpus/meta/meta-truncated.html
@@ -1 +0,0 @@
-<meta charset='utf-8
--- a/fuzz/corpus/meta/meta-unquoted.html
+++ b/fuzz/corpus/meta/meta-unquoted.html
@@ -1 +0,0 @@
-<meta   charset = utf-8 />
--- a/history.txt
+++ b/history.txt
@@ -4,23 +4,6 @@ HTTrack Website Copier release history:

 This file lists all changes and fixes that have been made for HTTrack

-3.49-12
-+ New: --why explains which filter rule accepts or rejects a given URL, then exits (#505)
-+ Fixed: links carrying raw UTF-8 bytes were fetched double-encoded and 404'd (#516)
-+ Fixed: an uncompressed body mislabeled as gzip no longer loses the page (#515)
-+ Fixed: remote stack overflow and uninitialized read in Content-Type/-Encoding parsing (#506)
-+ Fixed: several over-reads and a leak in the filter, URL and IDNA parsers (#499)
-+ Fixed: bound the cache-index (.ndx) parser to its buffer (#507)
-+ Fixed: catastrophic backtracking on '*'-heavy filter patterns (#513)
-+ Fixed: cookies.txt was created world-readable (#511)
-+ Fixed: a single corrupt cache entry no longer aborts the whole mirror (#494)
-+ Fixed: cache-reconcile policy was broken for zip caches (#491, #493, #495)
-+ Fixed: cancelling a crawl mid type-check no longer orphans .delayed placeholders (#496)
-+ Fixed: detect URLs after the first inline script and in mid-tag attributes (#497)
-+ Changed: build with _FORTIFY_SOURCE and -fstack-protector-strong (#504)
-+ Changed: removed the pre-3.31 (.dat/.ndx) cache import (#512)
-+ Changed: multiple internal hardening and build improvements (libFuzzer harnesses, CodeQL, dead-code removal)
-
 3.49-11
 + New: parse robots.txt Allow rules and path wildcards per RFC 9309 (#452)
 + New: advertise deflate in Accept-Encoding and decode deflate responses (#450)
--- a/src/htsback.c
+++ b/src/htsback.c
@@ -68,15 +68,6 @@ static int slot_can_be_cached_on_disk(const lien_back * back);
 static int slot_can_be_cleaned(const lien_back * back);
 static int slot_can_be_finalized(httrackp * opt, const lien_back * back);

-/* Which hard quota, if any, is currently aborting the mirror. */
-typedef enum {
-  HTS_MIRROR_LIMIT_NONE = 0,
-  HTS_MIRROR_LIMIT_SIZE,
-  HTS_MIRROR_LIMIT_TIME,
-} hts_mirror_limit;
-
-static hts_mirror_limit back_mirror_limit(httrackp *opt);
-
 struct_back *back_new(httrackp *opt, int back_max) {
  int i;
  struct_back *sback = calloct(1, sizeof(struct_back));
@@ -533,22 +524,22 @@ int back_nsoc_overall(const struct_back * sback) {

 /* generate temporary file on lien_back */
 /* Note: utf-8 */
-static int create_back_tmpfile(httrackp *opt, lien_back *const back,
-                               const char *ext) {
+static int create_back_tmpfile(httrackp * opt, lien_back *const back) {
  // do not use tempnam() but a regular filename
  back->tmpfile_buffer[0] = '\0';
  if (back->url_sav != NULL && back->url_sav[0] != '\0') {
-    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s.%s",
-             back->url_sav, ext);
+    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s.z", 
+             back->url_sav);
    back->tmpfile = back->tmpfile_buffer;
    if (structcheck(back->tmpfile) != 0) {
-      hts_log_print(opt, LOG_WARNING, "can not create directory to %s",
+      hts_log_print(opt, LOG_WARNING, "can not create directory to %s", 
                    back->tmpfile);
      return -1;
    }
  } else {
-    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s/tmp%d.%s",
-             StringBuff(opt->path_html_utf8), opt->state.tmpnameid++, ext);
+    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer),
+             "%s/tmp%d.z", StringBuff(opt->path_html_utf8),
+             opt->state.tmpnameid++);
    back->tmpfile = back->tmpfile_buffer;
  }
  /* OK */
@@ -556,32 +547,6 @@ static int create_back_tmpfile(httrackp *opt, lien_back *const back,
  return 0;
 }

-/* Commit or restore a re-fetch backup (#77 follow-up): a re-fetch over an
-   existing file moved the good copy to back->tmpfile before truncating url_sav.
-   commit keeps the new file and drops the backup; else restore it so an aborted
-   transfer leaves the previous copy intact. Skips the zlib .z temp. */
-static void back_finalize_backup(httrackp *opt, lien_back *const back,
-                                 const hts_boolean commit) {
-  if (back->tmpfile == NULL || back->r.compressed)
-    return;
-  if (commit) {
-    (void) UNLINK(back->tmpfile); /* new copy is good; drop the backup */
-  } else {
-    if (back->r.out != NULL) {
-      fclose(back->r.out);
-      back->r.out = NULL;
-    }
-    (void) UNLINK(back->url_sav); /* drop the failed partial */
-    /* On rename failure keep the backup: it still holds the good copy, so
-       losing it would be worse than an orphaned temp. */
-    if (RENAME(back->tmpfile, back->url_sav) != 0)
-      hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
-                    "could not restore %s; previous copy kept as %s",
-                    back->url_sav, back->tmpfile);
-  }
-  back->tmpfile = NULL;
-}
-
 // objet (lien) téléchargé ou transféré depuis le cache
 //
 // fermer les paramètres de transfert,
@@ -617,7 +582,6 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
                      LLintP " got " LLintP "): %s%s", back[p].r.totalsize,
                      back[p].r.size, back[p].url_adr, back[p].url_fil);
      }
-      back_finalize_backup(opt, &back[p], HTS_FALSE);
      return -1;
    }

@@ -636,7 +600,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
            // en mémoire -> passage sur disque
            if (!back[p].r.is_write) {
              // do not use tempnam() but a regular filename
-              if (create_back_tmpfile(opt, &back[p], "z") == 0) {
+              if (create_back_tmpfile(opt, &back[p]) == 0) {
                assertf(back[p].tmpfile != NULL);
                /* note: tmpfile is utf-8 */
                back[p].r.out = FOPEN(back[p].tmpfile, "wb");
@@ -709,9 +673,6 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
          }
        }
 #endif
-        /* Body fully received: keep the freshly written url_sav, drop the
-           backup of the previous copy. */
-        back_finalize_backup(opt, &back[p], HTS_TRUE);
        /* Write mode to disk */
        if (back[p].r.is_write && back[p].r.adr != NULL) {
          freet(back[p].r.adr);
@@ -940,9 +901,6 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
      }
    }
  }
-  /* Aborted, error, or not ready: url_sav (if written) is broken; restore the
-     previous copy from the backup. */
-  back_finalize_backup(opt, &back[p], HTS_FALSE);
  return -1;
 }

@@ -2092,9 +2050,13 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char

      if (!back_trylive(opt, cache, sback, p)) {
 #if HTS_XGETHOST
-        back[p].status = STATUS_WAIT_DNS; // host name resolution attempt
-        soc = INVALID_SOCKET;             // not opened yet
-        if (host_wait(opt, &back[p])) {   // ready (file, or cached dns)
+#if HDEBUG
+        printf("back_solve..\n");
+#endif
+        back[p].status = STATUS_WAIT_DNS;       // tentative de résolution du nom de host
+        soc = INVALID_SOCKET;   // pas encore ouverte
+        back_solve(opt, &back[p]);      // préparer
+        if (host_wait(opt, &back[p])) { // prêt, par ex fichier ou dispo dans dns
 #if HDEBUG
          printf("ok, dns cache ready..\n");
 #endif
@@ -2237,9 +2199,37 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
 }

 #if HTS_XGETHOST
-// Resolution is synchronous inside the connect path; no pre-resolve step, so
-// the host is always immediately ready.
-int host_wait(httrackp *opt, lien_back *back) { return 1; }
+// attendre que le host (ou celui du proxy) ait été résolu
+// si c'est un fichier, la résolution est immédiate
+// idem pour ftp://
+void back_solve(httrackp * opt, lien_back * back) {
+  assertf(opt != NULL);
+  assertf(back != NULL);
+  if ((!strfield(back->url_adr, "file://"))
+      && !strfield(back->url_adr, "ftp://")
+    ) {
+    const char *a;
+
+    if (!(back->r.req.proxy.active))
+      a = back->url_adr;
+    else
+      a = back->r.req.proxy.name;
+    assertf(a != NULL);
+    a = jump_protocol_const(a);
+    if (check_hostname_dns(a)) {
+      hts_log_print(opt, LOG_DEBUG, "resolved: %s", a);
+    } else {
+      hts_log_print(opt, LOG_DEBUG, "failed to resolve: %s", a);
+    }
+  }
+}
+
+// détermine si le host a pu être résolu
+int host_wait(httrackp * opt, lien_back * back) {
+  // Always synchronous. No more background DNS resolution
+  // (does not really improve performances)
+  return 1;
+}
 #endif

 // élimine les fichiers non html en backing (anticipation)
@@ -2426,15 +2416,9 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
  back_clean(opt, cache, sback);
 #endif

-  /* Time/size limit exceeded past grace: abort in-flight transfers so no wait
-     loop starves (#481, #77). FTP slots stay, their thread owns the socket. */
+  /* Time limit exceeded past grace: abort in-flight transfers so no wait loop
+     starves (#481). FTP slots stay, their thread owns the socket. */
  if (!back_checkmirror(opt)) {
-    const hts_mirror_limit limit = back_mirror_limit(opt);
-    const char *const reason =
-        (limit == HTS_MIRROR_LIMIT_SIZE) ? "size limit" : "time limit";
-    const char *const slotmsg = (limit == HTS_MIRROR_LIMIT_SIZE)
-                                    ? "Mirror Size Limit"
-                                    : "Mirror Time Out";
    int aborted = 0;
    unsigned int i;

@@ -2448,15 +2432,15 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
        if (back[i].r.is_write && IS_DELAYED_EXT(back[i].url_sav))
          back_delayed_discard(opt, &back[i]);
        back[i].r.statuscode = STATUSCODE_TIMEOUT;
-        strcpybuff(back[i].r.msg, slotmsg);
+        strcpybuff(back[i].r.msg, "Mirror Time Out");
        back[i].status = STATUS_READY;
        back_set_finished(sback, i);
        aborted++;
      }
    }
    if (aborted > 0)
-      hts_log_print(opt, LOG_WARNING, "%s reached, %d transfer(s) aborted",
-                    reason, aborted);
+      hts_log_print(opt, LOG_WARNING,
+                    "time limit reached, %d transfer(s) aborted", aborted);
    return;
  }

@@ -2946,8 +2930,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                                strfield(get_ext(catbuff, sizeof(catbuff), back[i].url_sav), "gz") == 0
                                && strfield(get_ext(catbuff, sizeof(catbuff), back[i].url_sav), "tgz") == 0
                              ) {
-                              if (create_back_tmpfile(opt, &back[i], "z") ==
-                                  0) {
+                              if (create_back_tmpfile(opt, &back[i]) == 0) {
                                assertf(back[i].tmpfile != NULL);
                                /* note: tmpfile is utf-8 */
                                if ((back[i].r.out =
@@ -2960,20 +2943,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                                          back[i].url_sav, 1, 1,
                                          back[i].r.notmodified);
                              back[i].r.compressed = 0;
-                              /* Re-fetch over an existing file (#77 follow-up):
-                                 move the good copy aside before truncating it
-                                 so an aborted transfer can restore it. url_sav
-                                 is still written normally (file list intact).
-                               */
-                              back[i].tmpfile = NULL;
-                              if (fexist_utf8(back[i].url_sav)) {
-                                if (create_back_tmpfile(opt, &back[i], "bak") !=
-                                        0 ||
-                                    RENAME(back[i].url_sav, back[i].tmpfile) !=
-                                        0) {
-                                  back[i].tmpfile = NULL;
-                                }
-                              }
                              if ((back[i].r.out =
                                   filecreate(&opt->state.strc,
                                              back[i].url_sav)) == NULL) {
@@ -3540,20 +3509,22 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                  if (back[i].r.statuscode == 406) {    // 'Not Acceptable'
                    back[i].r.statuscode = HTTP_OK;
                  }
-                  // On update, keep the good copy on error (mask as 304); skip
-                  // resume paths so a stale-partial 416 still re-fetches.
-                  if (HTTP_IS_ERROR(back[i].r.statuscode) &&
-                      back[i].is_update && !back[i].testmode &&
-                      back[i].range_req_size == 0 && back[i].url_sav[0] &&
-                      fexist_utf8(back[i].url_sav)) {
-                    hts_log_print(opt, LOG_DEBUG,
-                                  "Error %d (%s) ignored on update, keeping "
-                                  "existing copy: %s%s",
-                                  back[i].r.statuscode, back[i].r.msg,
-                                  back[i].url_adr, back[i].url_fil);
-                    back[i].r.statuscode = HTTP_NOT_MODIFIED;
-                    deletehttp(&back[i].r);
-                    back[i].r.soc = INVALID_SOCKET;
+                  // 'do not erase already downloaded file'
+                  // on an updated file
+                  // with an error : consider a 304 error
+                  if (!opt->delete_old) {
+                    if (HTTP_IS_ERROR(back[i].r.statuscode) && back[i].is_update
+                        && !back[i].testmode) {
+                      if (back[i].url_sav[0] && fexist_utf8(back[i].url_sav)) {
+                        hts_log_print(opt, LOG_DEBUG,
+                                      "Error ignored %d (%s) because of 'no purge' option for %s%s",
+                                      back[i].r.statuscode, back[i].r.msg,
+                                      back[i].url_adr, back[i].url_fil);
+                        back[i].r.statuscode = HTTP_NOT_MODIFIED;
+                        deletehttp(&back[i].r);
+                        back[i].r.soc = INVALID_SOCKET;
+                      }
+                    }
                  }
                  // Various hacks to limit re-transfers when updating a mirror
                  // Force update if same size detected
@@ -4174,43 +4145,38 @@ static int back_maxtime_grace(const int maxtime) {
  return maximum(5, minimum(30, maxtime / 10));
 }

-/* Bytes the smooth stop may overrun before in-flight transfers are aborted.
-   No floor (unlike the time grace): a size overrun should abort promptly. */
-static LLint back_maxsize_grace(const LLint maxsite) { return maxsite / 10; }
-
-/* Which cap has overrun its grace and must hard-stop the mirror (#77, #481). */
-static hts_mirror_limit back_mirror_limit(httrackp *opt) {
-  if (opt->maxsite > 0 && HTS_STAT.stat_bytes >= opt->maxsite &&
-      HTS_STAT.stat_bytes - opt->maxsite >= back_maxsize_grace(opt->maxsite))
-    return HTS_MIRROR_LIMIT_SIZE;
+int back_checkmirror(httrackp * opt) {
+  // Check max size
+  if ((opt->maxsite > 0) && (HTS_STAT.stat_bytes >= opt->maxsite)) {
+    if (!opt->state.stop) {     /* not yet stopped */
+      hts_log_print(opt, LOG_ERROR,
+                    "More than " LLintP
+                    " bytes have been transferred.. giving up",
+                    (LLint) opt->maxsite);
+      /* cancel mirror smoothly */
+      hts_request_stop(opt, 0);
+    }
+    return 1;                   /* don'k break mirror too sharply for size limits, but stop requested */
+    /*return 0;
+     */
+  }
+  // Check max time
  if (opt->maxtime > 0) {
    const TStamp elapsed = time_local() - HTS_STAT.stat_timestart;

-    if (elapsed >= opt->maxtime &&
-        elapsed - opt->maxtime >= back_maxtime_grace(opt->maxtime))
-      return HTS_MIRROR_LIMIT_TIME;
+    if (elapsed >= opt->maxtime) {
+      if (!opt->state.stop) { /* not yet stopped */
+        hts_log_print(opt, LOG_ERROR, "More than %d seconds passed.. giving up",
+                      opt->maxtime);
+        /* cancel mirror smoothly */
+        hts_request_stop(opt, 0);
+      }
+      /* smooth stop starved past the grace period: stop waiting (#481) */
+      if (elapsed - opt->maxtime >= back_maxtime_grace(opt->maxtime))
+        return 0;
+    }
  }
-  return HTS_MIRROR_LIMIT_NONE;
-}
-
-int back_checkmirror(httrackp *opt) {
-  /* request a smooth stop the first time each cap is reached */
-  if (opt->maxsite > 0 && HTS_STAT.stat_bytes >= opt->maxsite &&
-      !opt->state.stop) {
-    hts_log_print(opt, LOG_ERROR,
-                  "More than " LLintP
-                  " bytes have been transferred.. giving up",
-                  (LLint) opt->maxsite);
-    hts_request_stop(opt, 0);
-  }
-  if (opt->maxtime > 0 && !opt->state.stop &&
-      (time_local() - HTS_STAT.stat_timestart) >= opt->maxtime) {
-    hts_log_print(opt, LOG_ERROR, "More than %d seconds passed.. giving up",
-                  opt->maxtime);
-    hts_request_stop(opt, 0);
-  }
-  /* hard stop once a cap overruns its grace (callers must stop waiting) */
-  return back_mirror_limit(opt) == HTS_MIRROR_LIMIT_NONE;
+  return 1;                     /* Ok, go on */
 }

 // octets transférés + add
--- a/src/htsback.h
+++ b/src/htsback.h
@@ -138,11 +138,12 @@ LLint back_transferred(LLint add, struct_back * sback);

 // hostback
 #if HTS_XGETHOST
+void back_solve(httrackp * opt, lien_back * sback);
 int host_wait(httrackp * opt, lien_back * sback);
 #endif
 int back_checksize(httrackp * opt, lien_back * eback, int check_only_totalsize);
-/* Enforce -M/-E quotas: smooth-stops when reached; returns 0 once the -M cap
-   or -E deadline overruns its grace period (callers must stop waiting). */
+/* Enforce -M/-E quotas: requests a smooth stop when reached; returns 0 once
+   the -E deadline overran its grace period (callers must stop waiting). */
 int back_checkmirror(httrackp * opt);

 #endif
--- a/src/htscharset.c
+++ b/src/htscharset.c
@@ -84,7 +84,7 @@ static int hts_equalsAlphanum(const char *a, const char *b) {

 /* Copy the memory region [s .. s + size - 1 ] as a \0-terminated string. */
 static char *hts_stringMemCopy(const char *s, size_t size) {
-  char *dest = malloct(size + 1);
+  char *dest = malloc(size + 1);

  if (dest != NULL) {
    memcpy(dest, s, size);
@@ -549,6 +549,42 @@ char *hts_convertStringFromUTF8(const char *s, size_t size, const char *charset)

 #endif

+HTS_STATIC char *hts_getCharsetFromContentType(const char *mime) {
+  /* text/html; charset=utf-8 */
+  const char *const charset = "charset";
+  char *pos = strstr(mime, charset);
+
+  if (pos != NULL) {
+    /* Skip spaces */
+    int eq = 0;
+
+    for(pos += strlen(charset);
+        *pos == ' ' || *pos == '=' || *pos == '"' || *pos == '\''; pos++) {
+      if (*pos == '=') {
+        eq = 1;
+      }
+    }
+    if (eq == 1) {
+      int len;
+
+      for(len = 0;
+          pos[len] == ' ' || pos[len] == ';' || pos[len] == '"' || *pos == '\'';
+          pos++) ;
+      if (len != 0) {
+        char *const s = malloc(len + 1);
+        int i;
+
+        for(i = 0; i < len; i++) {
+          s[i] = pos[i];
+        }
+        s[len] = '\0';
+        return s;
+      }
+    }
+  }
+  return NULL;
+}
+
 #ifdef _WIN32
 #define strcasecmp(a,b) stricmp(a,b)
 #define strncasecmp(a,b,n) strnicmp(a,b,n)
@@ -608,106 +644,58 @@ int hts_isCharsetUTF8(const char *charset) {
         || strcasecmp(charset, "utf8") == 0 );
 }

-/* Extract X from a "text/html; charset=X" content= attribute value. */
-static char *charset_from_content(const char *s, size_t len) {
-  size_t i;
-
-  for (i = 0; i + 7 < len; i++) {
-    if ((i == 0 || is_space(s[i - 1]) || s[i - 1] == ';') &&
-        strncasecmp(&s[i], "charset", 7) == 0 && is_space_or_equal(s[i + 7])) {
-      size_t j, val;
-
-      for (j = i + 7; j < len && is_space_or_equal_or_quote(s[j]); j++)
-        ;
-      for (val = j; j < len && s[j] != '"' && s[j] != '\'' && s[j] != ';' &&
-                    !is_space(s[j]);
-           j++)
-        ;
-      if (j != val) {
-        return hts_stringMemCopy(&s[val], j - val);
-      }
-    }
-  }
-  return NULL;
-}
-
 char *hts_getCharsetFromMeta(const char *html, size_t size) {
-  size_t i;
+  int i;

-  /* HTML5 <meta charset=X> or legacy
-     <meta http-equiv="Content-Type" content="text/html; charset=X">,
-     attributes in any order; first resolvable tag wins. */
-  for (i = 0; i + 6 < size; i++) {
-    size_t j;
-    const char *equiv = NULL, *content = NULL;
-    size_t equiv_len = 0, content_len = 0;
+  /* <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8" > */
+  for(i = 0; i < size; i++) {
+    if (html[i] == '<' && strncasecmp(&html[i + 1], "meta", 4) == 0
+        && is_space(html[i + 5])) {
+      /* Skip spaces */
+      for(i += 5; is_space(html[i]); i++) ;
+      if (strncasecmp(&html[i], "HTTP-EQUIV", 10) == 0
+          && is_space_or_equal(html[i + 10])) {
+        for(i += 10; is_space_or_equal_or_quote(html[i]); i++) ;
+        if (strncasecmp(&html[i], "CONTENT-TYPE", 12) == 0) {
+          for(i += 12; is_space_or_equal_or_quote(html[i]); i++) ;
+          if (strncasecmp(&html[i], "CONTENT", 7) == 0
+              && is_space_or_equal(html[i + 7])) {
+            for(i += 7; is_space_or_equal_or_quote(html[i]); i++) ;
+            /* Skip content-type */
+            for(;
+                i < size && html[i] != ';' && html[i] != '"' && html[i] != '\'';
+                i++) ;
+            /* Expect charset attribute here */
+            if (html[i] == ';') {
+              for(i++; is_space(html[i]); i++) ;
+              /* Look for charset */
+              if (strncasecmp(&html[i], "charset", 7) == 0
+                  && is_space_or_equal(html[i + 7])) {
+                int len;

-    if (html[i] != '<' || strncasecmp(&html[i + 1], "meta", 4) != 0 ||
-        !is_space(html[i + 5])) {
-      continue;
-    }
-    /* Attribute scan, strictly bounded by size. */
-    for (j = i + 6; j < size && html[j] != '>';) {
-      size_t name, name_len, val = 0, val_len = 0;
+                for(i += 7; is_space_or_equal(html[i]) || html[i] == '\'';
+                    i++) ;
+                /* Charset */
+                for(len = 0;
+                    i + len < size && html[i + len] != '"'
+                    && html[i + len] != '\'' && html[i + len] != ' '; len++) ;
+                /* No error ? */
+                if (len != 0 && i < size) {
+                  char *const s = malloc(len + 1);
+                  int j;

-      if (is_space(html[j]) || html[j] == '/') {
-        j++;
-        continue;
-      }
-      for (name = j; j < size && html[j] != '=' && html[j] != '>' &&
-                     html[j] != '/' && !is_space(html[j]);
-           j++)
-        ;
-      name_len = j - name;
-      for (; j < size && is_space(html[j]); j++)
-        ;
-      if (j < size && html[j] == '=') {
-        for (j++; j < size && is_space(html[j]); j++)
-          ;
-        if (j < size && (html[j] == '"' || html[j] == '\'')) {
-          const char quote = html[j++];
-
-          for (val = j; j < size && html[j] != quote; j++)
-            ;
-          if (j >= size) /* unterminated quote: drop the tag */
-            break;
-          val_len = j++ - val;
-        } else {
-          /* unquoted: ends at whitespace or '>' only (HTML5 prescan); '/'
-             belongs to the value except as the tail of a self-close */
-          for (val = j; j < size && !is_space(html[j]) && html[j] != '>'; j++)
-            ;
-          val_len = j - val;
-          if (val_len != 0 && j < size && html[j] == '>' &&
-              html[val + val_len - 1] == '/') {
-            val_len--;
+                  for(j = 0; j < len; j++) {
+                    s[j] = html[i + j];
+                  }
+                  s[len] = '\0';
+                  return s;
+                }
+              }
+            }
          }
        }
      }
-      /* first occurrence of each attribute wins, as in browsers */
-      if (val_len != 0) {
-        if (name_len == 7 && strncasecmp(&html[name], "charset", 7) == 0) {
-          return hts_stringMemCopy(&html[val], val_len);
-        } else if (equiv == NULL && name_len == 10 &&
-                   strncasecmp(&html[name], "http-equiv", 10) == 0) {
-          equiv = &html[val];
-          equiv_len = val_len;
-        } else if (content == NULL && name_len == 7 &&
-                   strncasecmp(&html[name], "content", 7) == 0) {
-          content = &html[val];
-          content_len = val_len;
-        }
-      }
    }
-    if (equiv_len == 12 && strncasecmp(equiv, "content-type", 12) == 0 &&
-        content != NULL) {
-      char *const s = charset_from_content(content, content_len);
-
-      if (s != NULL) {
-        return s;
-      }
-    }
-    i = j;
  }
  return NULL;
 }
@@ -1152,45 +1140,17 @@ int hts_isStringUTF8(const char *s, size_t size) {
  const unsigned char *const data = (const unsigned char*) s;
  size_t i;

-  /* Strict RFC 3629: reject overlongs, surrogates, > U+10FFFF, 5/6-byte. */
  for(i = 0 ; i < size ; ) {
-    const unsigned char c = data[i];
-    size_t len, k;
-    hts_UCS4 uc, min;
+    /* Reader: can read bytes up to j */
+#define RD ( i < size ? data[i++] : -1 )

-    if (c < 0x80) {
-      i++;
-      continue;
-    } else if (c >= 0xc2 && c <= 0xdf) {
-      len = 2;
-      min = 0x80;
-      uc = c & 0x1f;
-    } else if (c >= 0xe0 && c <= 0xef) {
-      len = 3;
-      min = 0x800;
-      uc = c & 0x0f;
-    } else if (c >= 0xf0 && c <= 0xf4) {
-      len = 4;
-      min = 0x10000;
-      uc = c & 0x07;
-    } else { /* continuation byte, overlong C0/C1, or F5..FF lead */
-      return 0;
-    }
-    if (size - i < len) {
-      return 0;
-    }
-    for (k = 1; k < len; k++) {
-      const unsigned char cc = data[i + k];
+    /* Writer: a malformed sequence means the string is not UTF-8 (return 0) */
+#define WR(C) if ((C) == -1) { return 0; }

-      if ((cc & 0xc0) != 0x80) {
-        return 0;
-      }
-      uc = (uc << 6) | (cc & 0x3f);
-    }
-    if (uc < min || uc > 0x10FFFF || (uc >= 0xD800 && uc <= 0xDFFF)) {
-      return 0;
-    }
-    i += len;
+    /* Read Unicode character. */
+    READ_UNICODE(RD, WR);
+#undef RD
+#undef WR
  }

  return 1;
--- a/src/htscharset.h
+++ b/src/htscharset.h
@@ -76,8 +76,7 @@ extern char *hts_convertStringIDNAToUTF8(const char *s, size_t size);
 extern int hts_isStringIDNA(const char *s, size_t size);

 /**
- * Extract the <meta> charset from the HTML buffer "html" (HTML5 charset= or
- * legacy http-equiv form). Returns a malloc'ed string, or NULL if none.
+ * Extract the charset from the HTML buffer "html"
 **/
 extern char *hts_getCharsetFromMeta(const char *html, size_t size);

@@ -87,8 +86,7 @@ extern char *hts_getCharsetFromMeta(const char *html, size_t size);
 extern int hts_isStringAscii(const char *s, size_t size);

 /**
- * Is the given string valid UTF-8 ? Strict RFC 3629: overlong forms,
- * surrogates, codepoints above U+10FFFF and 5/6-byte sequences are rejected.
+ * Is the given string an UTF-8 string ?
 **/
 extern int hts_isStringUTF8(const char *s, size_t size);

--- a/src/htscore.c
+++ b/src/htscore.c
@@ -1904,11 +1904,8 @@ int httpmirror(char *url1, httrackp * opt) {
            }
          }

-          // ATTENTION C'EST ICI QU'ON SAUVE LE FICHIER!!
-          // An empty body must not overwrite the file when the transfer failed
-          // (statuscode <= 0, e.g. an -M hard-stop): it would truncate a good
-          // copy to 0 (#77 follow-up).
-          if (r.adr != NULL || (r.size == 0 && r.statuscode > 0)) {
+          // ATTENTION C'EST ICI QU'ON SAUVE LE FICHIER!!          
+          if (r.adr != NULL || r.size == 0) {
            file_notify(opt, urladr(), urlfil(), savename(), 1, 1, r.notmodified);
            if (filesave(opt, r.adr, (int) r.size, savename(), urladr(), urlfil()) !=
                0) {
@@ -1929,6 +1926,7 @@ int httpmirror(char *url1, httrackp * opt) {
               */
            }
          }
+
        }

        /* Parsing of other media types (java, ram..) */
--- a/src/htsdns_selftest.c
+++ b/src/htsdns_selftest.c
@@ -297,26 +297,6 @@ int dns_selftests(httrackp *opt) {
    IPV6_resolver = 0;
  }

-  /* "host:port" resolves as the bare host: the cache/connect path strips
-     ":port" before both the backend and the cache key (#181). */
-  mock_reset_calls();
-  {
-    SOCaddr a;
-    char ip[64];
-    const char *err = NULL;
-
-    /* cache miss: the backend is hit with the stripped host, not "host:port" */
-    CHECK(hts_dns_resolve2(opt, "v6only.test:8080", &a, &err) != NULL);
-    CHECK(mock_find("v6only.test")->calls == 1);
-    /* the bare host shares that one cache entry (stripped key) */
-    CHECK(hts_dns_resolve2(opt, "v6only.test", &a, &err) != NULL);
-    CHECK(mock_find("v6only.test")->calls == 1);
-    /* a port variant of an already-cached host also hits, right address */
-    CHECK(hts_dns_resolve2(opt, "v4only.test:1234", &a, &err) != NULL);
-    SOCaddr_inetntoa(ip, sizeof(ip), a);
-    CHECK(strcmp(ip, "1.2.3.4") == 0);
-  }
-
  /* newhttp_addr() must connect to the addr_index-th address, not always the
     first: this is what back_connect_next relies on to reach the fallback. */
  {
--- a/src/htsglobal.h
+++ b/src/htsglobal.h
@@ -43,8 +43,8 @@ Please visit our Website: http://www.httrack.com
   configure.ac, decoupled from these). VERSION is the display form, VERSIONID
   the dotted numeric form, AFF_VERSION the short form shown in footers,
   LIB_VERSION the data/cache format generation. */
-#define HTTRACK_VERSION "3.49-12"
-#define HTTRACK_VERSIONID "3.49.12"
+#define HTTRACK_VERSION "3.49-11"
+#define HTTRACK_VERSIONID "3.49.11"
 #define HTTRACK_AFF_VERSION "3.x"
 #define HTTRACK_LIB_VERSION "2.0"

--- a/src/htsparse.c
+++ b/src/htsparse.c
@@ -2007,7 +2007,7 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {

                /* Unescape/escape %20 and other &nbsp; */
                {
-                  // NULL when UTF-8 conversion is off (-%T0)
+                  // Note: always true (iso-8859-1 as default)
                  const char *const charset = str->page_charset_;
                  const int hasCharset = charset != NULL 
                    && *charset != '\0';
@@ -2030,12 +2030,11 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {

                  // Force to encode non-printable chars (should never happend)
                  escape_remove_control(lien);
-
-                  // charset conversion for the URI filename (not the query
-                  // string), unless the bytes already are valid UTF-8:
-                  // converting those would double-encode them (#180)
-                  if (hasCharset && !hts_isCharsetUTF8(charset) &&
-                      !hts_isStringUTF8(lien, strlen(lien))) {
+                  
+                  // charset conversion for the URI filename, 
+                  // and not already UTF-8
+                  // (note: not for the query string!)
+                  if (hasCharset && !hts_isCharsetUTF8(charset)) {
                    char *const s = hts_convertStringToUTF8(lien, strlen(lien), charset);
                    if (s != NULL) {
                      hts_log_print(opt, LOG_DEBUG,
--- a/src/htsselftest.c
+++ b/src/htsselftest.c
@@ -788,30 +788,6 @@ static int st_charset(httrackp *opt, int argc, char **argv) {
  return 0;
 }

-static int st_metacharset(httrackp *opt, int argc, char **argv) {
-  char *s;
-
-  (void) opt;
-  if (argc < 1) {
-    fprintf(stderr, "metacharset: needs an html string\n");
-    return 1;
-  }
-  s = hts_getCharsetFromMeta(argv[0], strlen(argv[0]));
-  printf("%s\n", s != NULL ? s : "(none)");
-  freet(s);
-  return 0;
-}
-
-static int st_isutf8(httrackp *opt, int argc, char **argv) {
-  (void) opt;
-  if (argc < 1) {
-    fprintf(stderr, "isutf8: needs a string\n");
-    return 1;
-  }
-  printf("%d\n", hts_isStringUTF8(argv[0], strlen(argv[0])) ? 1 : 0);
-  return 0;
-}
-
 static int st_idna_encode(httrackp *opt, int argc, char **argv) {
  char *s;

@@ -2147,19 +2123,6 @@ static int ae_write_collision(const char *path, const unsigned char *src,
  return ok ? 0 : 1;
 }

-/* Write src[0..len) to path as-is; 0 on success. */
-static int ae_write_raw(const char *path, const unsigned char *src,
-                        size_t len) {
-  FILE *const f = FOPEN(path, "wb");
-  int ok;
-
-  if (f == NULL)
-    return 1;
-  ok = fwrite(src, 1, len, f) == len;
-  fclose(f);
-  return ok ? 0 : 1;
-}
-
 /* Compare path's bytes to expect[0..len); 0 if equal. Streams (large files). */
 static int ae_check_decoded(const char *path, const unsigned char *expect,
                            size_t len) {
@@ -2227,46 +2190,6 @@ static int st_acceptencoding(httrackp *opt, int argc, char **argv) {
    assertf(ae_write_collision(inpath, body, 64) == 0);
    assertf(hts_zunpack(inpath, outpath) == 64);
    assertf(ae_check_decoded(outpath, body, 64) == 0);
-    /* Identity fallback (#47): a plain body mislabeled as compressed is kept
-       verbatim, small and multi-chunk (> one 8 KiB fread). */
-    assertf(ae_write_raw(inpath, small, slen) == 0);
-    assertf(hts_zunpack(inpath, outpath) == (int) slen);
-    assertf(ae_check_decoded(outpath, small, slen) == 0);
-    {
-      const size_t ilen = 16 * 1024;
-      unsigned char *idbody = malloct(ilen);
-
-      assertf(idbody != NULL);
-      for (i = 0; i < ilen; i++)
-        idbody[i] = small[i % slen];
-      assertf(ae_write_raw(inpath, idbody, ilen) == 0);
-      assertf(hts_zunpack(inpath, outpath) == (int) ilen);
-      assertf(ae_check_decoded(outpath, idbody, ilen) == 0);
-      freet(idbody);
-    }
-    /* Truncated gzip (CRC+ISIZE cut), zlib (ADLER32 cut) and raw deflate
-       must all still fail, not fall back to a verbatim copy. */
-    {
-      static const struct {
-        int wb;
-        size_t cut;
-      } tr[] = {{16 + MAX_WBITS, 8}, {MAX_WBITS, 4}, {-MAX_WBITS, 5}};
-
-      for (i = 0; i < sizeof(tr) / sizeof(tr[0]); i++) {
-        unsigned char z[512];
-        size_t zlen;
-        FILE *f;
-
-        assertf(ae_write_packed(inpath, tr[i].wb, small, slen) == 0);
-        f = FOPEN(inpath, "rb");
-        assertf(f != NULL);
-        zlen = fread(z, 1, sizeof(z), f);
-        fclose(f);
-        assertf(zlen > tr[i].cut && zlen < sizeof(z));
-        assertf(ae_write_raw(inpath, z, zlen - tr[i].cut) == 0);
-        assertf(hts_zunpack(inpath, outpath) < 0);
-      }
-    }
    freet(body);
  }
 #else
@@ -2471,9 +2394,6 @@ static const struct selftest_entry {
    {"mime", "<filename>", "MIME type for a filename", st_mime},
    {"charset", "<charset> <string>",
     "convert a string to UTF-8 from a charset", st_charset},
-    {"metacharset", "<html>", "extract the <meta> charset from an HTML page",
-     st_metacharset},
-    {"isutf8", "<string>", "is the string valid UTF-8 (1/0)", st_isutf8},
    {"idna-encode", "<host>", "encode a hostname to IDNA/punycode",
     st_idna_encode},
    {"idna-decode", "<host>", "decode an IDNA/punycode hostname",
--- a/src/htszlib.c
+++ b/src/htszlib.c
@@ -48,7 +48,6 @@ Please visit our Website: http://www.httrack.com

 /*
  Unpack file into a new file (gzip, zlib RFC1950 or raw deflate RFC1951).
-  A body provably in no deflate framing is copied verbatim (identity).
  Return value: size of the new file, or -1 if an error occurred
 */
 /* Note: utf-8 */
@@ -69,10 +68,6 @@ int hts_zunpack(char *filename, char *newfile) {
            ((inbuf[0] & 0x0f) == Z_DEFLATED &&
             (((unsigned) inbuf[0] << 8 | inbuf[1]) % 31) == 0)));
      int attempt;
-      /* not_deflate: the raw attempt hit a data error, so the body is in no
-         deflate framing at all. env_error: local I/O or memory failure. */
-      hts_boolean not_deflate = HTS_FALSE;
-      hts_boolean env_error = HTS_FALSE;

      /* deflate is ambiguous; on failure retry with the other windowBits */
      for (attempt = 0; attempt < 2 && ret < 0; attempt++) {
@@ -83,20 +78,15 @@ int hts_zunpack(char *filename, char *newfile) {

        if (attempt > 0) {
          /* rewind input; reopening fpout "wb" discards the partial output */
-          if (fseek(in, 0, SEEK_SET) != 0) {
-            env_error = HTS_TRUE;
+          if (fseek(in, 0, SEEK_SET) != 0)
            break;
-          }
          navail = fread(inbuf, 1, sizeof(inbuf), in);
        }
        fpout = FOPEN(fconv(catbuff, sizeof(catbuff), newfile), "wb");
-        if (fpout == NULL) {
-          env_error = HTS_TRUE;
+        if (fpout == NULL)
          break;
-        }
        memset(&strm, 0, sizeof(strm));
        if (inflateInit2(&strm, windowBits) != Z_OK) {
-          env_error = HTS_TRUE;
          fclose(fpout);
          break;
        }
@@ -118,17 +108,12 @@ int hts_zunpack(char *filename, char *newfile) {
              zerr = inflate(&strm, Z_NO_FLUSH);
              if (zerr == Z_NEED_DICT || zerr == Z_DATA_ERROR ||
                  zerr == Z_MEM_ERROR || zerr == Z_STREAM_ERROR) {
-                if (zerr == Z_MEM_ERROR || zerr == Z_STREAM_ERROR)
-                  env_error = HTS_TRUE;
-                else if (windowBits < 0)
-                  not_deflate = HTS_TRUE;
                ok = HTS_FALSE;
                break;
              }
              produced = sizeof(outbuf) - strm.avail_out;
              if (produced > 0 &&
                  fwrite(outbuf, 1, produced, fpout) != produced) {
-                env_error = HTS_TRUE;
                ok = HTS_FALSE;
                break;
              }
@@ -144,28 +129,6 @@ int hts_zunpack(char *filename, char *newfile) {
        inflateEnd(&strm);
        fclose(fpout);
      }
-      /* keep a mislabeled identity body verbatim only when provably not
-         deflate; truncation or a local failure must keep failing (#47) */
-      if (ret < 0 && !wrapped && not_deflate && !env_error && !ferror(in)) {
-        FILE *const fpout =
-            FOPEN(fconv(catbuff, sizeof(catbuff), newfile), "wb");
-
-        if (fpout != NULL && fseek(in, 0, SEEK_SET) == 0) {
-          int size = 0;
-
-          while ((navail = fread(inbuf, 1, sizeof(inbuf), in)) > 0) {
-            if (fwrite(inbuf, 1, navail, fpout) != navail) {
-              size = -1;
-              break;
-            }
-            size += (int) navail;
-          }
-          if (size >= 0 && !ferror(in))
-            ret = size;
-        }
-        if (fpout != NULL)
-          fclose(fpout);
-      }
      fclose(in);
    }
  }
--- a/tests/01_engine-charset.test
+++ b/tests/01_engine-charset.test
@@ -36,64 +36,3 @@ test "$(httrack -O /dev/null -#test=charset 'no-such-charset-xyz' 'café' 2>/dev
 # malformed UTF-8 (lone continuation byte, truncated lead byte) must not crash
 runs 'utf-8' $'\x80'
 runs 'utf-8' $'\xc3'
-
-# hts_getCharsetFromMeta: <meta> charset extraction, HTML5 and legacy forms.
-# -#test=metacharset <html> prints the charset, or "(none)".
-meta() {
-    test "$(httrack -O /dev/null -#test=metacharset "$1")" == "$2" || exit 1
-}
-
-# HTML5 form, quoting/spacing flavors
-meta '<meta charset="utf-8">' 'utf-8'
-meta "<meta charset='utf-8'>" 'utf-8'
-meta '<meta charset=utf-8>' 'utf-8'
-meta '<meta charset=utf-8 />' 'utf-8'
-meta '<meta charset=utf-8/>' 'utf-8'
-# charset labels are case-insensitive downstream; only require case-insensitive match
-test "$(httrack -O /dev/null -#test=metacharset '<META CHARSET=UTF-8>' | tr '[:upper:]' '[:lower:]')" == 'utf-8' || exit 1
-meta '<html><head><meta   charset = "utf-8"  ></head>' 'utf-8'
-
-# legacy http-equiv form, attributes in any order
-meta '<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">' 'iso-8859-1'
-meta '<meta content="text/html; charset=gb2312" http-equiv="content-type">' 'gb2312'
-meta '<meta http-equiv=Content-Type content="text/html;charset=euc-jp">' 'euc-jp'
-meta '<meta http-equiv="Content-Type" content="text/html; charset = koi8-r ">' 'koi8-r'
-meta '<meta http-equiv="Content-Type" content="text/html; charset=utf-8;">' 'utf-8'
-meta '<meta http-equiv=content-type content=text/html;charset=utf-8 />' 'utf-8'
-meta '<meta http-equiv=content-type content=text/html;charset=utf-8>' 'utf-8'
-
-# first resolvable meta wins; unrelated metas are skipped
-meta '<meta name="viewport" content="width=1"><meta charset="koi8-r">' 'koi8-r'
-meta '<meta charset="utf-8"><meta http-equiv="Content-Type" content="text/html; charset=gb2312">' 'utf-8'
-
-# duplicate attribute: first wins, as in browsers
-meta '<meta http-equiv="Content-Type" content="text/html; charset=big5" http-equiv="refresh">' 'big5'
-
-# negatives: wrong tag/attribute, empty value
-meta '<p>x</p>' '(none)'
-meta '<meta name="desc" content="charset=bogus">' '(none)'
-meta '<meta http-equiv="refresh" content="0; url=x.html">' '(none)'
-meta '<body charset="utf-8">' '(none)'
-meta '<meta charset="">' '(none)'
-
-# hostile truncations: no crash, no match
-meta '<meta charset="utf-8' '(none)'
-meta '<meta charset=' '(none)'
-meta '<meta ' '(none)'
-meta '<meta' '(none)'
-
-# hts_isStringUTF8: valid-UTF-8 probe (guards the #180 link conversion).
-utf8() {
-    test "$(httrack -O /dev/null -#test=isutf8 "$1")" == "$2" || exit 1
-}
-utf8 'plain' '1'
-utf8 'café' '1'
-utf8 '统计' '1'
-utf8 "$(printf 'caf\xe9')" '0'              # latin-1 accent
-utf8 "$(printf '\xc3')" '0'                 # truncated lead byte
-utf8 "$(printf '\xa9')" '0'                 # lone continuation byte
-utf8 "$(printf '\xf0\x9f\x98\x80')" '1'     # 4-byte emoji
-utf8 "$(printf '\xc0\xaf')" '0'             # overlong (latin-1 "À¯" must stay convertible)
-utf8 "$(printf '\xed\xa0\x80')" '0'         # UTF-16 surrogate
-utf8 "$(printf '\xf4\x90\x80\x80')" '0'     # above U+10FFFF
-utf8 "$(printf '\xf8\x88\x80\x80\x80')" '0' # legacy 5-byte form
--- a/tests/11_crawl-international.test
+++ b/tests/11_crawl-international.test
@@ -22,9 +22,9 @@ bash crawl-test.sh \
    httrack http://ut.httrack.com/unicode-links/utf8.html

 bash crawl-test.sh \
-    --errors 2 --files 9 \
-    --found ut.httrack.com/unicode-links/café3860.html \
-    --found ut.httrack.com/unicode-links/café9fa8.html \
+    --errors 4 --files 7 \
+    --found ut.httrack.com/unicode-links/cafÃ©3860.html \
+    --found ut.httrack.com/unicode-links/cafÃ©9fa8.html \
    --found ut.httrack.com/unicode-links/café30f4.html \
    --found ut.httrack.com/unicode-links/café5e1f.html \
    --found ut.httrack.com/unicode-links/café7b30.html \
--- a/tests/36_local-bigcrawl.test
+++ b/tests/36_local-bigcrawl.test
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Diverse seeded /big/ crawl: 12 pattern families, decoy absence, update pass
-# must 304-revalidate. 361 = 1 index + 96 pages + 192 imgs + 5 shared + 61
+# must 304-revalidate. 360 = 1 index + 96 pages + 192 imgs + 5 shared + 60
 # family + 6 singles; the 4 planted errors write -o1 pages, not counted.

 set -euo pipefail
@@ -9,7 +9,7 @@ set -euo pipefail
 : "${top_srcdir:=..}"

 bash "$top_srcdir/tests/local-crawl.sh" --rerun \
-    --errors 4 --files 361 \
+    --errors 4 --files 360 \
    --found 'big/p/95.html' \
    --found 'big/a/d1/d2/d3/d4/d5/d6/d7/d8/deep.png' \
    --found 'big/a/f2-2x.png' \
@@ -40,7 +40,6 @@ bash "$top_srcdir/tests/local-crawl.sh" --rerun \
    --not-found 'big/x/bj.jar' \
    --not-found 'big/x/is1.png' \
    --not-found 'big/x/concat.html' \
-    --file-matches 'big/f1/gzid.html' '<p>gzid</p>' \
    --file-matches 'big/p/2.html' 'srcset="\.\./a/f2-1x\.png 1x, \.\./a/f2-2x\.png 2x"' \
    --file-matches 'big/a/blk2.css' 'url\(blk2-bg\.png\)' \
    --file-matches 'big/p/5.html' "document\\.write\\('<a href=\"\\.\\./f5/dw\\.html\"" \
--- a/tests/41_local-utf8-link.test
+++ b/tests/41_local-utf8-link.test
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# #180: raw non-ASCII hrefs must reach the wire UTF-8 percent-encoded whatever
-# the declared page charset; each PDF exists only at its exact UTF-8 path.
-
-set -euo pipefail
-: "${top_srcdir:=..}"
-
-bash "$top_srcdir/tests/local-crawl.sh" --errors 0 --rerun \
-    --found 'charset/header/统计大数据服务平台.pdf' \
-    --found 'charset/meta5/统计大数据服务平台.pdf' \
-    --found 'charset/metaeq/统计大数据服务平台.pdf' \
-    --found 'charset/none/统计大数据服务平台.pdf' \
-    --found 'charset/latin1hdr/统计大数据服务平台.pdf' \
-    --found 'charset/latin1real/café.pdf' \
-    --found 'charset/metalatin1/déjà.pdf' \
-    --found 'charset/latin1ovl/À¡x.pdf' \
-    --found 'charset/priority/nuée.pdf' \
-    --found 'charset/preenc/统计大数据服务平台.pdf' \
-    --found 'charset/bom/统计大数据服务平台.pdf' \
-    httrack 'BASEURL/charset/index.html'
--- a/tests/42_local-maxsize-slow.test
+++ b/tests/42_local-maxsize-slow.test
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# -M byte cap under a slow server (#77): p0 overruns -M at once while p1..p3
-# trickle for a minute; the cap must abort the in-flight transfers, not wait
-# them out. Unfixed, the smooth stop drains the trickle at server pace.
-
-set -euo pipefail
-
-: "${top_srcdir:=..}"
-
-start=$(date +%s)
-bash "$top_srcdir/tests/local-crawl.sh" \
-    --log-found 'More than 400000 bytes have been transferred.. giving up' \
-    httrack 'BASEURL/bigtrickle/index.html' -M400000 -c4
-wall=$(($(date +%s) - start))
-# trickle runs 60s; a smooth-only stop waits it out, the hard stop lands near 8s.
-# Wall clock is the discriminating check: the log line above fires either way.
-if [ "$wall" -ge 30 ]; then
-    echo "crawl took ${wall}s, -M hard stop did not engage" >&2
-    exit 1
-fi
--- a/tests/43_local-update-truncate.test
+++ b/tests/43_local-update-truncate.test
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# -M hard-abort must not destroy already-complete files (#77 follow-up).
-# Pass 1 mirrors bigtrunc fully. Pass 2 re-fetches under --update -M: fast.bin
-# overruns the cap, its abort tears down slow.bin's stalled re-fetch. Both were
-# complete on disk from pass 1, and both must survive the aborted update:
-#   - slow.bin's re-fetch is incomplete; the direct-to-disk write must not be
-#     left truncated (the previous copy is restored).
-#   - fast.bin fully arrives but is torn down; the aborted slot must not overwrite
-#     it with an empty body.
-# Unfixed, slow.bin is truncated and fast.bin is zeroed while the cache still
-# records them complete.
-
-set -euo pipefail
-
-: "${top_srcdir:=..}"
-
-bash "$top_srcdir/tests/local-crawl.sh" \
-    --rerun-args '--update -M400000' \
-    --log-found 'More than 400000 bytes have been transferred.. giving up' \
-    --found bigtrunc/slow.bin \
-    --file-min-bytes bigtrunc/slow.bin 655360 \
-    --file-min-bytes bigtrunc/fast.bin 655360 \
-    httrack 'BASEURL/bigtrunc/index.html' -c2
--- a/tests/44_local-update-errormask.test
+++ b/tests/44_local-update-errormask.test
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Issue #176: on --update a page that 200'd on the first crawl but now 403s must
-# keep its good local copy, not be overwritten by the error body nor purged.
-set -euo pipefail
-
-: "${top_srcdir:=..}"
-
-bash "$top_srcdir/tests/local-crawl.sh" --rerun \
-    --found 'errmask/keep.dat' \
-    --file-min-bytes 'errmask/keep.dat' 1024 \
-    httrack 'BASEURL/errmask/index.html'
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -109,10 +109,6 @@ TESTS = \
 	37_local-cache-outage.test \
 	38_local-update-304.test \
 	39_local-delayed-cancel.test \
-	40_local-why.test \
-	41_local-utf8-link.test \
-	42_local-maxsize-slow.test \
-	43_local-update-truncate.test \
-	44_local-update-errormask.test
+	40_local-why.test

 CLEANFILES = check-network_sh.cache
--- a/tests/local-crawl.sh
+++ b/tests/local-crawl.sh
@@ -13,19 +13,15 @@
 #
 # Usage:
 #   bash local-crawl.sh [--tls] [--root DIR] [--cookie NAME=VALUE ...] \
-#       [--rerun-args 'ARGS'] \
 #       --errors N --files N --found PATH ... --directory PATH ... \
 #       --log-found REGEX ... --log-not-found REGEX ... \
 #       --file-matches PATH REGEX ... --file-not-matches PATH REGEX ... \
-#       --file-min-bytes PATH N --max-mirror-bytes N \
+#       --max-mirror-bytes N \
 #       httrack BASEURL/some/path [httrack-args...]
 # --log-found/--log-not-found grep (ERE) the crawl's hts-log.txt.
 # --max/--min-mirror-bytes bound the mirrored content bytes (host root).
 # --file-matches/--file-not-matches grep (ERE) a mirrored file (PATH under the
 # host root), to assert rewritten link/content survived the crawl.
-# --file-min-bytes asserts a mirrored file (PATH) is at least N bytes.
-# --rerun-args runs a second pass (same server and mirror dir) with the given
-# extra httrack args appended, e.g. an --update run under a cap.
 # --cookie writes a Netscape cookies.txt (scoped to the discovered host:port,
 # which the ephemeral port forces into the cookie domain) and passes it to
 # httrack via --cookies-file, to exercise preloaded cookies.
@@ -43,7 +39,6 @@ key="${testdir}/server.key"
 tls=
 verbose=
 rerun=
-rerun_args=
 rerun_dead=
 tmpdir=
 serverpid=
@@ -127,10 +122,6 @@ while test "$pos" -lt "$nargs"; do
        pos=$((pos + 1))
        cookies+=("${args[$pos]}")
        ;;
-    --rerun-args)
-        pos=$((pos + 1))
-        rerun_args="${args[$pos]}"
-        ;;
    --errors | --files)
        audit+=("${args[$pos]}" "${args[$((pos + 1))]}")
        pos=$((pos + 1))
@@ -139,7 +130,7 @@ while test "$pos" -lt "$nargs"; do
        audit+=("${args[$pos]}" "${args[$((pos + 1))]}")
        pos=$((pos + 1))
        ;;
-    --file-matches | --file-not-matches | --file-min-bytes)
+    --file-matches | --file-not-matches)
        audit+=("${args[$pos]}" "${args[$((pos + 1))]}" "${args[$((pos + 2))]}")
        pos=$((pos + 2))
        ;;
@@ -250,25 +241,6 @@ if test -n "$rerun"; then
    fi
 fi

-# --- optional second pass with extra args (e.g. an --update run under a cap) ---
-# Same server and mirror dir as the first pass, so the second pass sees the
-# cache the first pass wrote. Used to exercise re-fetch/update behaviour.
-if test -n "$rerun_args"; then
-    read -ra extra <<<"$rerun_args"
-    info "re-running httrack with ${rerun_args}"
-    httrack -O "$out" --user-agent="httrack $ver local ($(uname -omrs))" \
-        "${moreargs[@]}" "${hts[@]}" "${extra[@]}" >"${log}.2" 2>&1 &
-    crawlpid=$!
-    wait "$crawlpid"
-    crawlres=$?
-    crawlpid=
-    test "$crawlres" -eq 0 || ! result "second pass exited $crawlres" || {
-        cat "${log}.2" >&2
-        exit 1
-    }
-    result "OK (second pass)"
-fi
-
 # --- optional dead pass: server stopped, the cache must survive the rollback --
 if test -n "$rerun_dead"; then
    zip="${out}/hts-cache/new.zip"
@@ -416,16 +388,6 @@ while test "$i" -lt "${#audit[@]}"; do
            exit 1
        else result "OK"; fi
        ;;
-    --file-min-bytes)
-        path="${audit[$((i + 1))]}"
-        i=$((i + 2))
-        sz=$(wc -c <"${hostroot}/${path}" 2>/dev/null | tr -d '[:space:]')
-        info "checking ${path} size ${sz:-0} >= ${audit[$i]} bytes"
-        if test -n "$sz" && test "$sz" -ge "${audit[$i]}"; then result "OK"; else
-            result "file too small (or missing)"
-            exit 1
-        fi
-        ;;
    esac
    i=$((i + 1))
 done
--- a/tests/local-server.py
+++ b/tests/local-server.py
@@ -374,7 +374,6 @@ def big_index(port):
        '<img src="/big/a/d1/d2/d3/d4/d5/d6/d7/d8/deep.png">'
        '<a href="/big/f1/long.html?x=%s">long</a>'
        '<a href="/big/f1/gzok.html">gzok</a>'
-        '<a href="/big/f1/gzid.html">gzid</a>'
        '<a href="//127.0.0.1:%d/big/f1/protorel.html">protorel</a>'
        '<a href="http://127.0.0.1:%d/big/f1/abshost.html">abshost</a>'
        '<a href="/big/e/404.html">e404</a>'
@@ -400,7 +399,6 @@ BIG_SIMPLE_PAGES = {
    "/big/f1/dir/": "dir index",
    "/big/f1/long.html": "long",
    "/big/f1/gzok.html": "gzok",
-    "/big/f1/gzid.html": "gzid",
    "/big/f1/protorel.html": "protorel",
    "/big/f1/abshost.html": "abshost",
    "/big/f5/dw.html": "dw target",
@@ -662,97 +660,6 @@ class Handler(SimpleHTTPRequestHandler):
    def route_intl_page(self):
        self.send_raw(b"<html><body>accented page</body></html>\n", "text/html")

-    # Raw non-ASCII href matrix (#180): each variant declares the page charset
-    # differently; the PDF exists only at its exact UTF-8 path, so a
-    # mis-decoded link 404s.
-    CHARSET_CJK = "统计大数据服务平台.pdf"
-    # variant -> (index Content-Type, <head> bytes, href bytes, pdf name)
-    CHARSET_VARIANTS = {
-        "header": ("text/html; charset=utf-8", b"", CHARSET_CJK.encode(), CHARSET_CJK),
-        "meta5": (
-            "text/html",
-            b'<meta charset="utf-8">',
-            CHARSET_CJK.encode(),
-            CHARSET_CJK,
-        ),
-        "metaeq": (
-            "text/html",
-            b'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">',
-            CHARSET_CJK.encode(),
-            CHARSET_CJK,
-        ),
-        "none": ("text/html", b"", CHARSET_CJK.encode(), CHARSET_CJK),
-        "latin1hdr": (
-            "text/html; charset=iso-8859-1",
-            b"",
-            CHARSET_CJK.encode(),
-            CHARSET_CJK,
-        ),
-        # genuine latin-1 href: the charset conversion must still apply
-        "latin1real": (
-            "text/html; charset=iso-8859-1",
-            b"",
-            "café.pdf".encode("latin-1"),
-            "café.pdf",
-        ),
-        # latin-1 declared by META only: the meta parser is load-bearing
-        "metalatin1": (
-            "text/html",
-            b'<meta charset="iso-8859-1">',
-            "déjà.pdf".encode("latin-1"),
-            "déjà.pdf",
-        ),
-        # latin-1 bytes that form an overlong UTF-8 shape: strict validation
-        # must still convert them
-        "latin1ovl": (
-            "text/html; charset=iso-8859-1",
-            b"",
-            "À¡x.pdf".encode("latin-1"),
-            "À¡x.pdf",
-        ),
-        # header wins over meta: latin-1 href only resolves if iso-8859-1 is kept
-        "priority": (
-            "text/html; charset=iso-8859-1",
-            b'<meta charset="utf-8">',
-            "nuée.pdf".encode("latin-1"),
-            "nuée.pdf",
-        ),
-        "preenc": ("text/html", b"", quote(CHARSET_CJK).encode(), CHARSET_CJK),
-        "bom": ("text/html", b"", CHARSET_CJK.encode(), CHARSET_CJK),
-    }
-
-    def route_charset(self):
-        path = unquote(urlsplit(self.path).path)
-        parts = path.split("/")
-        if path == "/charset/index.html":
-            self.send_html(
-                "".join(
-                    '\t<a href="%s/index.html">%s</a>\n' % (v, v)
-                    for v in self.CHARSET_VARIANTS
-                )
-            )
-            return
-        if len(parts) == 4 and parts[2] in self.CHARSET_VARIANTS:
-            ctype, head, href, pdf = self.CHARSET_VARIANTS[parts[2]]
-            if parts[3] == "index.html":
-                body = (
-                    b"<html><head>"
-                    + head
-                    + b'</head><body><a href="'
-                    + href
-                    + b'">doc</a></body></html>'
-                )
-                if parts[2] == "bom":
-                    body = b"\xef\xbb\xbf" + body
-                self.send_raw(body, ctype)
-                return
-            if parts[3] == pdf:
-                self.send_raw(self.FAKE_PDF, "application/pdf")
-                return
-        self.send_response(404)
-        self.send_header("Content-Length", "0")
-        self.end_headers()
-
    # resume / 416 loop (#206): the first GET stalls after a prefix so the crawl
    # can be interrupted (partial + temp-ref); every later request is 416.
    RESUME_PREFIX = b"PARTIAL-" + b"x" * 4096  # flushed before the stall
@@ -934,33 +841,6 @@ class Handler(SimpleHTTPRequestHandler):
    def route_mini304_page(self):
        self.big_send(b"<html><body>tiny cacheable page</body></html>\n", "text/html")

-    # --- /errmask/: issue #176 — a page that 200'd on the first crawl but 403s
-    # on the update fetch must keep its good copy, not be overwritten nor purged.
-    ERRMASK_GOOD = b"KEEP" + b"." * 1020  # 1024 B distinctive non-HTML body
-    ERRMASK_ERR = b"<html><body>error 403</body></html>\n"
-
-    def route_errmask_index(self):
-        self.send_html('\t<a href="keep.dat">keep</a>\n')
-
-    def route_errmask_keep(self):
-        # First crawl (no validator) gets the 1024 B body + Last-Modified; the
-        # update sends a conditional and gets a 403 error page.
-        if self.headers.get("If-Modified-Since") or self.headers.get("If-None-Match"):
-            self.send_response(403, "Forbidden")
-            self.send_header("Content-Type", "text/html")
-            self.send_header("Content-Length", str(len(self.ERRMASK_ERR)))
-            self.end_headers()
-            if self.command != "HEAD":
-                self.wfile.write(self.ERRMASK_ERR)
-            return
-        self.send_response(200)
-        self.send_header("Content-Type", "application/octet-stream")
-        self.send_header("Last-Modified", BIG_LASTMOD)
-        self.send_header("Content-Length", str(len(self.ERRMASK_GOOD)))
-        self.end_headers()
-        if self.command != "HEAD":
-            self.wfile.write(self.ERRMASK_GOOD)
-
    # --- delayed-type degenerate paths (issues #5/#107) --------------------
    def route_delayed_index(self):
        self.send_html(
@@ -1062,48 +942,6 @@ class Handler(SimpleHTTPRequestHandler):
    def route_bigfile(self):
        self.send_raw(b"x" * self.BIGFILE_BYTES, "application/octet-stream")

-    # -M under a slow server (#77): p0 is a fast 640KB file that alone overruns
-    # -M; p1..p3 trickle for a minute. The cap must abort those in-flight
-    # transfers, not wait them out.
-    def route_bigtrickle_index(self):
-        self.send_html(
-            "".join('\t<a href="p%d.bin">p%d</a>\n' % (i, i) for i in range(4))
-        )
-
-    # -M hard-abort must not destroy an already-complete file (#77 follow-up).
-    # "fast.bin" alone overruns -M and completes; "slow.bin" transfers fully on
-    # its first fetch (initial mirror) but stalls on every later fetch (the
-    # --update re-fetch), so the -M abort tears it down mid-body. An engine that
-    # truncates the good local copy on the aborted re-fetch loses data.
-    slow_seen = 0
-
-    def route_bigtrunc_index(self):
-        self.send_html('\t<a href="fast.bin">fast</a>\n\t<a href="slow.bin">slow</a>\n')
-
-    def route_bigtrunc_slow(self):
-        self.send_response(200)
-        self.send_header("Content-Type", "application/octet-stream")
-        self.send_header("Content-Length", str(self.BIGFILE_BYTES))
-        self.end_headers()
-        if self.command == "HEAD":
-            return
-        # Count body fetches only, so a stray HEAD can't shift which pass stalls.
-        Handler.slow_seen += 1
-        first = Handler.slow_seen == 1
-        try:
-            if first:
-                self.wfile.write(b"x" * self.BIGFILE_BYTES)
-                self.wfile.flush()
-            else:
-                self.wfile.write(b"x" * 4096)
-                self.wfile.flush()
-                for _ in range(120):
-                    self.wfile.write(b"x")
-                    self.wfile.flush()
-                    time.sleep(1.0)
-        except OSError:
-            pass
-
    ROUTES = {
        "/cookies/entrance.php": route_entrance,
        "/cookies/second.php": route_second,
@@ -1176,14 +1014,6 @@ class Handler(SimpleHTTPRequestHandler):
        "/bigfiles/p5.bin": route_bigfile,
        "/bigfiles/p6.bin": route_bigfile,
        "/bigfiles/p7.bin": route_bigfile,
-        "/bigtrickle/index.html": route_bigtrickle_index,
-        "/bigtrickle/p0.bin": route_bigfile,
-        "/bigtrickle/p1.bin": route_trickle_page,
-        "/bigtrickle/p2.bin": route_trickle_page,
-        "/bigtrickle/p3.bin": route_trickle_page,
-        "/bigtrunc/index.html": route_bigtrunc_index,
-        "/bigtrunc/fast.bin": route_bigfile,
-        "/bigtrunc/slow.bin": route_bigtrunc_slow,
        "/delayed/noloc.php": route_delayed_noloc,
        "/delayed/selfloop.php": route_delayed_selfloop,
        "/delayed/redir.php": route_delayed_redir,
@@ -1204,8 +1034,6 @@ class Handler(SimpleHTTPRequestHandler):
        "/redir/target.html": route_redir_target,
        "/mini304/index.html": route_mini304_index,
        "/mini304/page.html": route_mini304_page,
-        "/errmask/index.html": route_errmask_index,
-        "/errmask/keep.dat": route_errmask_keep,
    }

    # --- /big/ seeded pseudo-site ------------------------------------------
@@ -1251,13 +1079,6 @@ class Handler(SimpleHTTPRequestHandler):
                    "text/html",
                    extra=[("Content-Encoding", "gzip")],
                )
-            elif path == "/big/f1/gzid.html":
-                # Plain body mislabeled as gzip: identity fallback keeps it (#47)
-                self.big_send(
-                    body,
-                    "text/html",
-                    extra=[("Content-Encoding", "gzip")],
-                )
            else:
                self.big_send(body, "text/html")
        elif path == "/big/f1/list.html":
@@ -1373,9 +1194,6 @@ class Handler(SimpleHTTPRequestHandler):
        if path.startswith("/big/"):
            self.route_big()
            return True
-        if path.startswith("/charset/"):
-            self.route_charset()
-            return True
        # Match percent-encoded paths (accented #157 route) by their decoded form.
        handler = self.ROUTES.get(path) or self.ROUTES.get(unquote(path))
        if handler is not None:
				`@@ -1 +0,0 @@`
				`<meta content="text/html; charset=gb2312" http-equiv="content-type">`