Signed-shift UB in zip-repair local-header read

unzRepair parses the local file header of a damaged cache zip during
repair. READ_32 combined two int-typed READ_16 halves as
READ_16(adr) | (READ_16((adr)+2) << 16); when the high half has bit 15
set (>= 0x8000), shifting it left by 16 exceeds INT_MAX, which is signed
overflow. UBSan aborts on the CRC/size fields of a header whose high
16-bit word has that bit set. Repair runs on hostile input (a corrupt or
foreign new.zip). Cast the halves to uLong before the shift, matching the
sibling minizip readers in unzip.c and zip.c.

Closes #639

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

.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-  # Bumps builtin-baseline in src/vcpkg.json so the pinned OpenSSL/zlib can't rot.
-  # windows-build.yml validates each bump; the pin makes what ships reproducible.
-  - package-ecosystem: vcpkg
-    directory: /src
-    schedule:
-      interval: weekly

.github/workflows/windows-build.yml

@@ -44,20 +44,6 @@ jobs:
         shell: pwsh
         run: vcpkg integrate install
 
-      # The runner image's vcpkg checkout is pinned to some commit; our manifest's
-      # builtin-baseline is usually newer, so `git show <baseline>:versions/...`
-      # fails until that commit is local. Fetch exactly the pinned baseline (read
-      # from the manifest, so Dependabot bumps need no workflow edit).
-      - name: Fetch the pinned vcpkg baseline
-        shell: pwsh
-        run: |
-          $ErrorActionPreference = "Stop"
-          $root = if ($env:VCPKG_INSTALLATION_ROOT) { $env:VCPKG_INSTALLATION_ROOT } else { "C:\vcpkg" }
-          $baseline = (Get-Content src/vcpkg.json -Raw | ConvertFrom-Json).'builtin-baseline'
-          if (-not $baseline) { throw "no builtin-baseline in src/vcpkg.json" }
-          git -C $root fetch --no-tags origin $baseline
-          if ($LASTEXITCODE -ne 0) { throw "could not fetch vcpkg baseline $baseline" }
-
       # httrack and webhttrack carry a ProjectReference to libhttrack, so building
       # them builds it first; proxytrack is standalone.
       - name: Build
@@ -202,7 +188,7 @@ jobs:
 
           # Every gate here exits 77, so an all-skipped suite would report green having
           # tested nothing: pin the skips, and floor the passes in case the glob empties.
-          expected_skips=" 48_local-crange-memresume.test 71_local-crange-repaircache.test"  # pending #581
+          expected_skips=" 48_local-crange-memresume.test"  # pending #581
           [ "$pass" -ge 90 ] || { echo "::error::only $pass tests passed ($skip skipped)"; exit 1; }
           [ "$skipped" = "$expected_skips" ] || { echo "::error::unexpected skips:$skipped"; exit 1; }
           [ "$fail" -eq 0 ] || { echo "::error::failing:$failed"; exit 1; }

AGENTS.md

@@ -19,13 +19,6 @@ the operational checklist: toolchain, invariants, and how to ship a change.
   (`request_queue_size`) so macOS/BSD don't drop connections under a parallel
   `-c16` bigcrawl the way Python's default backlog of 5 did.
   Or run `sh build.sh` to do bootstrap + configure + make in one shot.
-- A `tests/NN_*.test` runs only if listed in `tests/Makefile.am`'s `TESTS`; an
-  unregistered file is silently skipped.
-- `make check` prepends the build's `src/` to `PATH`, but a hand-run `.test` does
-  not — an installed `/usr/bin/httrack` then shadows your build. Run via `make
-  check`, or `PATH="<bld>/src:$PATH"` for a manual run.
-- Give new `.test` scripts `set -e`: the older ones predate the rule, so several
-  `local-crawl.sh` calls with no `set -e` report PASS on any non-last failure.
 
 ## Hard invariants
 - **Generated autotools files are NOT in git.** `configure`, every
@@ -38,32 +31,15 @@ the operational checklist: toolchain, invariants, and how to ship a change.
 - **Format only changed lines** with `git clang-format` (clang-format 19). Never
   reformat untouched code: the engine was formatted by an old tool and won't
   round-trip.
-- **Byte-safe edits.** A few tracked files carry raw ISO-8859-1 high bytes
-  (French comments): `src/htsconcat.c`, `lang/*.txt`, `html/contact.html`, and
-  the `fuzz/corpus/*` vectors. Edit those byte-wise (`perl -0pi`, `sed`), not
-  through a tool that re-encodes to UTF-8 and corrupts them. The rest of the tree
-  is UTF-8 and safe to edit normally.
+- **Byte-safe edits.** Files with raw high bytes are ISO-8859-1 (French
+  comments). Edit them byte-wise (`perl -0pi`, `sed`), not through a tool that
+  re-encodes to UTF-8 and corrupts them.
 
 ## Security (HTTrack parses hostile input off the network)
 - Bounds-check every copy. Overflow-safe form: put the untrusted value alone,
   `untrusted < limit - controlled` — never `controlled + untrusted < limit`,
   which can wrap and pass.
 
