ci: add a no-python3 job reproducing the Debian buildd chroot

GitHub runners ship python3, so every make-check job exercised the
python3-present path and the local-server tests never skipped. The Debian
buildds build in a minimal chroot with no python3, where those tests must
SKIP (exit 77) -- and 28_local-pause failed there instead, FTBFS on every
arch for 3.49.10-1, invisible to CI.

Add a job that builds, removes python3, and runs make check, so the skip
path is exercised on every PR. Verified to fail on the pre-fix tree and pass
after.

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

.github/workflows/ci.yml

@@ -269,8 +269,8 @@ jobs:
           MSAN_OPTIONS: abort_on_error=1:halt_on_error=1
         run: |
           set -euo pipefail
-          # Engine self-tests only; cache + acceptencoding pull in uninstrumented zlib.
-          tests="$(cd tests && ls 01_engine-*.test | grep -vE -- '-cache|-acceptencoding' | tr '\n' ' ')"
+          # Engine self-tests only; the cache trio pulls in uninstrumented zlib.
+          tests="$(cd tests && ls 01_engine-*.test | grep -v -- '-cache' | tr '\n' ' ')"
           make check TESTS="$tests"
 
       - name: Print the test log on failure

src/htsbasenet.h

@@ -129,8 +129,6 @@ typedef enum HTTPStatusCode {
   HTTP_UNSUPPORTED_MEDIA_TYPE = 415,
   HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416,
   HTTP_EXPECTATION_FAILED = 417,
-  HTTP_TOO_MANY_REQUESTS = 429,
-  HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451,
   HTTP_INTERNAL_SERVER_ERROR = 500,
   HTTP_NOT_IMPLEMENTED = 501,
   HTTP_BAD_GATEWAY = 502,

src/htscatchurl.c

@@ -64,7 +64,7 @@ Please visit our Website: http://www.httrack.com
 // catch_url_init(&port,&return_host);
 HTSEXT_API T_SOC catch_url_init_std(int *port_prox, char *adr_prox) {
   T_SOC soc;
-  int try_to_listen_to[] = {8080, 3128, 80, 81, 82, 8081, 3129, 0, -1};
+  int try_to_listen_to[] = { 8080, 3128, 80, 81, 82, 8081, 3129, 31337, 0, -1 };
   int i = 0;
 
   do {

src/htsglobal.h

@@ -229,10 +229,6 @@ Please visit our Website: http://www.httrack.com
 #define HTS_DEFAULT_FOOTER                                                     \
   "<!-- Mirrored from %s%s by HTTrack Website Copier/" HTTRACK_AFF_VERSION     \
   " " HTTRACK_AFF_AUTHORS ", %s -->"
-/* Honest crawler User-Agent; no fake OS/browser to go stale. */
-#define HTS_DEFAULT_USER_AGENT                                                 \
-  "Mozilla/5.0 (compatible; HTTrack/" HTTRACK_AFF_VERSION                      \
-  "; +https://www.httrack.com/)"
 #define HTTRACK_WEB "http://www.httrack.com"
 #define HTS_UPDATE_WEBSITE                                                     \
   "http://www.httrack.com/"                                                    \

src/htslib.c

@@ -563,39 +563,6 @@ const char *hts_mime[][2] = {
   {"", ""}
 };
 
-/* Modern web formats (post-2010), kept in their own table: appending to the
-   legacy hts_mime[] above makes clang-format reflow its whole initializer.
-   Scanned after hts_mime[], so it never shadows a legacy mapping. */
-static const char *hts_mime_modern[][2] = {
-    {"image/webp", "webp"},
-    {"image/avif", "avif"},
-    {"image/heic", "heic"},
-    {"font/woff", "woff"},
-    {"font/woff2", "woff2"},
-    {"font/ttf", "ttf"},
-    {"font/otf", "otf"},
-    {"application/json", "json"},
-    {"application/ld+json", "jsonld"},
-    {"application/manifest+json", "webmanifest"},
-    {"application/wasm", "wasm"},
-    {"text/javascript", "js"},
-    {"text/javascript", "mjs"},
-    {"text/markdown", "md"},
-    {"video/mp4", "mp4"},
-    {"video/webm", "webm"},
-    {"video/ogg", "ogv"},
-    {"video/mp2t", "ts"},
-    {"audio/mp4", "m4a"},
-    {"audio/aac", "aac"},
-    {"audio/ogg", "oga"},
-    {"audio/opus", "opus"},
-    {"audio/flac", "flac"},
-    {"audio/webm", "weba"},
-    {"application/x-7z-compressed", "7z"},
-    {"application/x-rar-compressed", "rar"},
-    {"application/zstd", "zst"},
-    {"", ""}};
-
 // Reserved (RFC2396)
 #define CIS(c,ch) ( ((unsigned char)(c)) == (ch) )
 #define CHAR_RESERVED(c)  ( CIS(c,';') \
@@ -1326,12 +1293,16 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode,
 
       // Compression accepted ?
       if (retour->req.http11) {
-        hts_boolean compressible = HTS_FALSE;
 #if HTS_USEZLIB
-        compressible = (!retour->req.range_used && !retour->req.nocompression);
+        if ((!retour->req.range_used)
+            && (!retour->req.nocompression))
+          print_buffer(&bstr, "Accept-Encoding: " "gzip" /* gzip if the preffered encoding */
+                     ", " "identity;q=0.9" H_CRLF);
+        else
+          print_buffer(&bstr, "Accept-Encoding: identity" H_CRLF);       /* no compression */
+#else
+        print_buffer(&bstr, "Accept-Encoding: identity" H_CRLF); /* no compression */
 #endif
-        print_buffer(&bstr, "Accept-Encoding: %s" H_CRLF,
-                     hts_acceptencoding(compressible));
       }
 
       /* Authentification */
@@ -1947,10 +1918,6 @@ HTSEXT_API const char *infostatuscode_const(int statuscode) {
     return "Requested Range Not Satisfiable";
   case 417:
     return "Expectation Failed";
-  case 429:
-    return "Too Many Requests";
-  case 451:
-    return "Unavailable For Legal Reasons";
   case 500:
     return "Internal Server Error";
   case 501:
@@ -4341,20 +4308,6 @@ void guess_httptype(httrackp * opt, char *s, const char *fil) {
   (void) get_httptype_sized(opt, s, HTS_MIMETYPE_SIZE, fil, 1);
 }
 
-// first match in a NUL-terminated {mime,ext} table. key selects the lookup
-// column (0=mime, 1=ext); returns the other column, or NULL if no row matches
-// (a "*" partner means the row carries no value).
-static const char *hts_mime_lookup(const char *(*table)[2], int key,
-                                   const char *needle) {
-  int j;
-
-  for (j = 0; strnotempty(table[j][1]); j++) {
-    if (strfield2(table[j][key], needle) && table[j][!key][0] != '*')
-      return table[j][!key];
-  }
-  return NULL;
-}
-
 // write the mime type for fil into s (capacity ssize)
 // flag: 1 to always return a type (the "application/..." / octet-stream
 // fallback) returns 1 if a type was written to s, 0 otherwise
@@ -4378,15 +4331,17 @@ HTSEXT_API hts_boolean get_httptype_sized(httrackp *opt, char *s, size_t ssize,
     while ((a > fil) && (*a != '.') && (*a != '/'))
       a--;
     if (a >= fil && *a == '.' && strlen(a) < 32) {
-      const char *mime;
+      int j = 0;
 
       a++;
-      mime = hts_mime_lookup(hts_mime, 1, a);
-      if (mime == NULL)
-        mime = hts_mime_lookup(hts_mime_modern, 1, a);
-      if (mime != NULL) {
-        strlcpybuff(s, mime, ssize);
-        return 1;
+      while(strnotempty(hts_mime[j][1])) {
+        if (strfield2(hts_mime[j][1], a)) {
+          if (hts_mime[j][0][0] != '*') { // a match exists
+            strlcpybuff(s, hts_mime[j][0], ssize);
+            return 1;
+          }
+        }
+        j++;
       }
 
       if (flag) {
@@ -4410,11 +4365,6 @@ HTSEXT_API void get_httptype(httrackp *opt, char *s, const char *fil,
   (void) get_httptype_sized(opt, s, HTS_MIMETYPE_SIZE, fil, flag);
 }
 
-/* Advertised Accept-Encoding; gzip and deflate both decode via hts_zunpack */
-const char *hts_acceptencoding(hts_boolean compressible) {
-  return compressible ? "gzip, deflate, identity;q=0.9" : "identity";
-}
-
 // get type of fil (php)
 // s: buffer (text/html) or NULL
 // return: 1 if known by user
@@ -4526,16 +4476,18 @@ int get_userhttptype(httrackp * opt, char *s, const char *fil) {
 // returns 1 if an extension was found (and written to s), 0 otherwise
 int give_mimext(char *s, size_t ssize, const char *st) {
   int ok = 0;
-  const char *ext;
+  int j = 0;
 
   st = hts_effective_mime(st); /* no declared type: derive an html ext */
   s[0] = '\0';
-  ext = hts_mime_lookup(hts_mime, 0, st);
-  if (ext == NULL)
-    ext = hts_mime_lookup(hts_mime_modern, 0, st);
-  if (ext != NULL) {
-    strlcpybuff(s, ext, ssize);
-    ok = 1;
+  while((!ok) && (strnotempty(hts_mime[j][1]))) {
+    if (strfield2(hts_mime[j][0], st)) {
+      if (hts_mime[j][1][0] != '*') { // a match exists
+        strlcpybuff(s, hts_mime[j][1], ssize);
+        ok = 1;
+      }
+    }
+    j++;
   }
   // wrap "x" mimetypes, such as:
   // application/x-mp3
@@ -5802,13 +5754,6 @@ HTSEXT_API int hts_init(void) {
       abortLog("unable to initialize TLS: SSL_CTX_new()");
       assertf("unable to initialize TLS" == NULL);
     }
-    /* Pin a TLS floor (no SSLv3/TLS1.0/1.1); no cert verify, by design. */
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-    SSL_CTX_set_min_proto_version(openssl_ctx, TLS1_2_VERSION);
-#else
-    SSL_CTX_set_options(openssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                                         SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1);
-#endif
   }
 #endif
 
@@ -6060,7 +6005,8 @@ HTSEXT_API httrackp *hts_create_opt(void) {
   opt->shell = HTS_FALSE;
   opt->proxy.active = 0;        // pas de proxy
   opt->user_agent_send = HTS_TRUE;
-  StringCopy(opt->user_agent, HTS_DEFAULT_USER_AGENT);
+  StringCopy(opt->user_agent,
+             "Mozilla/4.5 (compatible; HTTrack 3.0x; Windows 98)");
   StringCopy(opt->referer, "");
   StringCopy(opt->from, "");
   opt->savename_83 = HTS_SAVENAME_83_LONG; // long names by default

src/htslib.h

@@ -285,9 +285,6 @@ int ishttperror(int err);
 int get_userhttptype(httrackp * opt, char *s, const char *fil);
 int give_mimext(char *s, size_t ssize, const char *st);
 
-/* Advertised Accept-Encoding value (no header name/CRLF); see htslib.c. */
-const char *hts_acceptencoding(hts_boolean compressible);
-
 int may_bogus_multiple(httrackp * opt, const char *mime, const char *filename);
 int may_unknown2(httrackp * opt, const char *mime, const char *filename);
 

src/htsselftest.c

@@ -50,9 +50,6 @@ Please visit our Website: http://www.httrack.com
 #include "htscharset.h"
 #include "htsencoding.h"
 #include "htsmd5.h"
-#if HTS_USEZLIB
-#include "htszlib.h"
-#endif
 #include "coucal/coucal.h"
 
 #include <ctype.h>
@@ -242,14 +239,6 @@ static void basic_selftests(void) {
     assertf(strcmp(ext, "html") == 0);
     assertf(give_mimext(ext, sizeof(ext), "no/such-mime-type") == 0);
     assertf(ext[0] == '\0');
-    // modern web formats -> extension. Avoid MIME types the
-    // application/<=4-char-subtype fallback could fabricate without a row.
-    assertf(give_mimext(ext, sizeof(ext), "image/webp") == 1);
-    assertf(strcmp(ext, "webp") == 0);
-    assertf(give_mimext(ext, sizeof(ext), "application/manifest+json") == 1);
-    assertf(strcmp(ext, "webmanifest") == 0);
-    assertf(give_mimext(ext, sizeof(ext), "font/woff2") == 1);
-    assertf(strcmp(ext, "woff2") == 0);
   }
   // convtolower(): lower-cases into the caller buffer (bounded by its size).
   {
@@ -304,16 +293,6 @@ static void basic_selftests(void) {
     assertf(get_httptype_sized(opt, r.contenttype, sizeof(r.contenttype),
                                "x.gif", 0) == 1);
     assertf(strcmp(r.contenttype, "image/gif") == 0);
-    // modern extensions map back to their MIME type
-    assertf(get_httptype_sized(opt, r.contenttype, sizeof(r.contenttype),
-                               "x.webp", 0) == 1);
-    assertf(strcmp(r.contenttype, "image/webp") == 0);
-    assertf(get_httptype_sized(opt, r.contenttype, sizeof(r.contenttype),
-                               "app.wasm", 0) == 1);
-    assertf(strcmp(r.contenttype, "application/wasm") == 0);
-    assertf(get_httptype_sized(opt, r.contenttype, sizeof(r.contenttype),
-                               "mod.mjs", 0) == 1);
-    assertf(strcmp(r.contenttype, "text/javascript") == 0);
     // no extension and flag==0: nothing written, returns 0
     assertf(get_httptype_sized(opt, r.contenttype, sizeof(r.contenttype),
                                "noextfile", 0) == 0);
@@ -1305,192 +1284,6 @@ static int st_urlhack(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-/* Default User-Agent: honest HTTrack token, no resurrected Windows 98. */
-static int st_useragent(httrackp *opt, int argc, char **argv) {
-  const char *ua = StringBuff(opt->user_agent);
-  (void) argc;
-  (void) argv;
-  assertf(ua != NULL);
-  assertf(strcmp(ua, HTS_DEFAULT_USER_AGENT) == 0);
-  /* Teeth independent of the macro: honest token + self-identifier, and no
-     legacy Mozilla/4.x fake-browser string (rejects the whole relic family). */
-  assertf(strstr(ua, "HTTrack/") != NULL);
-  assertf(strstr(ua, "+https://www.httrack.com/") != NULL);
-  assertf(strstr(ua, "Mozilla/4.") == NULL);
-  printf("useragent self-test OK: %s\n", ua);
-  return 0;
-}
-
-/* HTTP status code -> reason phrase, including the modern 429/451. */
-static int st_status(httrackp *opt, int argc, char **argv) {
-  const char *s;
-  (void) opt;
-  (void) argc;
-  (void) argv;
-  s = infostatuscode_const(429);
-  assertf(s != NULL && strcmp(s, "Too Many Requests") == 0);
-  s = infostatuscode_const(451);
-  assertf(s != NULL && strcmp(s, "Unavailable For Legal Reasons") == 0);
-  /* A spot-check of a long-standing code, and an unknown one. */
-  s = infostatuscode_const(404);
-  assertf(s != NULL && strcmp(s, "Not Found") == 0);
-  assertf(infostatuscode_const(799) == NULL);
-  printf("status self-test OK\n");
-  return 0;
-}
-
-#if HTS_USEZLIB
-/* Deflate src->path at windowBits (16+ gzip, + zlib, - raw); 0 on success. */
-static int ae_write_packed(const char *path, int windowBits,
-                           const unsigned char *src, size_t len) {
-  unsigned char out[8192];
-  z_stream strm;
-  FILE *f;
-  int zerr;
-
-  memset(&strm, 0, sizeof(strm));
-  if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, windowBits, 8,
-                   Z_DEFAULT_STRATEGY) != Z_OK)
-    return 1;
-  if ((f = FOPEN(path, "wb")) == NULL) {
-    deflateEnd(&strm);
-    return 1;
-  }
-  strm.next_in = (Bytef *) src;
-  strm.avail_in = (uInt) len;
-  do {
-    size_t n;
-
-    strm.next_out = out;
-    strm.avail_out = sizeof(out);
-    zerr = deflate(&strm, Z_FINISH);
-    n = sizeof(out) - strm.avail_out;
-    if (n > 0 && fwrite(out, 1, n, f) != n) {
-      deflateEnd(&strm);
-      fclose(f);
-      return 1;
-    }
-  } while (zerr == Z_OK);
-  deflateEnd(&strm);
-  fclose(f);
-  return (zerr == Z_STREAM_END) ? 0 : 1;
-}
-
-/* Forged raw deflate (08 1D) that misdetects as zlib; only fallback decodes */
-static int ae_write_collision(const char *path, const unsigned char *src,
-                              size_t len) {
-  /* block-1 LEN low byte 0x1D: with 0x08, (0x081D)%31==0 */
-  const size_t n1 = 29;
-  size_t n2, p = 0;
-  unsigned char *buf;
-  FILE *f;
-  int ok;
-
-  if (len < n1 || len - n1 > 0xFFFF)
-    return 1;
-  n2 = len - n1;
-  buf = malloct(10 + len);
-  if (buf == NULL)
-    return 1;
-  buf[p++] = 0x08; /* BFINAL=0, BTYPE=00, forged padding -> zlib CMF nibble */
-  buf[p++] = (unsigned char) (n1 & 0xff);
-  buf[p++] = (unsigned char) (n1 >> 8);
-  buf[p++] = (unsigned char) (~n1 & 0xff);
-  buf[p++] = (unsigned char) ((~n1 >> 8) & 0xff);
-  memcpy(buf + p, src, n1);
-  p += n1;
-  buf[p++] = 0x01; /* BFINAL=1, BTYPE=00 */
-  buf[p++] = (unsigned char) (n2 & 0xff);
-  buf[p++] = (unsigned char) (n2 >> 8);
-  buf[p++] = (unsigned char) (~n2 & 0xff);
-  buf[p++] = (unsigned char) ((~n2 >> 8) & 0xff);
-  memcpy(buf + p, src + n1, n2);
-  p += n2;
-  f = FOPEN(path, "wb");
-  ok = (f != NULL && fwrite(buf, 1, p, f) == p);
-  if (f != NULL)
-    fclose(f);
-  freet(buf);
-  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) {
-  unsigned char buf[8192];
-  FILE *f = FOPEN(path, "rb");
-  size_t off = 0, n;
-
-  if (f == NULL)
-    return 1;
-  while ((n = fread(buf, 1, sizeof(buf), f)) > 0) {
-    if (n > len - off || memcmp(buf, expect + off, n) != 0) {
-      fclose(f);
-      return 1;
-    }
-    off += n;
-  }
-  fclose(f);
-  return (off == len) ? 0 : 1;
-}
-#endif
-
-/* Accept-Encoding (#450): advertise gzip+deflate; both decode (hts_zunpack) */
-static int st_acceptencoding(httrackp *opt, int argc, char **argv) {
-  const char *off = hts_acceptencoding(HTS_FALSE);
-  const char *on = hts_acceptencoding(HTS_TRUE);
-
-  (void) opt;
-  assertf(strcmp(off, "identity") == 0);
-  assertf(strstr(on, "gzip") != NULL);
-  assertf(strstr(on, "deflate") != NULL); /* fails on the old gzip-only list */
-#if HTS_USEZLIB
-  if (argc >= 1) {
-    static const int windowBits[] = {16 + MAX_WBITS, MAX_WBITS, -MAX_WBITS};
-    const unsigned char small[] =
-        "deflate round-trip: HTTrack decodes gzip and deflate alike. "
-        "deflate round-trip: HTTrack decodes gzip and deflate alike.";
-    const size_t slen = sizeof(small) - 1;
-    /* 64 KiB of varied (LCG) bytes: forces the multi-fread loop */
-    const size_t blen = 64 * 1024;
-    unsigned char *body = malloct(blen);
-    uint32_t x = 0x1234567u;
-    char inpath[HTS_URLMAXSIZE], outpath[HTS_URLMAXSIZE];
-    size_t i;
-
-    assertf(body != NULL);
-    for (i = 0; i < blen; i++) {
-      x = x * 1103515245u + 12345u;
-      body[i] = (unsigned char) (x >> 16);
-    }
-    /* gzip, zlib (RFC1950) and raw deflate (RFC1951), both small and large. */
-    for (i = 0; i < sizeof(windowBits) / sizeof(windowBits[0]); i++) {
-      snprintf(inpath, sizeof(inpath), "%s/ae-in-%d.z", argv[0], windowBits[i]);
-      snprintf(outpath, sizeof(outpath), "%s/ae-out-%d", argv[0],
-               windowBits[i]);
-      assertf(ae_write_packed(inpath, windowBits[i], small, slen) == 0);
-      assertf(hts_zunpack(inpath, outpath) == (int) slen);
-      assertf(ae_check_decoded(outpath, small, slen) == 0);
-      assertf(ae_write_packed(inpath, windowBits[i], body, blen) == 0);
-      assertf(hts_zunpack(inpath, outpath) == (int) blen);
-      assertf(ae_check_decoded(outpath, body, blen) == 0);
-    }
-    /* Fallback teeth: raw deflate misdetected as zlib; -1 without the retry. */
-    snprintf(inpath, sizeof(inpath), "%s/ae-collide.z", argv[0]);
-    snprintf(outpath, sizeof(outpath), "%s/ae-collide.out", argv[0]);
-    assertf(ae_write_collision(inpath, body, 64) == 0);
-    assertf(hts_zunpack(inpath, outpath) == 64);
-    assertf(ae_check_decoded(outpath, body, 64) == 0);
-    freet(body);
-  }
-#else
-  (void) argc;
-  (void) argv;
-#endif
-  printf("acceptencoding self-test OK: %s\n", on);
-  return 0;
-}
-
 /* ------------------------------------------------------------ */
 /* Registry: name -> handler, with a usage hint and a one-line description. */
 /* ------------------------------------------------------------ */
@@ -1537,10 +1330,6 @@ static const struct selftest_entry {
      st_cache_writefail},
     {"dns", "", "DNS resolver/cache self-test", st_dns},
     {"cookies", "", "cookie request-header self-test", st_cookies},
-    {"useragent", "", "default User-Agent self-test", st_useragent},
-    {"status", "", "HTTP status code -> reason phrase self-test", st_status},
-    {"acceptencoding", "[dir]",
-     "Accept-Encoding advertises gzip+deflate, both decode", st_acceptencoding},
 };
 
 static void list_selftests(void) {

src/htsserver.c

@@ -358,12 +358,12 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
       {NULL, 0}
     };
     initStrElt initStr[] = {
-        {"user", HTS_DEFAULT_USER_AGENT},
-        {"footer", "<!-- Mirrored from %s%s by HTTrack Website Copier/3.x "
-                   "[XR&CO'2014], %s -->"},
-        {"url2",
-         "+*.png +*.gif +*.jpg +*.jpeg +*.css +*.js -ad.doubleclick.net/*"},
-        {NULL, NULL}};
+      {"user", "Mozilla/4.5 (compatible; HTTrack 3.0x; Windows 98)"},
+      {"footer",
+       "<!-- Mirrored from %s%s by HTTrack Website Copier/3.x [XR&CO'2014], %s -->"},
+      {"url2", "+*.png +*.gif +*.jpg +*.jpeg +*.css +*.js -ad.doubleclick.net/*"},
+      {NULL, NULL}
+    };
     int i = 0;
 
     for(i = 0; initInt[i].name; i++) {

src/htswizard.c

@@ -80,10 +80,6 @@ htspair_t hts_detect_embed[] = {
   {NULL, NULL}
 };
 
-/* HTML5 media siblings of <img src>: same near-link treatment (#451) */
-static const htspair_t hts_detect_embed_html5[] = {
-    {"source", "src"}, {"source", "srcset"}, {"track", "src"}, {NULL, NULL}};
-
 /* Internal */
 static int hts_acceptlink_(httrackp * opt, int ptr, const char *adr,
                            const char *fil, const char *tag,
@@ -140,17 +136,6 @@ static int cmp_token(const char *tag, const char *cmp) {
           && !isalnum((unsigned char) tag[p]));
 }
 
-/* TRUE if (tag, attribute) matches an embedded-asset pair in the table */
-static hts_boolean is_embed_pair(const htspair_t *table, const char *tag,
-                                 const char *attribute) {
-  int i;
-  for (i = 0; table[i].tag != NULL; i++) {
-    if (cmp_token(tag, table[i].tag) && cmp_token(attribute, table[i].attr))
-      return HTS_TRUE;
-  }
-  return HTS_FALSE;
-}
-
 static int hts_acceptlink_(httrackp * opt, int ptr,
                            const char *adr, const char *fil, const char *tag,
                            const char *attribute, int *set_prio_to,
@@ -178,9 +163,15 @@ static int hts_acceptlink_(httrackp * opt, int ptr,
 
   /* Built-in known tags (<img src=..>, ..) */
   if (forbidden_url != 0 && opt->nearlink && tag != NULL && attribute != NULL) {
-    if (is_embed_pair(hts_detect_embed, tag, attribute) ||
-        is_embed_pair(hts_detect_embed_html5, tag, attribute)) {
-      embedded_triggered = 1;
+    int i;
+
+    for(i = 0; hts_detect_embed[i].tag != NULL; i++) {
+      if (cmp_token(tag, hts_detect_embed[i].tag)
+          && cmp_token(attribute, hts_detect_embed[i].attr)
+        ) {
+        embedded_triggered = 1;
+        break;
+      }
     }
   }
 

src/htszlib.c

@@ -47,89 +47,48 @@ Please visit our Website: http://www.httrack.com
 */
 
 /*
-  Unpack file into a new file (gzip, zlib RFC1950 or raw deflate RFC1951).
+  Unpack file into a new file
   Return value: size of the new file, or -1 if an error occurred
 */
 /* Note: utf-8 */
 int hts_zunpack(char *filename, char *newfile) {
   int ret = -1;
 
-  if (filename != NULL && newfile != NULL && filename[0] && newfile[0]) {
-    char catbuff[CATBUFF_SIZE];
-    FILE *const in = FOPEN(fconv(catbuff, sizeof(catbuff), filename), "rb");
+  if (filename != NULL && newfile != NULL) {
+    if (filename[0] && newfile[0]) {
+      char catbuff[CATBUFF_SIZE];
+      FILE *const in = FOPEN(fconv(catbuff, sizeof(catbuff), filename), "rb");
+      const int fd = in != NULL ? fileno(in) : -1;
+      const int dup_fd = fd != -1 ? dup(fd) : -1;
+      // Note: we must dup to be able to flose cleanly.
+      const gzFile gz = dup_fd != -1 ? gzdopen(dup_fd, "rb") : NULL;
 
-    if (in != NULL) {
-      unsigned char BIGSTK inbuf[8192];
-      size_t navail = fread(inbuf, 1, sizeof(inbuf), in);
-      /* gzip/zlib headers -> +32 windowBits; else raw deflate (RFC1951) */
-      const hts_boolean wrapped =
-          (navail >= 2 &&
-           ((inbuf[0] == 0x1f && inbuf[1] == 0x8b) ||
-            ((inbuf[0] & 0x0f) == Z_DEFLATED &&
-             (((unsigned) inbuf[0] << 8 | inbuf[1]) % 31) == 0)));
-      int attempt;
+      if (gz) {
+        FILE *const fpout = FOPEN(fconv(catbuff, sizeof(catbuff), newfile), "wb");
+        int size = 0;
 
-      /* deflate is ambiguous; on failure retry with the other windowBits */
-      for (attempt = 0; attempt < 2 && ret < 0; attempt++) {
-        const int windowBits =
-            (attempt == 0 ? wrapped : !wrapped) ? (32 + MAX_WBITS) : -MAX_WBITS;
-        FILE *fpout;
-        z_stream strm;
+        if (fpout) {
+          int nr;
 
-        if (attempt > 0) {
-          /* rewind input; reopening fpout "wb" discards the partial output */
-          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)
-          break;
-        memset(&strm, 0, sizeof(strm));
-        if (inflateInit2(&strm, windowBits) != Z_OK) {
-          fclose(fpout);
-          break;
-        }
-        {
-          hts_boolean ok = HTS_TRUE;
-          int size = 0;
-          int zerr = Z_OK;
-
-          /* chunked inflate; first chunk in inbuf, single member */
           do {
-            strm.next_in = inbuf;
-            strm.avail_in = (uInt) navail;
-            do {
-              unsigned char BIGSTK outbuf[8192];
-              size_t produced;
+            char BIGSTK buff[1024];
 
-              strm.next_out = outbuf;
-              strm.avail_out = sizeof(outbuf);
-              zerr = inflate(&strm, Z_NO_FLUSH);
-              if (zerr == Z_NEED_DICT || zerr == Z_DATA_ERROR ||
-                  zerr == Z_MEM_ERROR || zerr == Z_STREAM_ERROR) {
-                ok = HTS_FALSE;
-                break;
-              }
-              produced = sizeof(outbuf) - strm.avail_out;
-              if (produced > 0 &&
-                  fwrite(outbuf, 1, produced, fpout) != produced) {
-                ok = HTS_FALSE;
-                break;
-              }
-              size += (int) produced;
-            } while (strm.avail_out == 0);
-            if (!ok || zerr == Z_STREAM_END)
-              break;
-            navail = fread(inbuf, 1, sizeof(inbuf), in);
-          } while (navail > 0);
-          if (ok && zerr == Z_STREAM_END)
-            ret = size;
-        }
-        inflateEnd(&strm);
-        fclose(fpout);
+            nr = gzread(gz, buff, sizeof(buff));
+            if (nr > 0) {
+              size += nr;
+              if (fwrite(buff, 1, nr, fpout) != nr)
+                nr = size = -1;
+            }
+          } while(nr > 0);
+          fclose(fpout);
+        } else
+          size = -1;
+        gzclose(gz);
+        ret = (int) size;
+      }
+      if (in != NULL) {
+        fclose(in);
       }
-      fclose(in);
     }
   }
   return ret;

src/proxy/proxytrack.c

@@ -497,12 +497,6 @@ static const char *GetHttpMessage(int statuscode) {
   case 417:
     return "Expectation Failed";
     break;
-  case 429:
-    return "Too Many Requests";
-    break;
-  case 451:
-    return "Unavailable For Legal Reasons";
-    break;
   case 500:
     return "Internal Server Error";
     break;

tests/01_engine-acceptencoding.test

@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# Accept-Encoding (#450): advertise gzip+deflate; decode gzip/zlib/raw-deflate.
-dir=$(mktemp -d)
-trap 'rm -rf "$dir"' EXIT
-
-httrack -O /dev/null -#test=acceptencoding "$dir" run |
-    grep -q "acceptencoding self-test OK"

tests/01_engine-parse.test

@@ -323,33 +323,4 @@ grep -Fq 'href="ahref%20(4).gif"' "$saved9" ||
 ! grep -Eq '(src|href)="[^"]*%28' "$saved9" ||
     ! echo "FAIL #163: gate over-fired onto a non-url() attribute link" || exit 1
 
-# HTML5 <source>/<track> follow as embedded near-links past the -r2 depth boundary (#451).
-# img.gif positive control; plain.gif (bare <a href>) negative control proves the gate is selective.
-site10="$tmp/html5media"
-mkdir -p "$site10"
-for f in img ss plain; do gif "$site10/$f.gif"; done
-printf 'x' >"$site10/v.webm"
-printf 'x' >"$site10/subs.vtt"
-cat >"$site10/index.html" <<EOF
-<html><body><a href="leaf.html">leaf</a></body></html>
-EOF
-cat >"$site10/leaf.html" <<EOF
-<html><body>
-<img src="img.gif">
-<picture><source srcset="ss.gif 2x"></picture>
-<video><source src="v.webm"></video>
-<video><track src="subs.vtt"></video>
-<a href="plain.gif">plain link past the boundary</a>
-</body></html>
-EOF
-out10="$tmp/html5media-out"
-rm -rf "$out10"
-mkdir -p "$out10"
-httrack "file://$site10/index.html" -O "$out10" --quiet --near -r2 >"$out10/.log" 2>&1 || true
-found "img.gif" "$out10"
-found "ss.gif" "$out10"
-found "v.webm" "$out10"
-found "subs.vtt" "$out10"
-notfound "plain.gif" "$out10"
-
 exit 0

tests/01_engine-status.test

@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# HTTP status -> reason phrase, including the modern 429/451 (#453).
-httrack -O /dev/null -#test=status run | grep -q "status self-test OK"

tests/01_engine-useragent.test

@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# Default User-Agent (#449): honest HTTrack token, no Windows 98 relic.
-httrack -O /dev/null -#test=useragent run | grep -q "useragent self-test OK"

tests/Makefile.am

@@ -25,7 +25,6 @@ TEST_EXTENSIONS = .test
 TEST_LOG_COMPILER = $(BASH)
 TESTS = \
 	00_runnable.test \
-	01_engine-acceptencoding.test \
 	01_engine-cache.test \
 	01_engine-cache-golden.test \
 	01_engine-cache-writefail.test \
@@ -48,11 +47,9 @@ TESTS = \
 	01_engine-savename.test \
 	01_engine-selftest-dispatch.test \
 	01_engine-simplify.test \
-	01_engine-status.test \
 	01_engine-stripquery.test \
 	01_engine-strsafe.test \
 	01_engine-urlhack.test \
-	01_engine-useragent.test \
 	02_manpage-regen.test \
 	02_update-cache.test \
 	10_crawl-simple.test \