-## C conventions
-- **Use the `*t` allocator wrappers, never raw libc** (`htssafe.h`):
-  `malloct`/`calloct`/`realloct`/`freet`/`strdupt`, in test and selftest code
-  too. `freet` NULLs its (lvalue) argument and tolerates NULL; `calloct(n, sz)`
-  keeps calloc's arg order. Only exception: storing or calling a libc symbol
-  itself (e.g. a resolver-backend function pointer).
-- **Exported API is `HTSEXT_API`.** Everything else is hidden by
-  `-fvisibility=hidden` and free to change (check with `nm -D --defined-only
-  libhttrack.so`). Touching an installed-header struct (see `DevIncludes_DATA` in
-  `src/Makefile.am`) or an exported signature is an ABI break — flag and discuss,
-  bump the soname, and prefer keeping the old entry point beside a new one.
-- **Windows ABI is free to break, POSIX is not.** The Windows DLL ships next to
-  the exe with no soname contract, so a `_WIN32`-only ABI change needs no
-  deprecation dance; POSIX/ELF keeps the flag-discuss-bump rules.
-
 ## Code & prose
 - Be terse. Comment the why, in English; translate French comments you touch.
 - Strip AI tells from prose (em-dash overuse, rule-of-three, filler, vague

html/abuse.html

@@ -579,7 +579,7 @@ And then, put the email address in your pages through:
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/addurl.html

@@ -144,7 +144,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/android.html

@@ -1,223 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<meta name="description" content="How to mirror a website with HTTrack on Android: install the app, create a project, enter the address, run the mirror, and browse the result on your device." />
-	<meta name="keywords" content="httrack, HTTrack, android, offline browser, web mirror utility, website mirroring, mobile, Google Play" />
-	<title>HTTrack on Android</title>
-
-	<style type="text/css">
-	<!--
-
-body {
-	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
-	background: #77b;
-}
-body, td {
-	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	}
-
-#subTitle {
-	background: #000;  color: #fff;  padding: 4px;  font-weight: bold;
-	}
-
-#siteNavigation a, #siteNavigation .current {
-	font-weight: bold;  color: #448;
-	}
-#siteNavigation a:link    { text-decoration: none; }
-#siteNavigation a:visited { text-decoration: none; }
-
-#siteNavigation .current { background-color: #ccd; }
-
-#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
-#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
-
-
-a:link    { text-decoration: underline;  color: #00f; }
-a:visited { text-decoration: underline;  color: #000; }
-a:hover   { text-decoration: underline;  color: #c00; }
-a:active  { text-decoration: underline; }
-
-#pageContent {
-	clear: both;
-	border-bottom: 6px solid #000;
-	padding: 10px;  padding-top: 20px;
-	line-height: 1.65em;
-	background-image: url(images/bg_rings.gif);
-	background-repeat: no-repeat;
-	background-position: top right;
-	}
-
-#pageContent, #siteNavigation {
-	background-color: #ccd;
-	}
-
-
-.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
-.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
-
-hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
-
-h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
-h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
-h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
-h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
-
-.blak { background-color: #000; }
-.hide { display: none; }
-.tableWidth { min-width: 400px; }
-
-.tblRegular       { border-collapse: collapse; }
-.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
-.tblHeaderColor, .tblHeaderColor td { background: #99c; }
-.tblNoBorder td   { border: 0; }
-
-
-// -->
-</style>
-
-</head>
-
-<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
-	<tr>
-	<td><img src="images/header_title_4.gif" width="400" height="34" alt="HTTrack Website Copier" title="" border="0" id="title" /></td>
-	</tr>
-</table>
-<table width="76%" border="0" align="center" cellspacing="0" cellpadding="3" class="tableWidth">
-	<tr>
-	<td id="subTitle">Open Source offline browser</td>
-	</tr>
-</table>
-<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
-<tr class="blak">
-<td>
-	<table width="100%" border="0" align="center" cellspacing="1" cellpadding="0">
-	<tr>
-	<td colspan="6">
-		<table width="100%" border="0" align="center" cellspacing="0" cellpadding="10">
-		<tr>
-		<td id="pageContent">
-<!-- ==================== End prologue ==================== -->
-
-<h2 align="center"><em>HTTrack on Android</em></h2>
-
-<br>
-
-<p>HTTrack downloads a website to your device so you can read it offline. The
-Android app runs the same mirroring engine as the desktop version behind a touch
-interface. It needs Android 7.0 or later, and is available on
-<a href="https://play.google.com/store/apps/details?id=com.httrack.android">Google Play</a>.</p>
-
-<p>The steps below follow one mirror from start to finish.</p>
-
-<br>
-
-<ol>
-
-  <li><b>Grant storage access</b></li>
-  <br><small>On first launch the app asks for permission to store mirrors on your
-  device. The prompt reads <em>"Allow HTTrack Website Copier to access photos,
-  media, and files on your device?"</em>. Tap <b>ALLOW</b>: without it the app
-  cannot save the downloaded files.</small>
-  <br><br><center><img src="img/android_permission.png" width="320" alt="First-run storage permission dialog" border="0"></center>
-  <br><small>If you have used an older release, a second prompt offers to bring its
-  mirrors into the app. Tap <b>Import</b> to move them, or <b>Not now</b> to
-  skip.</small>
-  <br><br><center><img src="img/android_import.png" width="320" alt="Import mirrors from an older version" border="0"></center>
-<br><br>
-
-  <li><b>Start</b></li>
-  <br><small>The welcome screen shows the engine version at the bottom. Tap
-  <b>Next</b> to create a project, or <b>Browse sites</b> to open a mirror you
-  already made.</small>
-  <br><br><center><img src="img/android_startup.png" width="320" alt="Welcome screen" border="0"></center>
-<br><br>
-
-  <li><b>Name the project</b></li>
-  <br><small>Give the project a name, and optionally a category to group related
-  mirrors. <b>Base path</b> shows where the files will be written. Tap
-  <b>Next</b>.</small>
-  <br><br><center><img src="img/android_project.png" width="320" alt="Project name, category, and base path" border="0"></center>
-<br><br>
-
-  <li><b>Enter the address</b></li>
-  <br><small>Type the site address. If a project of the same name already exists,
-  pick <b>Continue interrupted download</b> or <b>Update existing download</b>.
-  Tap <b>Options</b> to adjust the crawl, or <b>Start</b> to begin.</small>
-  <br><br><center><img src="img/android_url.png" width="320" alt="Web address and download action" border="0"></center>
-<br><br>
-
-  <li><b>Options (optional)</b></li>
-  <br><small>The <b>Options</b> screen holds the crawl settings, grouped into
-  eleven tabs. It uses the same profile format as the desktop version, so a tab you
-  know from WinHTTrack behaves the same way here.</small>
-  <br><br><center><img src="img/android_options.png" width="320" alt="Options tab list" border="0"></center>
-  <br><small>The tabs are:</small>
-  <ul>
-    <li><small><b>Scan Rules</b>: wildcard filters for the addresses to keep or skip.</small></li>
-    <li><small><b>Limits</b>: caps on depth, size, time, speed, and number of connections.</small></li>
-    <li><small><b>Flow Control</b>: simultaneous connections, timeouts, and retries.</small></li>
-    <li><small><b>Links</b>: how far to follow links, and which extra files to fetch.</small></li>
-    <li><small><b>Build</b>: how the saved files and folders are named.</small></li>
-    <li><small><b>Browser ID</b>: the user-agent, language, and headers sent to servers.</small></li>
-    <li><small><b>Spider</b>: cookies, robots.txt handling, and request behavior.</small></li>
-    <li><small><b>Proxy address</b>: proxy host and port.</small></li>
-    <li><small><b>Log, Index, Cache</b>: log files, the search index, and the update cache.</small></li>
-    <li><small><b>Type/MIME associations</b>: map file extensions to MIME types.</small></li>
-    <li><small><b>Experts Only</b>: scan mode, how far the crawl may travel, and link rewriting.</small></li>
-  </ul>
-  <br><center><img src="img/android_scanrules.png" width="320" alt="Scan Rules tab" border="0"></center>
-  <br><center><img src="img/android_experts.png" width="320" alt="Experts Only tab" border="0"></center>
-  <br><small>The <a href="step9.html">desktop option reference</a> describes every
-  setting in full. A few desktop options are missing or fixed on Android: the proxy
-  tab has a host and port but no login and password, the download folder is fixed
-  inside the app's storage so there is no output-path setting, and the MIME table
-  holds up to eight entries.</small>
-<br><br>
-
-  <li><b>Run the mirror</b></li>
-  <br><small>HTTrack downloads the site and reports live figures: bytes saved,
-  links scanned, transfer rate, and errors. Tap <b>Abort</b> to stop early; a
-  partial mirror can be resumed later.</small>
-  <br><br><center><img src="img/android_progress.png" width="320" alt="Crawl in progress with live statistics" border="0"></center>
-<br><br>
-
-  <li><b>Browse the result</b></li>
-  <br><small>When the crawl finishes the app reports <b>Success</b> and the mirror
-  location. Tap <b>Browse Mirrored Website</b> to read the copy in your browser,
-  <b>View log</b> to see what happened, or <b>New project</b> to start
-  again.</small>
-  <br><br><center><img src="img/android_finished.png" width="320" alt="Mirror finished, success" border="0"></center>
-<br><br>
-
-  <li><b>Where the files are</b></li>
-  <br><small>Mirrors are written under <tt>/storage/emulated/0/HTTrack/Websites</tt>,
-  in a folder named after the project. That folder lives in your device's shared
-  storage, so a file manager or a USB connection can reach it. Opening
-  <tt>index.html</tt> there browses a mirror without the app.</small>
-
-</ol>
-
-<br><br><br><br>
-<p align="right">Back to <a href="index.html">Home</a></p>
-
-<!-- ==================== Start epilogue ==================== -->
-		</td>
-		</tr>
-		</table>
-	</td>
-	</tr>
-	</table>
-</td>
-</tr>
-</table>
-
-<table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
-	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
-	</tr>
-</table>
-
-</body>
-
-</html>

html/cache.html

@@ -173,7 +173,7 @@ There are also specific issues regarding this format:
 <ul>
 <li>The data in the central directory (such as CD extra field, and CD comments) are not used</li>
 <li>The ZIP archive is allowed to contains more than 2^16 files (65535) ; in such case the total number of entries in the 32-bit central directory is 65536 (0xffff), but the presence of the 64-bit central directory is not mandatory</li>
-<li>The ZIP archive is allowed to contains more than 2^32 bytes (4GiB) ; in such case the 64-bit central directory is emitted automatically (a single stored entry of 4GiB or more is not supported)</li>
+<li>The ZIP archive is allowed to contains more than 2^32 bytes (4GiB) ; in such case the 64-bit central directory must be present <b>(not currently supported)</b></li>
 </ul>
 
 <br />
@@ -282,7 +282,7 @@ Libraries should generally handle this peculiar format, however.
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/cmddoc.html

@@ -145,7 +145,7 @@ The command-line version
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/contact.html

@@ -243,7 +243,7 @@ roche at httrack dot com (Xavier ROCHE)<br>
 <br><hr><br>
 <br>
 	This program is covered by the GNU General Public License.<br>
-     	HTTrack/HTTrack Website Copier is Copyright (C) 1998-2026 Xavier Roche and other contributors
+     	HTTrack/HTTrack Website Copier is Copyright (C) 1998-2007 Xavier Roche and other contributors
 <br>
 
 <!-- ==================== Start epilogue ==================== -->
@@ -259,7 +259,7 @@ roche at httrack dot com (Xavier ROCHE)<br>
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/dev.html

@@ -147,7 +147,7 @@ This page describes the HTTrack cache format.
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/faq.html

@@ -263,7 +263,7 @@ clear language!
 
 <li><a href="#QM8">Can HTTrack generates HP-UX or ISO9660 compatible files?</a><br></li>
 
-<li><a href="#QM9">Is there any SOCKS support?</a><br></li>
+<li><a href="#QM9">If there any SOCKS support?</a><br></li>
 
 <li><a href="#QM10">What's this hts-cache directory? Can I remove it?</a><br></li>
 
@@ -835,8 +835,8 @@ A: <em>Yes. Use user:password@your_proxy_name as your proxy name (example: <tt>s
 <br><br><a NAME="QM8">Q: <strong>Can HTTrack generates HP-UX or ISO9660 compatible files?</strong></a><br>
 A: <em>Yes. See the build options (-N, or see the WinHTTrack options)</em>
 
-<br><br><a NAME="QM9">Q: <strong>Is there any SOCKS support?</strong></a><br>
-A: <em>Yes. HTTrack supports SOCKS5 and HTTP CONNECT proxies: give the proxy with a scheme prefix, e.g. <tt>-P socks5://host:port</tt> or <tt>-P connect://host:port</tt> (prefix <tt>user:pass@</tt> before the host for authenticated proxies).</em>
+<br><br><a NAME="QM9">Q: <strong>If there any SOCKS support?</strong></a><br>
+A: <em>Not yet!</em>
 
 <br><br><a NAME="QM10">Q: <strong>What's this hts-cache directory? Can I remove it?</strong></a><br>
 A: <em>NO if you want to update the site, because this directory is used by HTTrack for this purpose. 
@@ -931,7 +931,7 @@ A: <em>Feel free to <a href="contact.html">contact us</a>!
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/filters.html

@@ -189,7 +189,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     <br>
     Filters are analyzed by HTTrack from the first filter to the last one. The complete URL
     name is compared to filters defined by the user or added automatically by HTTrack. <br><br>
-    A scan rule has a higher priority if it is declared later - hierarchy is important: <br>
+    A scan rule has an higher priority is it is declared later - hierarchy is important: <br>
 
     <br>
     <table BORDER="1" CELLPADDING="2">
@@ -307,7 +307,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     <br>
     Filters are analyzed by HTTrack from the first filter to the last one. The sizes
     are compared against scan rules defined by the user.<br><br>
-    A scan rule has a higher priority if it is declared later - hierarchy is important.<br>
+    A scan rule has an higher priority is it is declared later - hierarchy is important.<br>
     
     Note: scan rules based on size can be mixed with regular URL patterns<br>
 
@@ -361,7 +361,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     <br>
     Filters are analyzed by HTTrack from the first filter to the last one. The complete MIME
     type is compared against scan rules defined by the user.<br><br>
-    A scan rule has a higher priority if it is declared later - hierarchy is important<br>
+    A scan rule has an higher priority is it is declared later - hierarchy is important<br>
 
     Note: scan rules based on MIME types can <b>NOT</b> be mixed with regular URL patterns or size patterns within the same rule, but you can use both of them in distinct ones<br>
 
@@ -387,12 +387,12 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
       <tr>
         <td nowrap><tt>-mime:video/*</tt></td>
         <td>This will refuse all video links that were already scheduled for download
-        (i.e. the download will be aborted)</td>
+        (i.e. all other 'application/' link download will be aborted)</td>
       </tr>
       <tr>
         <td nowrap><tt>-mime:video/* -mime:audio/*</tt></td>
         <td>This will refuse all audio and video links that were already scheduled for download
-        (i.e. the download will be aborted)</td>
+        (i.e. all other 'application/' link download will be aborted)</td>
       </tr>
       <tr>
         <td nowrap><tt>-mime:*/* +mime:text/html +mime:image/*</tt></td>
@@ -466,7 +466,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/index.html

@@ -111,12 +111,6 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
     <li><a href="shelldoc.html">WinHTTrack/WebHTTrack (GUI version for Windows or Linux/Unix)</a></li>
     <br>HTTrack GUI documentation, with step-by-step example, for the Windows release (WinHTTrack) and the Linux/Unix relese (WebHTTrack)<br>
     <br>
-    <li><a href="android.html">HTTrack on Android</a></li>
-    <br>Step-by-step guide for the Android app<br>
-    <br>
-    <li><a href="cmddoc.html">Command-line version</a></li>
-    <br>How to run HTTrack from the command line, and where to find every option<br>
-    <br>
     <li><a href="fcguide.html">HTTrack Users Guide By Fred Cohen</a></li>
     <br>A tutorial that describes all command-line options, for Linux and Windows users<br>
     <br>
@@ -148,7 +142,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/library.html

@@ -125,7 +125,7 @@ You may also want to check the <tt>httrack.c</tt> and <tt>httrack.h<tt> files to
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/options.html

@@ -105,14 +105,238 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   <li>Filters: <a href="filters.html">how to use them</a></li>
   <br><small>Here you can find informations on filters: how to accept all gif files in a mirror, for example</small>
   <br><br>
-  </ul>
+  <li>List of options</li>
+</ul>
 
-<p>The complete, current list of command-line options is generated from the
-program itself, in <a href="httrack.man.html">the httrack manual page</a>.</p>
+<tt>
+<pre>
 
-<p>WinHTTrack and WebHTTrack offer the same options through their graphical option
-panels, described in the <a href="step9.html">step-by-step guide</a>.</p>
+w  mirror with automatic wizard
+This is the default scanning option, the engine automatically scans links according to the default options, and filters defined. It does not prompt a message when a "foreign" link is reached.
 
+W  semi-automatic mirror with help-wizard (asks questions)
+This option lets the engine ask the user if a link must be mirrored or not, when a new web has been found.
+
+g  just get files (saved in the current directory)
+This option forces the engine not to scan the files indicated - i.e. the engine only gets the files indicated.
+
+i  continue an interrupted mirror using the cache
+This option indicates to the engine that a mirror must be updated or continued.
+
+rN  recurse get with limited link depth of N
+This option sets the maximum recurse level. Default is infinite (the engine "knows" that it should not go out of current domain)
+
+a   stay on the same address
+This is the default primary scanning option, the engine does not go out of domains without permissions (filters, for example)
+
+d   stay on the same principal domain
+This option lets the engine go on all sites that exist on the same principal domain.
+Example: a link located at www.example.com that goes to members.example.com will be followed.
+
+l   stay on the same location (.com, etc.)
+This option lets the engine go on all sites that exist on the same location.
+Example: a link located at www.example.com that goes to www.anyotherweb.com will be followed.
+Warning: this is a potentially dangerous option, limit the recurse depth with r option.
+
+e   go everywhere on the web
+This option lets the engine go on any sites.
+Example: a link located at www.example.com that goes to www.anyotherweb.org will be followed.
+Warning: this is a potentially dangerous option, limit the recurse depth with r option.
+
+n   get non-html files 'near' an html file (ex: an image located outside)
+This option lets the engine catch all files that have references on a page, but that exist outside the web site.
+Example: List of ZIP files links on a page.
+
+t   test all URLs (even forbidden ones)
+This option lets the engine test all links that are not caught.
+Example: to test broken links in a site
+
+x   replace external html links by error pages
+This option tells the engine to rewrite all links not taken into warning pages.
+Example: to browse offline a site, and to warn people that they must be online if they click to external links.
+
+sN  follow robots.txt and meta robots tags
+This option sets the way the engine treats "robots.txt" files. This file is often set by webmasters to avoir cgi-bin directories, or other irrevelant pages.
+Values: 
+  s0  Do not take robots.txt rules
+  s1  Follow rules, if compatible with internal filters
+  s2  Always follow site's rules
+
+bN  accept cookies in cookies.txt
+This option activates or unactivates the cookie
+  b0 do not accept cookies
+  b1 accept cookies
+
+S   stay on the same directory
+This option asks the engine to stay on the same folder level.
+Example: A link in /index.html that points to /sub/other.html will not be followed
+
+D   can only go down into subdirs
+This is the default option, the engine can go everywhere on the same directoy, or in lower structures
+
+U   can only go to upper directories
+This option asks the engine to stay on the same folder level or in upper structures
+
+B   can both go up&down into the directory structure
+This option lets the engine to go in any directory level
+
+Y   mirror ALL links located in the first level pages (mirror links)
+This option is activated for the links typed in the command line
+Example: if you have a list of web sites in www.asitelist.com/index.html, then all these sites will be mirrored
+
+NN  name conversion type (0 *original structure 1,2,3 html/data in one directory)
+  N0 Site-structure (default)
+  N1 Html in web/, images/other files in web/images/
+  N2 Html in web/html, images/other in web/images
+  N3 Html in web/,  images/other in web/
+  N4 Html in web/, images/other in web/xxx, where xxx is the file extension (all gif will be placed onto web/gif, for example)
+  N5 Images/other in web/xxx and Html in web/html
+
+  N99 All files in web/, with random names (gadget !)
+
+  N100 Site-structure, without www.domain.xxx/
+  N101 Identical to N1 except that "web" is replaced by the site's name
+  N102 Identical to N2 except that "web" is replaced by the site's name
+  N103 Identical to N3 except that "web" is replaced by the site's name
+  N104 Identical to N4 except that "web" is replaced by the site's name
+  N105 Identical to N5 except that "web" is replaced by the site's name
+  N199 Identical to N99 except that "web" is replaced by the site's name
+
+  N1001 Identical to N1 except that there is no "web" directory
+  N1002 Identical to N2 except that there is no "web" directory
+  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 except that there is no "web" directory
+  N1005 Identical to N5 except that there is no "web" directory
+  N1099 Identical to N99 except that there is no "web" directory
+
+LN  long names
+  L0 Filenames and directory names are limited to 8 characters + 3 for extension
+  L1 No restrictions (default)
+
+K   keep original links (e.g. http://www.adr/link) (K0 *relative link)
+This option has only been kept for compatibility reasons
+
+pN  priority mode:
+  p0 just scan, don't save anything (for checking links)
+  p1 save only html files
+  p2 save only non html files
+  p3 save all files
+  p7 get html files before, then treat other files
+
+cN  number of multiple connections (*c8)
+Set the numer of multiple simultaneous connections
+
+O   path for mirror/logfiles+cache (-O path_mirror[,path_cache_and_logfiles])
+This option define the path for mirror and log files
+Example: -P "/user/webs","/user/logs"
+
+P   proxy use (-P proxy:port or -P user:pass@proxy:port)
+This option define the proxy used in this mirror
+Example: -P proxy.myhost.com:8080
+
+F   user-agent field (-F \"user-agent name\
+This option define the user-agent field
+Example: -F "Mozilla/4.5 (compatible; HTTrack 1.2x; Windows 98)"
+
+mN maximum file length for a non-html file
+This option define the maximum size for non-html files
+Example: -m100000
+
+mN,N'  for non html (N) and html (N')
+This option define the maximum size for non-html files and html-files
+Example: -m100000,250000
+
+MN maximum overall size that can be uploaded/scanned
+This option define the maximum amount of bytes that can be downloaded
+Example: -M1000000
+
+EN maximum mirror time in seconds (60=1 minute, 3600=1 hour)
+This option define the maximum time that the mirror can last
+Example: -E3600
+
+AN maximum transfer rate in bytes/seconds (1000=1kb/s max)
+This option define the maximum transfer rate
+Example: -A2000
+
+GN pause transfer if N bytes reached, and wait until lock file is deleted
+This option asks the engine to pause every time N bytes have been transferred, and restarts when the lock file "hts-pause.lock" is being deleted
+Example: -G20000000
+
+u check document type if unknown (cgi,asp..)
+This option define the way the engine checks the file type
+  u0 do not check
+  u1 check but /
+  u2 check always
+
+RN number of retries, in case of timeout or non-fatal errors (*R0)
+This option sets the maximum number of tries that can be processed for a file
+
+o *generate output html file in case of error (404..) (o0 don't generate)
+This option define whether the engine has to generate html output file or not if an error occurred
+
+TN timeout, number of seconds after a non-responding link is shutdown
+This option define the timeout
+Example: -T120
+
+JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link
+This option define the minimum transfer rate
+Example: -J200
+
+HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
+This option define whether the engine has to abandon a host if a timeout/"too slow" error occurred
+
+&P extended parsing, attempt to parse all links (even in unknown tags or Javascript)
+This option activates the extended parsing, that attempt to find links in unknown Html code/javascript
+
+j *parse scripts (j0 don't parse)
+This option defines whether the engine has to parse scripts or not to catch included files
+
+I *make an index (I0 don't make)
+This option define whether the engine has to generate an index.html on the top directory
+
+X *delete old files after update (X0 keep delete)
+This option define whether the engine has to delete locally, after an update, files that have been deleted in the remote mirror, or that have been excluded
+
+C *create/use a cache for updates and retries (C0 no cache)
+This option define whether the engine has to generate a cache for retries and updates or not
+
+k  store all files in cache (not useful if files on disk)
+This option define whether the engine has to store all files in cache or not
+
+V execute system command after each files ($0 is the filename: -V \"rm \\$0\
+This option lets the engine execute a command for each file saved on disk
+
+q  quiet mode (no questions)
+Do not ask questions (for example, for confirm an option)
+
+Q  log quiet mode (no log)
+Do not generate log files
+
+v  verbose screen mode
+Log files are printed in the screen
+
+f *log file mode
+Log files are generated into two log files
+
+z  extra infos log
+Add more informations on log files
+
+Z  debug log
+Add debug informations on log files
+
+
+--mirror  <URLs> *make a mirror of site(s) 
+--get <URLs>  get the files indicated, do not seek other URLs
+--mirrorlinks <URLs>  test links in pages (identical to -Y)
+--testlinks   <URLs>  test links in pages
+--spider  <URLs>  spider site(s), to test links (reports Errors & Warnings)
+--update  <URLs>  update a mirror, without confirmation
+--skeleton<URLs>  make a mirror, but gets only html files
+
+--http10  force http/1.0 requests when possible
+
+</pre>
+</tt>
 
 <!-- ==================== Start epilogue ==================== -->
 
@@ -128,7 +352,7 @@ panels, described in the <a href="step9.html">step-by-step guide</a>.</p>
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/overview.html

@@ -145,7 +145,7 @@ downloads. HTTrack is fully configurable, and has an integrated help system.
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/plug.html

@@ -286,7 +286,7 @@ module exit point
 the function name and prototype MUST match this prototype
 */
 EXTERNAL_FUNCTION int hts_unplug(httrackp *opt) {
-  fprintf(stderr, "Module unplugged");
+  fprintf(stder, "Module unplugged");
 
   return 1;  /* success */
 }
@@ -331,7 +331,7 @@ httrack --wrapper mylibrary,myparameter-string http://www.example.com
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/plug_330.html

@@ -204,7 +204,7 @@ Below additional function names that can be defined inside the optional libhttra
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/scripting.html

@@ -250,7 +250,7 @@ Script example:
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/server/about.html

@@ -92,7 +92,7 @@ ${LANG_K3} : ${HTTRACK_WEB}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/addurl.html

@@ -159,7 +159,7 @@ ${do:end-if}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/error.html

@@ -72,7 +72,7 @@ ${error}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/file.html

@@ -96,7 +96,7 @@ ${do:loadhash}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/finished.html

@@ -143,7 +143,7 @@ ${path}/${projname}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/help.html

@@ -103,7 +103,7 @@ ${do:end-if}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/index.html

@@ -133,7 +133,7 @@ ${LANG_THANKYOU}!
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option1.html

@@ -158,7 +158,7 @@ ${do:end-if}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option10.html

@@ -160,7 +160,7 @@ ${LANG_IOPT10}:
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option11.html

@@ -250,7 +250,7 @@ ${LANG_W3}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option2.html

@@ -176,7 +176,7 @@ ${listid:build:LISTDEF_3}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option2b.html

@@ -140,7 +140,7 @@ ${do:output-mode:}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option3.html

@@ -191,7 +191,7 @@ ${listid:travel3:LISTDEF_11}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option4.html

@@ -184,7 +184,7 @@ ${LANG_I46}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option5.html

@@ -228,7 +228,7 @@ ${LANG_I64b}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option6.html

@@ -156,7 +156,7 @@ ${LANG_I43b}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option7.html

@@ -148,7 +148,7 @@ ${LANG_B13}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option8.html

@@ -212,7 +212,7 @@ ${LANG_STRIPQUERY}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/option9.html

@@ -166,7 +166,7 @@ ${listid:logtype:LISTDEF_9}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/refresh.html

@@ -204,7 +204,7 @@ ${LANG_H20} ${info.currentjob}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/step2.html

@@ -283,7 +283,7 @@ ${do:end-if:}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/step3.html

@@ -196,7 +196,7 @@ ${do:output-mode:}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/server/step4.html

@@ -324,7 +324,7 @@ ${do:output-mode:}
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
+	<td id="footer"><small><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></small></td>
 	</tr>
 </table>
 

html/shelldoc.html

@@ -141,7 +141,7 @@ You may encounter minor differences (in the display, or in various options) betw
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step.html

@@ -128,7 +128,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step1.html

@@ -143,7 +143,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step2.html

@@ -157,7 +157,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step3.html

@@ -151,7 +151,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step4.html

@@ -128,7 +128,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step5.html

@@ -127,7 +127,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9.html

@@ -144,7 +144,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt1.html

@@ -145,7 +145,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt10.html

@@ -150,7 +150,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt11.html

@@ -182,7 +182,7 @@ In this case, HTTrack won't check the type, because it has learned that "foo" is
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt2.html

@@ -181,7 +181,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt3.html

@@ -145,7 +145,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt4.html

@@ -176,7 +176,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt5.html

@@ -165,7 +165,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt6.html

@@ -162,7 +162,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt7.html

@@ -151,7 +151,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt8.html

@@ -141,7 +141,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

html/step9_opt9.html

@@ -156,7 +156,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
 	<tr>
-	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	<td id="footer"><small>&copy; 2007 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
 	</tr>
 </table>
 

src/htscharset.c

@@ -373,8 +373,7 @@ char *hts_convertStringCPFromUTF8(const char *s, size_t size, UINT cp) {
   return NULL;
 }
 
-HTSEXT_API char *hts_convertStringToUTF8(const char *s, size_t size,
-                                         const char *charset) {
+char *hts_convertStringToUTF8(const char *s, size_t size, const char *charset) {
   const UINT cp = hts_getCodepage(charset);
 
   return hts_convertStringCPToUTF8(s, size, cp);
@@ -555,8 +554,7 @@ static char *hts_convertStringCharset(const char *s, size_t size,
   return NULL;
 }
 
-HTSEXT_API char *hts_convertStringToUTF8(const char *s, size_t size,
-                                         const char *charset) {
+char *hts_convertStringToUTF8(const char *s, size_t size, const char *charset) {
   /* Empty string ? */
   if (size == 0) {
     return strdup("");

src/htscharset.h

@@ -51,8 +51,8 @@ typedef unsigned int hts_UCS4;
  * Convert the string "s" from charset "charset" to UTF-8.
  * Return NULL upon error.
  **/
-HTSEXT_API char *hts_convertStringToUTF8(const char *s, size_t size,
-                                         const char *charset);
+extern char *hts_convertStringToUTF8(const char *s, size_t size,
+                                     const char *charset);
 
 /**
  * Convert the string "s" from UTF-8 to charset "charset".

src/htscoremain.c

@@ -1055,7 +1055,6 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
               while(isdigit((unsigned char) *(com + 1)))
                 com++;
             }
-            break;
           case 'c':
             if (isdigit((unsigned char) *(com + 1))) {
               sscanf(com + 1, "%d", &opt->maxsoc);
@@ -2369,28 +2368,30 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
       opt->errlog = stderr;
     } else if (httrack_logmode >= 2) {
       // deux fichiers log
-      // path_log holds UTF-8 bytes (argv is UTF-8): the ANSI file calls would
-      // read them as the codepage and drop the logs into a mangled twin (#630).
-      structcheck_utf8(StringBuff(opt->path_log));
-      if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                              StringBuff(opt->path_log), "hts-log.txt")))
-        UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                       StringBuff(opt->path_log), "hts-log.txt"));
-      if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                              StringBuff(opt->path_log), "hts-err.txt")))
-        UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                       StringBuff(opt->path_log), "hts-err.txt"));
+      structcheck(StringBuff(opt->path_log));
+      if (fexist
+          (fconcat
+           (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-log.txt")))
+        remove(fconcat
+               (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-log.txt"));
+      if (fexist
+          (fconcat
+           (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-err.txt")))
+        remove(fconcat
+               (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-err.txt"));
 
       /* Check FS directory structure created */
-      structcheck_utf8(StringBuff(opt->path_log));
+      structcheck(StringBuff(opt->path_log));
 
-      opt->log = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log), "hts-log.txt"),
-                       "w");
+      opt->log =
+        fopen(fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-log.txt"),
+              "w");
       if (httrack_logmode == 2)
-        opt->errlog = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log), "hts-err.txt"),
-                            "w");
+        opt->errlog =
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-err.txt"),
+                "w");
       else
         opt->errlog = opt->log;
       if (opt->log == NULL) {

src/htsname.c

@@ -1532,30 +1532,8 @@ int url_savename(lien_adrfilsave *const afs,
       // last segment
       wsave[j++] = '/';
 #define MAX_UTF8_SEQ_CHARS 4
-      {
-        // #623: the ".delayed" placeholder marker sits at the tail; cutting
-        // through it drops IS_DELAYED_EXT, so the file is never renamed to its
-        // final name. Reserve the trailing ".<id>.delayed" across the cut.
-        size_t markStart = wsaveLen;
-        if (IS_DELAYED_EXT(afs->save)) {
-          const size_t extDot = wsaveLen - strlen("." DELAYED_EXT);
-          size_t p = extDot; /* walk back over a dot-separated ".<hexid>" tag */
-
-          while (p > lastSeg && ((wsave[p - 1] >= '0' && wsave[p - 1] <= '9') ||
-                                 (wsave[p - 1] >= 'a' && wsave[p - 1] <= 'f')))
-            p--;
-          // keep the tag only if truly ".<hexid>.delayed"; else the bare marker
-          // (a wholly-hex base, e.g. a hashed #133 name, must not be absorbed)
-          markStart = (p > lastSeg && p < extDot && wsave[p - 1] == '.')
-                          ? p - 1
-                          : extDot;
-        }
-        // head, bounded so the marker still fits, then the marker itself
-        for (i = lastSeg; i < markStart && j + (wsaveLen - markStart) < maxLen;
-             i++)
-          wsave[j++] = wsave[i];
-        for (i = markStart; i < wsaveLen && j < maxLen; i++)
-          wsave[j++] = wsave[i];
+      for(i = lastSeg; wsave[i] != '\0' && j < maxLen; i++) {
+        wsave[j++] = wsave[i];
       }
       // terminating \0
       wsave[j++] = '\0';

src/htsserver.c

@@ -40,7 +40,6 @@ Please visit our Website: http://www.httrack.com
 
 #include "htsnet.h"
 #include "htslib.h"
-#include "htscharset.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -750,14 +749,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                            RUN THE SERVER
                          */
                         if (strcmp((char *) adrcd, "start") == 0) {
-                          /* POST body is in the form's charset, not the
-                             UTF-8 argv the engine now assumes (#629). */
-                          char *const cmdl = (char *) adr + p;
-                          char *cmdlUtf8 = hts_convertStringToUTF8(
-                              cmdl, strlen(cmdl), LANGSEL("LANGUAGE_CHARSET"));
-
-                          webhttrack_main(cmdlUtf8 != NULL ? cmdlUtf8 : cmdl);
-                          freet(cmdlUtf8);
+                          webhttrack_main((char *) adr + p);
                         } else {
                           commandRunning = 0;
                           commandEnd = 1;

src/htsweb.c

@@ -65,7 +65,6 @@ Please visit our Website: http://www.httrack.com
 #include "htsserver.h"
 #include "htsurlport.h"
 #include "htsweb.h"
-#include "htscharset.h"
 
 #if USE_BEGINTHREAD==0
 #error fatal: no threads support
@@ -157,7 +156,6 @@ int main(int argc, char *argv[]) {
   printf("Initializing the server..\n");
 
 #ifdef _WIN32
-  hts_argv_utf8(&argc, &argv);
   {
     WORD wVersionRequested;     // requested version WinSock API
     WSADATA wsadata;            // Windows Sockets API data

src/vcpkg.json

@@ -1,12 +1,12 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "$schema":
+      "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "libhttrack",
   "version-string": "3.49",
-  "builtin-baseline": "cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3",
   "dependencies": [
     "brotli",
     "openssl",
     "zlib",
     "zstd"
   ]
-}
+}

tests/01_engine-cmdline.test

@@ -155,22 +155,4 @@ accepted "$tmp/pre-bti" "#615: -%i before the URL broke the crawl"
 run_only "$tmp/pre-proto" "-@i2" "file://$tmp/index.html"
 accepted "$tmp/pre-proto" "#615: -@i2 before the URL broke the crawl"
 
-# -K must not reset the -c socket count (its case fell through into 'c'). maxsoc
-# is only observable via the ">8, limited to 8" warning: -c16 trips it, and would
-# stop tripping it if a trailing -K reset the count back to the default 4.
-warned() {
-    grep -q 'simultaneous connections limited to' "$1/hts-log.txt" ||
-        ! echo "FAIL: $2" || exit 1
-}
-not_warned() {
-    ! grep -q 'simultaneous connections limited to' "$1/hts-log.txt" ||
-        ! echo "FAIL: $2" || exit 1
-}
-run "$tmp/soc-c16" -c16
-warned "$tmp/soc-c16" "-c16 did not trip the socket-count warning (probe blind)"
-run "$tmp/soc-c16k" -c16 -K
-warned "$tmp/soc-c16k" "-K reset the -c socket count (fell through into 'c')"
-run "$tmp/soc-c8k" -c8 -K
-not_warned "$tmp/soc-c8k" "-c8 -K spuriously warned"
-
 exit 0

tests/67_engine-delayed-truncate.test

@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# #623: url_savename enforces the 236-char path ceiling by cutting the tail of
-# the last segment, where the mandatory ".delayed" placeholder marker lives. A
-# cut marker fails IS_DELAYED_EXT, so back_delayed_rename never renames the file
-# to its final name and the download is lost. The marker must survive the cut.
-
-# statuscode=302 status=-1 = a redirect answer still downloading: no type is
-# resolved, so the name gets a ".<id>.delayed" placeholder (see 01_engine-savename).
-CEIL=236
-
-httrack_bin=$(cd "$(dirname "$(command -v httrack)")" && pwd)/httrack
-scratch=$(mktemp -d)
-trap 'rm -rf "$scratch"' EXIT
-cd "$scratch"
-
-run() {
-    "$httrack_bin" -O /dev/null -#test=savename "$@" | sed -n 's/^savename: //p'
-}
-
-# A deep path ending in a long segment that overruns the ceiling.
-deep="/d1$(printf 'a%.0s' {1..40})/d2$(printf 'b%.0s' {1..40})"
-deep="$deep/d3$(printf 'c%.0s' {1..40})/d4$(printf 'd%.0s' {1..40})"
-long="$deep/$(printf 'z%.0s' {1..90})"
-
-out="$(run "$long" text/html statuscode=302 status=-1)"
-case "$out" in
-*.delayed) ;;
-*)
-    echo "FAIL: delayed marker cut by truncation: '$out'"
-    exit 1
-    ;;
-esac
-test "${#out}" -le "$CEIL" || {
-    echo "FAIL: truncated name ${#out} > $CEIL ceiling: '$out'"
-    exit 1
-}
-
-# #133-style hashed name: an all-hex last segment must keep the marker too (the
-# ".<id>." tag is not mistaken for part of the hash).
-hexseg=$(printf 'a1b2c3d4e5f60718%.0s' {1..8})
-hexpath="/d1$(printf 'x%.0s' {1..30})/d2$(printf 'y%.0s' {1..30})/$hexseg"
-out="$(run "$hexpath" text/html statuscode=302 status=-1)"
-case "$out" in
-*.delayed) ;;
-*)
-    echo "FAIL: hashed-name marker cut by truncation: '$out'"
-    exit 1
-    ;;
-esac
-test "${#out}" -le "$CEIL" || {
-    echo "FAIL: hashed name ${#out} > $CEIL ceiling: '$out'"
-    exit 1
-}
-
-# A non-delayed name of the same shape still truncates, with no marker to keep.
-out="$(run "$long.html" text/html)"
-test "${#out}" -le "$CEIL" || {
-    echo "FAIL: non-delayed name ${#out} > $CEIL ceiling: '$out'"
-    exit 1
-}
-case "$out" in
-*.delayed)
-    echo "FAIL: non-delayed name grew a .delayed marker: '$out'"
-    exit 1
-    ;;
-esac
-
-echo "delayed-truncate OK"

tests/68_webhttrack-outdir-charset.test

@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# webhttrack's POST body arrives in the form's declared charset, not UTF-8, yet
-# the engine now assumes UTF-8 argv. A non-ASCII -O output dir submitted through
-# the web UI must land under the UTF-8 directory, not an ISO-8859-1 twin (#629).
-# Drives the real htsserver over HTTP; the default (English) form is served
-# ISO-8859-1, so 'café' travels as the single byte 0xE9. The crawl target is a
-# dead port: only the -O directory name is under test, and htsserver creates it
-# from the decoded path before any fetch.
-
-set -euo pipefail
-
-testdir=$(cd "$(dirname "$0")" && pwd)
-distdir=${top_srcdir:-$(cd "${testdir}/.." && pwd)}
-distdir=$(cd "${distdir}" && pwd)
-# shellcheck source=tests/testlib.sh
-. "${testdir}/testlib.sh"
-
-fail() {
-    echo "FAIL: $*" >&2
-    exit 1
-}
-
-command -v htsserver >/dev/null || fail "no htsserver in PATH"
-python=$(find_python) || {
-    echo "python3 not found; skipping" >&2
-    exit 77
-}
-
-work=$(mktemp -d "${TMPDIR:-/tmp}/webhttrack_charset.XXXXXX") || fail "no tmpdir"
-srvlog=$(mktemp)
-srv=
-cleanup() {
-    # htsserver keeps SIGTERM ignored across its exec, so only -9 reaps it.
-    test -z "${srv}" || kill -9 "${srv}" 2>/dev/null || true
-    wait "${srv}" 2>/dev/null || true # absorb bash's async "Killed" notice
-    rm -rf "${work}" "${srvlog}"
-}
-trap cleanup EXIT HUP INT QUIT PIPE TERM
-
-# webhttrack server on a pre-picked port; an isolated HOME keeps a stray
-# ~/.httrack.ini out of it.
-sport=$("${python}" -c 'import socket
-s = socket.socket()
-s.bind(("127.0.0.1", 0))
-print(s.getsockname()[1])
-s.close()')
-(
-    trap '' TERM TTOU
-    export HOME="${work}"
-    exec htsserver "${distdir}/" --port "${sport}" >"${srvlog}" 2>&1
-) &
-srv=$!
-for _ in $(seq 1 40); do
-    url=$(sed -n 's/^URL=//p' "${srvlog}") && test -n "${url}" && break
-    kill -0 "${srv}" 2>/dev/null || break
-    sleep 0.25
-done
-test -n "${url:-}" || fail "htsserver did not start: $(cat "${srvlog}")"
-
-# Post a "start" whose -O dir is 'café' in the form's ISO-8859-1 charset.
-"${python}" - "${url}" "${work}" <<'PY'
-import sys, urllib.parse, urllib.request
-
-url, work = sys.argv[1], sys.argv[2]
-outdir = work + "/caf\xe9"  # 'café' as the single byte the browser would send
-# Port 1 refuses at once: only the decoded -O dir matters, not the fetch.
-cmd = "httrack --quiet --robots=0 http://127.0.0.1:1/x.html -O " + outdir
-fields = [("path", work), ("projname", "proj"), ("command_do", "start"),
-          ("winprofile", "x"), ("command", cmd)]
-body = "&".join("%s=%s" % (k, urllib.parse.quote(v, safe="", encoding="latin-1"))
-                for k, v in fields)
-req = urllib.request.Request(url + "step4.html", data=body.encode("latin-1"),
-                             method="POST")
-urllib.request.urlopen(req, timeout=20).read()
-PY
-
-# The crawl runs inside htsserver; wait for the -O dir, then check it chose the
-# UTF-8 name and not the ISO-8859-1 twin.
-utf8dir="${work}/café"
-latin1dir="${work}/caf"$'\xe9'
-for _ in $(seq 1 80); do
-    test -e "${utf8dir}" && break
-    kill -0 "${srv}" 2>/dev/null || break
-    sleep 0.25
-done
-test -e "${utf8dir}" || fail "-O dir never landed as UTF-8 café/: $(find "${work}" -maxdepth 2 2>/dev/null)"
-test ! -e "${latin1dir}" || fail "-O dir created as the ISO-8859-1 twin instead"
-
-echo "PASS"

tests/69_local-intl-logdir.test

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# A single non-ASCII -O sets both path_html and path_log to "café" (#630). The
-# logs (hts-log.txt/hts-err.txt) must land there, not in an ANSI-mangled twin:
-# on Windows path_log holds UTF-8 bytes the raw file calls read as the codepage.
-# The --errors/--files/--log-found audits all grep logroot=café/hts-log.txt, so
-# a log written to the twin fails them. POSIX has no twin, so this bites on the
-# Windows CI leg (like test 64). The cache twin is a separate, larger fix.
-
-: "${top_srcdir:=..}"
-
-bash "$top_srcdir/tests/local-crawl.sh" --outdir-intl 'café' --errors 0 --files 5 \
-    --found 'simple/basic.html' \
-    --log-found 'mirror complete in' \
-    httrack 'BASEURL/simple/basic.html'

tests/71_local-crange-repaircache.test

@@ -1,134 +0,0 @@
-#!/bin/bash
-# #581: an interrupted mirror can leave a truncated new.zip that pass 2 must
-# repair before resuming. The repaired-cache resume then hits the same hostile
-# 206 as test 48, so restart-whole must still drop the partial and refetch the
-# whole file. Pass 1 leaves a partial + temp-ref; we truncate new.zip past its
-# last local entry (dropping the central directory) so unzOpen fails and the
-# repair path runs; pass 2 resumes, rejects the range, and refetches whole.
-set -u
-
-: "${top_srcdir:=..}"
-testdir=$(cd "$(dirname "$0")" && pwd)
-# shellcheck source=tests/testlib.sh
-. "${testdir}/testlib.sh"
-server=$(nativepath "${testdir}/local-server.py")
-root=$(nativepath "${testdir}/server-root")
-
-python=$(find_python) || ! echo "python3 not found; skipping" >&2 || exit 77
-
-# On Windows the pass-1 interrupt is a hard kill (MSYS can't signal a native
-# exe) and the restart-whole path fails on the repaired cache (#581) -- the very
-# bug this exercises; skip until the engine fix lands.
-if is_windows; then
-    echo "Windows: restart-whole fails on a repaired cache (#581), skipping"
-    exit 77
-fi
-
-tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/httrack_crangerep.XXXXXX") || exit 1
-serverpid=
-crawlpid=
-cleanup() {
-    test -n "$crawlpid" && kill -9 "$crawlpid" 2>/dev/null
-    stop_server "$serverpid"
-    rm -rf "$tmpdir"
-}
-trap cleanup EXIT HUP INT QUIT PIPE TERM
-
-serverlog="${tmpdir}/server.log"
-: >"$serverlog"
-"$python" "$server" --root "$root" >"$serverlog" 2>&1 &
-serverpid=$!
-port=
-for _ in $(seq 1 50); do
-    line=$(head -n1 "$serverlog" 2>/dev/null)
-    if test "${line%% *}" == "PORT"; then
-        port="${line#PORT }"
-        break
-    fi
-    kill -0 "$serverpid" 2>/dev/null || {
-        echo "server exited early: $(cat "$serverlog")"
-        exit 1
-    }
-    sleep 0.1
-done
-test -n "$port" || {
-    echo "could not discover server port"
-    exit 1
-}
-base="http://127.0.0.1:${port}"
-
-which httrack >/dev/null || {
-    echo "could not find httrack"
-    exit 1
-}
-out="${tmpdir}/crawl"
-mkdir "$out"
-common=(-O "$out" --quiet --disable-security-limits --robots=0 --timeout=30 --retries=1 -c1)
-refdir="${out}/hts-cache/ref"
-newzip="${out}/hts-cache/new.zip"
-
-# --- pass 1: crawl, interrupt once the blob download is underway -------------
-printf '[pass 1: interrupt mid-download] ..\t'
-httrack "${common[@]}" "${base}/crange206mem/index.html" >"${tmpdir}/log1" 2>&1 &
-crawlpid=$!
-for _ in $(seq 1 300); do
-    test -n "$(find "$refdir" -name '*.ref' 2>/dev/null)" && break
-    kill -0 "$crawlpid" 2>/dev/null || break
-    sleep 0.1
-done
-sleep 0.3
-kill -TERM "$crawlpid" 2>/dev/null
-wait "$crawlpid" 2>/dev/null
-crawlpid=
-test -n "$(find "$refdir" -name '*.ref' 2>/dev/null)" || {
-    echo "FAIL: no temp-ref survived pass 1; cannot drive the resume"
-    exit 1
-}
-echo "OK (temp-ref present)"
-
-# --- damage the cache: drop the central directory a hard kill never wrote ----
-printf '[damage new.zip -> forces repair] ..\t'
-"$python" - "$newzip" <<'PY' || exit 1
-import os, sys
-path = sys.argv[1]
-data = open(path, "rb").read()
-cut = data.find(b"PK\x01\x02")  # first central-directory header
-if cut <= 0:
-    sys.exit("no central directory to drop in %s" % path)
-os.truncate(path, cut)
-PY
-echo "OK"
-
-# --- pass 2: --continue -> repair -> resume -> hostile 206 -> refetch whole ---
-printf '[pass 2: repair, reject range, refetch] ..\t'
-rc=0
-httrack "${common[@]}" --continue "${base}/crange206mem/index.html" >"${tmpdir}/log2" 2>&1 || rc=$?
-test "$rc" -eq 0 || {
-    echo "FAIL: httrack exited $rc"
-    cat "${tmpdir}/log2" >&2
-    exit 1
-}
-echo "OK (terminated)"
-
-# The repair path must actually have run, else this is just a copy of test 48.
-printf '[cache repair fired] ..\t'
-grep -q 'damaged cache' "${out}/hts-log.txt" 2>/dev/null || {
-    echo "FAIL: repair path did not run; damage was ineffective"
-    exit 1
-}
-echo "OK"
-
-blob=$(find "$out" -name blob.bin 2>/dev/null | head -1)
-full=6008 # len(CRANGE206_BODY) = len("CR206DAT") + 6000
-
-printf '[file recovered whole] ..\t'
-test -s "$blob" || {
-    echo "FAIL: blob.bin missing after the repaired-cache resume"
-    exit 1
-}
-got=$(wc -c <"$blob")
-test "$got" -eq "$full" || {
-    echo "FAIL: blob.bin is ${got} bytes, expected ${full}"
-    exit 1
-}
-echo "OK (${got} bytes)"

tests/Makefile.am

@@ -148,10 +148,6 @@ TESTS = \
 	63_webhttrack-home.test \
 	64_local-intl-outdir.test \
 	65_port-siblings.test \
-	66_engine-port80-strip.test \
-	67_engine-delayed-truncate.test \
-	68_webhttrack-outdir-charset.test \
-	69_local-intl-logdir.test \
-	71_local-crange-repaircache.test
+	66_engine-port80-strip.test
 
 CLEANFILES = check-network_sh.cache

tests/local-crawl.sh

@@ -48,7 +48,6 @@ key="${testdir}/server.key"
 tls=
 verbose=
 html_subdir=
-outdir_intl=
 rerun=
 rerun_args=
 rerun_dead=
@@ -141,13 +140,6 @@ while test "$pos" -lt "$nargs"; do
         pos=$((pos + 1))
         html_subdir="${args[$pos]}"
         ;;
-    --outdir-intl)
-        # Single non-ASCII -O "$out/NAME": path_html AND path_log are NAME, so
-        # the logs (and the harness reads of them) go through the non-ASCII path
-        # (#630). Distinct from --html-subdir, which keeps path_log ASCII.
-        pos=$((pos + 1))
-        outdir_intl="${args[$pos]}"
-        ;;
     --errors | --errors-content | --files)
         audit+=("${args[$pos]}" "${args[$((pos + 1))]}")
         pos=$((pos + 1))
@@ -224,18 +216,13 @@ test -n "$ver" || die "could not run httrack"
 out="${tmpdir}/crawl"
 mkdir "$out" || die "could not create $out"
 # path_html holds the mirror + index; path_log holds hts-cache/hts-log.txt.
-# Default: both are "$out". --html-subdir moves path_html to "$out/NAME" while
-# path_log (logroot) stays "$out"; --outdir-intl moves both to "$out/NAME".
+# Default: both are "$out". With --html-subdir, path_html becomes "$out/NAME"
+# (the mirror root the audits inspect) while path_log stays "$out".
 mirrorroot="$out"
-logroot="$out"
 odir="$out"
 if test -n "$html_subdir"; then
     mirrorroot="${out}/${html_subdir}"
     odir="${mirrorroot},${out}"
-elif test -n "$outdir_intl"; then
-    mirrorroot="${out}/${outdir_intl}"
-    logroot="$mirrorroot"
-    odir="$mirrorroot"
 fi
 # Localhost is fast; disable the rate/bandwidth safety limits but keep a
 # max-time backstop so a hang cannot wedge the suite.
@@ -254,7 +241,7 @@ test "$crawlres" -eq 0 || ! result "httrack exited $crawlres" || {
     exit 1
 }
 result "OK"
-grep -iE "^[0-9:]*[[:space:]]Error:" "${logroot}/hts-log.txt" >&2
+grep -iE "^[0-9:]*[[:space:]]Error:" "${out}/hts-log.txt" >&2
 
 # --- optional second pass: re-mirror into the same dir (cache/update path) ----
 if test -n "$rerun"; then
@@ -273,7 +260,7 @@ if test -n "$rerun"; then
     # The update summary reports "files updated"; a fresh crawl never does. Assert
     # it so a regression that bypasses the cache (re-crawls fresh) can't pass.
     info "checking update used the cache"
-    if grep -aqE "mirror complete in .*files updated" "${logroot}/hts-log.txt"; then
+    if grep -aqE "mirror complete in .*files updated" "${out}/hts-log.txt"; then
         result "OK"
     else
         result "update pass did not report cache activity"
@@ -305,7 +292,7 @@ if test -n "$rerun_dead"; then
     zip="${out}/hts-cache/new.zip"
     test -s "$zip" || die "no cache was written by the first pass"
     cp "$zip" "${tmpdir}/cache-before.zip"
-    cp "${logroot}/hts-log.txt" "${tmpdir}/log-before.txt"
+    cp "${out}/hts-log.txt" "${tmpdir}/log-before.txt"
     stop_server "$serverpid"
     serverpid=
     info "re-running httrack against the stopped server"
@@ -318,7 +305,7 @@ if test -n "$rerun_dead"; then
     # The dead pass must have gone through the no-data rollback, not bailed out
     # before the mirror loop (which would leave the cache trivially untouched).
     info "checking the dead pass hit the rollback"
-    if grep -aq "No data seems to have been transferred" "${logroot}/hts-log.txt"; then
+    if grep -aq "No data seems to have been transferred" "${out}/hts-log.txt"; then
         result "OK"
     else
         result "rollback notice not found in hts-log.txt"
@@ -333,7 +320,7 @@ if test -n "$rerun_dead"; then
         exit 1
     fi
     # Audits below describe the healthy crawl, not the dead pass.
-    cp "${tmpdir}/log-before.txt" "${logroot}/hts-log.txt"
+    cp "${tmpdir}/log-before.txt" "${out}/hts-log.txt"
 fi
 
 # --- discover the single host root (127.0.0.1_<port> or 127.0.0.1) -----------
@@ -363,19 +350,19 @@ while test "$i" -lt "${#audit[@]}"; do
     --errors)
         i=$((i + 1))
         assert_equals "checking errors" "${audit[$i]}" \
-            "$(grep -iEc "^[0-9:]*[[:space:]]Error:" "${logroot}/hts-log.txt")"
+            "$(grep -iEc "^[0-9:]*[[:space:]]Error:" "${out}/hts-log.txt")"
         ;;
     --errors-content)
         i=$((i + 1))
-        total=$(grep -icE "^[0-9:]*[[:space:]]Error:" "${logroot}/hts-log.txt")
+        total=$(grep -icE "^[0-9:]*[[:space:]]Error:" "${out}/hts-log.txt")
         # transient network failures (statuscode -2..-6) flake on busy loopback;
         # the code parens are followed by " at link" or " after N retries at link"
-        transient=$(grep -cE '\(-[2-6]\) (at link|after )' "${logroot}/hts-log.txt" || true)
+        transient=$(grep -cE '\(-[2-6]\) (at link|after )' "${out}/hts-log.txt" || true)
         assert_equals "checking content errors" "${audit[$i]}" "$((total - transient))"
         ;;
     --files)
         i=$((i + 1))
-        nFiles=$(grep -E "^HTTrack Website Copier/[^ ]* mirror complete in " "${logroot}/hts-log.txt" |
+        nFiles=$(grep -E "^HTTrack Website Copier/[^ ]* mirror complete in " "${out}/hts-log.txt" |
             sed -e 's/.*[[:space:]]\([^ ]*\)[[:space:]]files written.*/\1/g')
         assert_equals "checking files" "${audit[$i]}" "$nFiles"
         ;;
@@ -406,7 +393,7 @@ while test "$i" -lt "${#audit[@]}"; do
     --log-found)
         i=$((i + 1))
         info "checking log matches ${audit[$i]}"
-        if grep -aqE "${audit[$i]}" "${logroot}/hts-log.txt"; then result "OK"; else
+        if grep -aqE "${audit[$i]}" "${out}/hts-log.txt"; then result "OK"; else
             result "not in log"
             exit 1
         fi
@@ -414,7 +401,7 @@ while test "$i" -lt "${#audit[@]}"; do
     --log-not-found)
         i=$((i + 1))
         info "checking log lacks ${audit[$i]}"
-        if grep -aqE "${audit[$i]}" "${logroot}/hts-log.txt"; then
+        if grep -aqE "${audit[$i]}" "${out}/hts-log.txt"; then
             result "present in log"
             exit 1
         else result "OK"; fi