Never let the log salvage's cleanup fail the test

dump_crawl_logs runs on the timeout path, where the caller is already
handling a failure: rm -rf can fail on Windows while the killed httrack
still holds a file, and under set -e that would abort the branch whose
whole job is to salvage the evidence.

Renumber the test to 60: #611 adds a 59 too.

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

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.71])
 
-AC_INIT([httrack], [3.49.13], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.12], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_COPYRIGHT([
 HTTrack Website Copier, Offline Browser for Windows and Unix
 Copyright (C) 1998-2015 Xavier Roche and other contributors
@@ -29,13 +29,11 @@ AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([subdir-objects])
-# 3:5:0: 3.49.13 leaves every installed struct layout and the exported symbol set
-# untouched vs 3.49.12; the 2 GB (_stat64) and UTF-8 export widenings are _WIN32-only,
-# and INTsys widened on POSIX (#600) but sits in no installed struct. Stays soname
-# .so.3; bump revision. x32 alone changes layout (LLint was 4 bytes there, #524), and
-# is not a release architecture.
+# 3:4:0: 3.49.12 tail-appends one field (why_url) to httrackp and otherwise only
+# deletes dead comments; no struct layout or exported signature broke vs 3.49.11,
+# so it stays soname .so.3; bump revision.
 # (3:0:0 was the htsblk mime-buffer widening, the ABI break that moved .so.2 -> .so.3.)
-VERSION_INFO="3:5:0"
+VERSION_INFO="3:4:0"
 AM_MAINTAINER_MODE
 AC_USE_SYSTEM_EXTENSIONS
 

debian/changelog

@@ -1,18 +1,3 @@
-httrack (3.49.13-1) unstable; urgency=medium
-
-  * New upstream release: SOCKS5 and CONNECT proxy support, brotli and zstd
-    content decoding, --update data-loss fixes, and hardening of several
-    network-facing parsers; full list in history.txt.
-  * Add libbrotli-dev and libzstd-dev to Build-Depends for the new content
-    codings.
-  * libhttrack3 and libhttrack-dev no longer ship libhtsjava.so.3*: the
-    obsolete Java-applet parser was removed upstream. It was a dlopen plugin
-    with no reverse dependencies, so this is a plain file drop on upgrade;
-    libhttrack.so.3 itself is unchanged and needs no rename.
-  * Drop the htsjava attribution from debian/copyright.
-
- -- Xavier Roche <xavier@debian.org>  Fri, 17 Jul 2026 10:49:52 +0200
-
 httrack (3.49.12-1) unstable; urgency=medium
 
   * New upstream release: security and crawl-correctness fixes (remote stack

history.txt

@@ -4,31 +4,6 @@ HTTrack Website Copier release history:
 
 This file lists all changes and fixes that have been made for HTTrack
 
-3.49-13
-+ New: SOCKS5 proxy support, with scheme-aware -P URLs (socks5://, socks5h://, connect://) and plain HTTP tunneled through a CONNECT-only proxy (#563, #564)
-+ New: decode brotli and zstd content codings, advertised over TLS only as browsers do (#556)
-+ New: webhttrack exposes the engine options added since 3.49-2, among them --cookies-file, --pause and --strip-query (#587)
-+ Fixed: files of 2 GB or more were mishandled on Windows and on every 32-bit build (#569)
-+ Fixed: --update destroyed a good local copy when the re-fetch returned an HTTP error, was aborted by -M/-E, failed to decode, or came in short (#176, #521, #557, #562)
-+ Fixed: a self-redirect cookie wall was dropped instead of being re-fetched with the cookie (#15)
-+ Fixed: a stalled TLS handshake ignored --timeout, and synchronous DNS resolution could wedge a crawl past --max-time (#607, #613)
-+ Fixed: -M metered saved bytes rather than received volume, and overshot its cap under a slow server (#77, #520)
-+ Fixed: several network-facing overflows and denial-of-service paths in the Content-Range, chunked-transfer, cookie, filter and ProxyTrack cache parsers
-+ Fixed: a failed connect did not fall back to the next address on Windows (#579)
-+ Fixed: -P took an out-of-range port as a garbage port, and scanned past an IPv6 literal's closing bracket (#598, #602)
-+ Fixed: reject a port outside 1..65535 wherever one is parsed (a crawled URL, the htsserver and proxytrack listen arguments, an ftp:// URL), instead of letting a bare sscanf wrap a huge value into a plausible port and silently use it (#614, #626)
-+ Fixed: a configured proxy still resolved and dialed the origin itself (#592)
-+ Fixed: ~/ in the -O base path was never expanded (#270)
-+ Fixed: a non-ASCII -O output path was double-encoded on Windows once argv became UTF-8 (#621)
-+ Fixed: files under a non-ASCII project path were saved to a mangled directory on Windows (#217)
-+ Fixed: --build-top-index (-%i) and --protocol (-@i) were taken for the -i continue flag, wiping the URL list and exiting on the usage screen (#615)
-+ Fixed: webhttrack ignored LC_ALL/LC_MESSAGES and picked the wrong Chinese and Portuguese (#95)
-+ Fixed: webhttrack wrote its base path and httrack.ini to the filesystem root when $HOME was empty (#625)
-+ Fixed: crawls on a non-default port were slowed by a per-request pre-resolve (#181)
-+ Changed: Windows builds moved to Visual Studio 2022 and OpenSSL 3.x, the VS2008 project files are retired, and the binaries carry a version resource
-+ Changed: removed the obsolete Java-applet (.class) parser and the dead SWF module remnants
-+ Changed: multiple internal hardening, test and CI improvements (Windows and macOS crawl suites, HTML-parser fuzzing, parallel make check)
-
 3.49-12
 + New: --why explains which filter rule accepts or rejects a given URL, then exits (#505)
 + Fixed: links carrying raw UTF-8 bytes were fetched double-encoded and 404'd (#516)

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>
 

lang.indexes

@@ -23,7 +23,7 @@ pt:7
 ro:25
 ru:8
 sk:20
-sl:24
+si:24
 sv:17
 tr:10
 uk:22

lang/Finnish.txt

@@ -930,6 +930,7 @@ Server terminated
 Palvelin lopetettu
 A fatal error has occurred during this mirror
 Tällä peilillä tapahtui vakava virhe
+
 Proxy type:
 Välityspalvelimen tyyppi:
 Proxy protocol. HTTP: standard proxy. HTTP (CONNECT tunnel): sends every request through a CONNECT tunnel, for CONNECT-only proxies like Tor's HTTPTunnelPort. SOCKS5: default port 1080.

lang/Italiano.txt

@@ -374,7 +374,7 @@ Create error logging and report files
 Crea file di log per segnalare errori e informazioni
 Generate DOS 8-3 filenames ONLY
 Genera solo nomi di file in formato 8.3
-Generate ISO9660 filenames ONLY for CDROM medias
+Generate ISO 9660 filenames ONLY for CDROM medias
 Genera nomi di file in formato ISO9660 per i CDROM
 Do not create HTML error pages
 Non generare pagine d'errore HTML

lang/Portugues-Brasil.txt

@@ -918,7 +918,7 @@ normal\nextended\ndebug
 normal\nextendido\ncorrigir
 Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
 Copiar site(s) da Web\nCopiar site(s) interativos da Web (perguntas)\nReceber arquivos específicos\nCopiar todas as páginas do site (alternação múltipla)\nTestar links nas páginas (testar indicador)\n* Retomar download interrompido\n* Atualizar download existente
-Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
+Relative URL / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
 URI Relativa / URL Absoluta (padrão)\nURL Absoluta / URL Absoluta\nURI Absoluta / URL Absoluta\nURL Original / URL Original
 Open Source offline browser
 Abrir origem offline no navegador

lang/Slovenian.txt

@@ -3,7 +3,7 @@ Slovenian
 LANGUAGE_FILE
 Slovenian
 LANGUAGE_ISO
-sl
+si
 LANGUAGE_AUTHOR
 Jadran Rudec,iur.\r\njrudec@email.si \r\n
 LANGUAGE_CHARSET

src/Makefile.am

@@ -46,11 +46,9 @@ htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
 
 lib_LTLIBRARIES = libhttrack.la
 
-htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h \
-	htsurlport.c htsurlport.h
+htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
 proxytrack_SOURCES = proxy/main.c \
 	proxy/proxytrack.c proxy/store.c \
-	htsurlport.c htsurlport.h \
 	coucal/coucal.c htsmd5.c md5.c \
 	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c
 
@@ -60,7 +58,7 @@ whttrackrun_SCRIPTS = webhttrack
 libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	htscache_selftest.c htsdns_selftest.c htsselftest.c \
 	htscatchurl.c htsfilters.c htsftp.c htshash.c coucal/coucal.c \
-	htshelp.c htslib.c htsurlport.c htscoremain.c \
+	htshelp.c htslib.c htscoremain.c \
 	htsname.c htsrobots.c htstools.c htswizard.c \
 	htsalias.c htsthread.c htsindex.c htsbauth.c \
 	htsmd5.c htscodec.c htsproxy.c htszlib.c htswrap.c htsconcat.c \
@@ -71,7 +69,7 @@ libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	htsbasenet.h htsbauth.h htscache.h htscache_selftest.h htsdns_selftest.h htsselftest.h htscatchurl.h  \
 	htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h  \
 	htsfilters.h htsftp.h htsglobal.h htshash.h coucal/coucal.h \
-	htshelp.h htsindex.h htslib.h htsurlport.h htsmd5.h \
+	htshelp.h htsindex.h htslib.h htsmd5.h \
 	htsmodules.h htsname.h htsnet.h htssniff.h \
 	htsopt.h htsrobots.h htsthread.h  \
 	htstools.h htswizard.h htswrap.h htscodec.h htsproxy.h htszlib.h  \

src/htsalias.c

@@ -567,29 +567,24 @@ int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk,
   return 0;
 }
 
-/* Get home directory, '.' if unset or empty */
+/* Get home directory, '.' if failed */
 /* example: /home/smith */
 const char *hts_gethome(void) {
   const char *home = getenv("HOME");
 
-  /* An empty $HOME would expand ~/foo into the absolute /foo */
-  return strnotempty(home) ? home : ".";
+  if (home)
+    return home;
+  else
+    return ".";
 }
 
-/* Convert ~/foo into /home/smith/foo (~user/ left alone: no getpwnam here) */
+/* Convert ~/foo into /home/smith/foo */
 void expand_home(String * str) {
-  if (StringNotEmpty(*str) && StringSub(*str, 0) == '~' &&
-      (StringLength(*str) == 1 || StringSub(*str, 1) == '/')) {
+  if (StringSub(*str, 1) == '~') {
     char BIGSTK tempo[HTS_URLMAXSIZE * 2];
-    const char *const home = hts_gethome();
-    const size_t homelen = strlen(home);
-    const size_t taillen = StringLength(*str) - 1;
 
-    /* Leave untouched rather than abort() in strcatbuff on a huge $HOME */
-    if (taillen < sizeof(tempo) && homelen < sizeof(tempo) - taillen) {
-      strcpybuff(tempo, home);
-      strcatbuff(tempo, StringBuff(*str) + 1);
-      StringCopy(*str, tempo);
-    }
+    strcpybuff(tempo, hts_gethome());
+    strcatbuff(tempo, StringBuff(*str) + 1);
+    StringCopy(*str, tempo);
   }
 }

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

@@ -113,7 +113,6 @@ HTSEXT_API int hts_main(int argc, char **argv) {
 }
 
 static int hts_main_internal(int argc, char **argv, httrackp * opt);
-static hts_boolean cmdl_shortopt_has(const char *s, char c);
 
 // Main, récupère les paramètres et appelle le robot
 HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
@@ -305,12 +304,12 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                      hts_get_version_info(opt));
               return 0;
             } else {
-              if (strncmp(tmp_argv[0], "--", 2)) { /* not a long option */
-                if (cmdl_shortopt_has(tmp_argv[0], 'q'))
-                  opt->quiet = HTS_TRUE; // never ask questions (nohup)
-                if (cmdl_shortopt_has(tmp_argv[0], 'i')) { // doit.log!
-                  argv_url = -1;
-                  opt->quiet = HTS_TRUE;
+              if (strncmp(tmp_argv[0], "--", 2)) {      /* pas */
+                if ((strchr(tmp_argv[0], 'q') != NULL))
+                  opt->quiet = 1;       // ne pas poser de questions! (nohup par exemple)
+                if ((strchr(tmp_argv[0], 'i') != NULL)) {       // doit.log!
+                  argv_url = -1;        /* forcer */
+                  opt->quiet = 1;
                 }
               } else if (strcmp(tmp_argv[0] + 2, "quiet") == 0) {
                 opt->quiet = 1; // ne pas poser de questions! (nohup par exemple)
@@ -425,10 +424,25 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
 
       }                         // for
 
-      // path_html is already UTF-8 (argv is UTF-8 on Windows via
-      // hts_argv_utf8), so no re-encoding.
+      // Convert path to UTF-8
+#ifdef _WIN32
+      {
+        char *const path =
+          hts_convertStringSystemToUTF8(StringBuff(opt->path_html),
+                                        (int) StringLength(opt->path_html));
+        if (path != NULL) {
+          StringCopy(opt->path_html_utf8, path);
+          free(path);
+        } else {
+          StringCopyN(opt->path_html_utf8, StringBuff(opt->path_html),
+                      StringLength(opt->path_html));
+        }
+      }
+#else
+      // Assume UTF-8 filesystem.
       StringCopyN(opt->path_html_utf8, StringBuff(opt->path_html),
                   StringLength(opt->path_html));
+#endif
 
       /* if doit.log exists, or if new URL(s) defined, 
          then DO NOT load standard config files */
@@ -1055,7 +1069,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 +2382,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) {
@@ -2470,12 +2485,9 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
          }
          } */
 
-      // vérifier existence de la structure (path_html/path_log are UTF-8, use
-      // the UTF-8 mkdir path)
-      structcheck_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_html), "/"));
-      structcheck_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log), "/"));
+      // vérifier existence de la structure
+      structcheck(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_html), "/"));
+      structcheck(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "/"));
 
       // reprise/update
       if (opt->cache) {
@@ -2795,32 +2807,6 @@ int check_path(String * s, char *defaultname) {
   return return_value;
 }
 
-/* Does the short-option cluster s carry c from the main option set (-i, -iC2,
-   -%Mi)? Walked as the parser does below: %, &, @ and # each take the letter
-   after them into another set, so the i of -%i is not the main-set -i. */
-static hts_boolean cmdl_shortopt_has(const char *s, char c) {
-  const char *com;
-
-  if (s[0] != '-' || s[1] == '-')
-    return HTS_FALSE;
-  for (com = s + 1; *com != '\0'; com++) {
-    switch (*com) {
-    case '%':
-    case '&':
-    case '@':
-    case '#':
-      if (*(com + 1) != '\0')
-        com++; /* skip the other set's letter */
-      break;
-    default:
-      if (*com == c)
-        return HTS_TRUE;
-      break;
-    }
-  }
-  return HTS_FALSE;
-}
-
 // détermine si l'argument est une option
 int cmdl_opt(char *s) {
   if (s[0] == '-') {            // c'est peut être une option

src/htsdns_selftest.c

@@ -402,50 +402,6 @@ int dns_selftests(httrackp *opt) {
       deletesoc(s);
   }
 
-  /* A URL port outside 1..65535 must refuse the link, not fold into range and
-     connect elsewhere (#614). *addr_count discriminates: 0 only if refused
-     before the resolve, still 2 for one merely truncated or defaulted. */
-  {
-    /* an empty "dual.test:" means the default port (WHATWG, curl): keep it */
-    static const char *const good[] = {"dual.test:1",    "dual.test:80",
-                                       "dual.test:8080", "dual.test:65535",
-                                       "dual.test:080",  "dual.test:"};
-    /* 65616 and 4294967376 are load-bearing: both wrap to a plausible 80 */
-    static const char *const bad[] = {
-        "dual.test:0",          "dual.test:65536",      "dual.test:65616",
-        "dual.test:99999",      "dual.test:2147483648", "dual.test:4294967296",
-        "dual.test:4294967376", "dual.test:-1",         "dual.test:-23437",
-        "dual.test:80x",        "dual.test:+80",        "dual.test: 80",
-        "dual.test:0x50"};
-    size_t k;
-
-    for (k = 0; k < sizeof(good) / sizeof(good[0]); k++) {
-      htsblk r;
-      int count = -1;
-      T_SOC s;
-
-      hts_init_htsblk(&r);
-      s = newhttp_addr(opt, good[k], &r, -1, 0, 0, &count);
-      CHECK(count == 2); /* accepted: reached the resolve */
-      if (s != INVALID_SOCKET)
-        deletesoc(s);
-    }
-
-    for (k = 0; k < sizeof(bad) / sizeof(bad[0]); k++) {
-      htsblk r;
-      int count = -1;
-      T_SOC s;
-
-      hts_init_htsblk(&r);
-      s = newhttp_addr(opt, bad[k], &r, -1, 0, 0, &count);
-      CHECK(s == INVALID_SOCKET);
-      CHECK(count == 0); /* refused before resolving, not a failed connect */
-      CHECK(strstr(r.msg, "Invalid port") != NULL);
-      if (s != INVALID_SOCKET)
-        deletesoc(s);
-    }
-  }
-
   /* Connect-fallback decision (consumer of the multi-address list): when a
      stuck connect should abandon the current address for the next one. */
   {

src/htsftp.c

@@ -248,13 +248,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
     // port
     a = strchr(adr, ':');       // port
     if (a) {
-      // folding a nonsense port into 1..65535 fetches one the link never named;
-      // an empty "host:" just means the default (#614)
-      if (a[1] != '\0' && !hts_parse_url_port(a + 1, &port)) {
-        snprintf(back->r.msg, sizeof(back->r.msg), "Invalid port: %s", a + 1);
-        back->r.statuscode = STATUSCODE_INVALID; // permanent, unlike a DNS miss
-        _HALT_FTP return 0;
-      }
+      sscanf(a + 1, "%d", &port);
       strncatbuff(_adr, adr, (int) (a - adr));
     } else
       strcpybuff(_adr, adr);

src/htsglobal.h

@@ -43,8 +43,8 @@ Please visit our Website: http://www.httrack.com
    configure.ac, decoupled from these). VERSION is the display form, VERSIONID
    the dotted numeric form, AFF_VERSION the short form shown in footers,
    LIB_VERSION the data/cache format generation. */
-#define HTTRACK_VERSION "3.49-13"
-#define HTTRACK_VERSIONID "3.49.13"
+#define HTTRACK_VERSION "3.49-12"
+#define HTTRACK_VERSIONID "3.49.12"
 #define HTTRACK_AFF_VERSION "3.x"
 #define HTTRACK_LIB_VERSION "2.0"
 

src/htslib.c

@@ -2167,18 +2167,15 @@ T_SOC newhttp_addr(httrackp *opt, const char *_iadr, htsblk *retour, int port,
 #endif
 
       if (a != NULL) {
-        // folding a nonsense port into 0..65535 crawls one neither the link nor
-        // a port filter named; an empty "host:" just means the default (#614)
-        if (a[1] != '\0' && !hts_parse_url_port(a + 1, &port)) {
-          if (retour != NULL) {
-            snprintf(retour->msg, sizeof(retour->msg), "Invalid port: %s",
-                     a + 1);
-          }
-          return INVALID_SOCKET;
-        }
+        int i = -1;
 
         iadr2[0] = '\0';
-        // the address itself, without the ":port"
+        sscanf(a + 1, "%d", &i);
+        if (i != -1) {
+          port = (unsigned short int) i;
+        }
+
+        // adresse véritable (sans :xx)
         strncatbuff(iadr2, iadr, (int) (a - iadr));
         resolve_host = iadr2;
       }
@@ -3754,11 +3751,15 @@ static int proxy_default_port(const char *arg) {
 // port "a" of -P argument "arg": digits fitting TCP's 1..65535, else the scheme
 // default. Not sscanf("%d"): past INT_MAX it wraps to a garbage port (#602)
 static int parse_proxy_port(const char *a, const char *arg) {
-  int port;
+  char *end;
+  long p;
 
-  if (!hts_parse_url_port(a, &port))
+  if (!isdigit((unsigned char) *a)) // strtol would eat a sign or leading space
     return proxy_default_port(arg);
-  return port;
+  p = strtol(a, &end, 10);
+  if (*end != '\0' || p < 1 || p > 65535) // ERANGE lands out of range too
+    return proxy_default_port(arg);
+  return (int) p;
 }
 
 void hts_parse_proxy(const char *arg, char *name, size_t name_size, int *port) {

src/htslib.h

@@ -61,7 +61,6 @@ typedef struct lien_adrfilsave lien_adrfilsave;
 
 /* définitions globales */
 #include "htsglobal.h"
-#include "htsurlport.h"
 
 /* basic net definitions */
 #include "htsbase.h"

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/htsparse.c

@@ -315,43 +315,6 @@ static void escape_url_parens(char *const s, const size_t size) {
   strlcpybuff(s, buff, size);
 }
 
-/* Strip a default ":80" from lien's authority in place. Any spelling that
-   range-parses to 80 (":80", ":080") is dropped by its matched length, not a
-   hardcoded 3 chars; a value that merely wraps to 80 as an int (#614) stays. */
-void hts_strip_default_port(char *lien, size_t size) {
-  char *a;
-
-  if (!link_has_authority(lien))
-    return;
-  a = strstr(lien, "//"); // "//" authority
-  if (a)
-    a += 2;
-  else
-    a = lien;
-  a = jump_toport(a);
-  if (a) { // port present
-    char *b = a + 1;
-    char saved;
-    int port;
-    hts_boolean is_default;
-
-    while (isdigit((unsigned char) *b))
-      b++;
-    saved = *b;
-    *b = '\0';
-    is_default = hts_parse_url_port(a + 1, &port) && port == 80;
-    *b = saved;
-    if (is_default) { // default port, strip it
-      char BIGSTK tempo[HTS_URLMAXSIZE * 2];
-
-      tempo[0] = '\0';
-      strncatbuff(tempo, lien, a - lien);
-      strcatbuff(tempo, b); // skip the whole matched :port
-      strlcpybuff(lien, tempo, size);
-    }
-  }
-}
-
 /* Main parser */
 int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
   char catbuff[CATBUFF_SIZE];
@@ -2175,8 +2138,38 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
                     } while((b != a) && (b));
                   }
                 }
-                // drop a default :80 port from the authority
-                hts_strip_default_port(lien, sizeof(lien));
+                // éliminer les éventuels :80 (port par défaut!)
+                if (link_has_authority(lien)) {
+                  char *a;
+
+                  a = strstr(lien, "//");       // "//" authority
+                  if (a)
+                    a += 2;
+                  else
+                    a = lien;
+                  a = jump_toport(a);
+                  if (a) {      // port
+                    int port = 0;
+                    int defport = 80;
+                    char *b = a + 1;
+
+#if HTS_USEOPENSSL
+#endif
+                    while(isdigit((unsigned char) *b)) {
+                      port *= 10;
+                      port += (int) (*b - '0');
+                      b++;
+                    }
+                    if (port == defport) {      // port 80, default - c'est débile
+                      char BIGSTK tempo[HTS_URLMAXSIZE * 2];
+
+                      tempo[0] = '\0';
+                      strncatbuff(tempo, lien, a - lien);
+                      strcatbuff(tempo, a + 3); // sauter :80
+                      strcpybuff(lien, tempo);
+                    }
+                  }
+                }
                 // filtrer les parazites (mailto & cie)
                 /*
                    if (strfield(lien,"mailto:")) {  // ne pas traiter

src/htsparse.h

@@ -106,10 +106,6 @@ struct htsmoduleStructExtended {
 */
 int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre);
 
-/* Strip a default ":80" (any spelling) from an absolute link's authority, in
-   place into a buffer of the given size. */
-void hts_strip_default_port(char *lien, size_t size);
-
 /*
   Check for 301,302.. errors ("moved") and handle them; re-isuue requests, make
   rediretc file, handle filters considerations..

src/htsproxy.c

@@ -491,11 +491,14 @@ static int socks5_handshake_stream(httrackp *opt, socks5_stream *st,
     if ((unsigned char) host[i] < ' ')
       return socks5_fail(msg, msgsize, "SOCKS5: invalid origin host");
   }
-  // the old range check ran after sscanf("%d") had wrapped a huge value into a
-  // plausible port (#614). An empty "host:" stays refused here, unlike the
-  // direct path, as it was before #614.
-  if (portsep != NULL && !hts_parse_url_port(portsep + 1, &port))
-    return socks5_fail(msg, msgsize, "SOCKS5: invalid origin port");
+  if (portsep != NULL) {
+    int p = -1;
+
+    sscanf(portsep + 1, "%d", &p);
+    if (p <= 0 || p > 65535)
+      return socks5_fail(msg, msgsize, "SOCKS5: invalid origin port");
+    port = p;
+  }
   if (link_has_authorization(proxy_name)) {
     if (!socks5_credentials(opt, proxy_name, user, sizeof(user), &userlen, pass,
                             sizeof(pass), &passlen, msg, msgsize))

src/htsselftest.c

@@ -45,7 +45,6 @@ Please visit our Website: http://www.httrack.com
 #include "htscore.h"
 #include "htsdefines.h"
 #include "htslib.h"
-#include "htsalias.h"
 #include "htsparse.h"
 #include "htscache.h"
 #include "htscache_selftest.h"
@@ -826,21 +825,6 @@ static int st_simplify(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-static int st_expandhome(httrackp *opt, int argc, char **argv) {
-  String path = STRING_EMPTY;
-
-  (void) opt;
-  if (argc < 1) {
-    fprintf(stderr, "expandhome: needs a path\n");
-    return 1;
-  }
-  StringCopy(path, argv[0]);
-  expand_home(&path);
-  printf("expanded=%s\n", StringBuff(path));
-  StringFree(path);
-  return 0;
-}
-
 static int st_mime(httrackp *opt, int argc, char **argv) {
   char mime[256];
 
@@ -1469,25 +1453,6 @@ static int st_socks5(httrackp *opt, int argc, char **argv) {
   assertf(socks5_handshake_scripted(opt, "origin.test:8443", proxy, &io) == 1);
   assertf(memcmp(io.sent + io.sent_len - 2, "\x20\xfb", 2) == 0);
 
-  /* a bad origin port is refused before any byte goes out (#614). 4294967376 is
-     the case the old range check could not see: it overflowed the sscanf("%d")
-     into a plausible 80 and passed. 65616 would not prove anything here, since
-     it fits an int and the old check already caught it. */
-  {
-    static const char *const bad[] = {"origin.test:4294967376",
-                                      "origin.test:80x", "origin.test:+80",
-                                      "origin.test: 80", "origin.test:8.0"};
-    size_t k;
-
-    for (k = 0; k < sizeof(bad) / sizeof(bad[0]); k++) {
-      len = socks5_reply(script, 0x01, v4, sizeof(v4));
-      io.reply = script;
-      io.reply_len = len;
-      assertf(socks5_handshake_scripted(opt, bad[k], proxy, &io) == 0);
-      assertf(io.sent_len == 0);
-    }
-  }
-
   /* credentials: split on the first colon of the escaped userinfo, so %3a stays
      inside the username and a colon in the password is not a delimiter */
   {
@@ -1589,41 +1554,6 @@ static int st_identabs(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-/* Default-port strip (#627): a genuine 80 (any spelling) is removed by its
-   matched length, host preserved; a non-80 port or one that only wraps to 80 as
-   a 32-bit int (#614) is left intact. Guards the old bug where ":080"/":0080"
-   dropped a hardcoded 3 chars and glued the leftover digits onto the host. */
-static int st_stripport(httrackp *opt, int argc, char **argv) {
-  static const struct {
-    const char *in, *out;
-  } cases[] = {
-      {"http://127.0.0.1:80/x", "http://127.0.0.1/x"},
-      {"http://127.0.0.1:080/x", "http://127.0.0.1/x"},
-      {"http://127.0.0.1:0080/x", "http://127.0.0.1/x"},
-      {"http://127.0.0.1:80", "http://127.0.0.1"},
-      {"http://127.0.0.1:0081/x", "http://127.0.0.1:0081/x"},
-      {"http://127.0.0.1:81/x", "http://127.0.0.1:81/x"},
-      {"http://127.0.0.1:8080/x", "http://127.0.0.1:8080/x"},
-      {"http://127.0.0.1:4294967376/x", "http://127.0.0.1:4294967376/x"},
-      {"http://127.0.0.1/x", "http://127.0.0.1/x"},
-  };
-
-  size_t k;
-
-  (void) opt;
-  (void) argc;
-  (void) argv;
-  for (k = 0; k < sizeof(cases) / sizeof(cases[0]); k++) {
-    char BIGSTK buff[HTS_URLMAXSIZE * 2];
-
-    strcpybuff(buff, cases[k].in);
-    hts_strip_default_port(buff, sizeof(buff));
-    assertf(strcmp(buff, cases[k].out) == 0);
-  }
-  printf("stripport self-test OK\n");
-  return 0;
-}
-
 /* Extra args are key=value: adr= cdispo= statuscode= status= strip= urlhack=
    no-www= no-slash= no-query= n83= type=, plus repeatable prior=adr|fil|sav
    registering an already-crawled link (dedup/collision paths). */
@@ -2146,52 +2076,6 @@ static int st_cache_corrupt(httrackp *opt, int argc, char **argv) {
   return err;
 }
 
-/* Drives unzRepair over a damaged local file header whose CRC field's high
-   16-bit word has bit 15 set. Before the READ_32 fix that shifted an int and
-   overflowed, so UBSan aborts here; after it, repair recovers the one entry. */
-static int st_zip_repair_shift(httrackp *opt, int argc, char **argv) {
-  static const unsigned char zip[] = {
-      0x50, 0x4b, 0x03, 0x04, /* local file header signature */
-      0x14, 0x00,             /* version needed */
-      0x00, 0x00,             /* general purpose flag */
-      0x00, 0x00,             /* method */
-      0x00, 0x00,             /* time */
-      0x00, 0x00,             /* date */
-      0x00, 0x00, 0xe8, 0x8a, /* crc: high word 0x8ae8, bit 15 set */
-      0x00, 0x00, 0x00, 0x00, /* compressed size */
-      0x00, 0x00, 0x00, 0x00, /* uncompressed size */
-      0x01, 0x00,             /* filename length */
-      0x00, 0x00,             /* extra field length */
-      0x61                    /* filename "a" */
-  };
-  char in[HTS_URLMAXSIZE], out[HTS_URLMAXSIZE], tmp[HTS_URLMAXSIZE];
-  uLong nrec = 0, bytes = 0;
-  FILE *fp;
-  int err;
-
-  (void) opt;
-  if (argc < 1) {
-    fprintf(stderr, "zip-repair-shift: needs a directory\n");
-    return 1;
-  }
-  snprintf(in, sizeof(in), "%s/damaged.zip", argv[0]);
-  snprintf(out, sizeof(out), "%s/repair.zip", argv[0]);
-  snprintf(tmp, sizeof(tmp), "%s/repair.tmp", argv[0]);
-  fp = fopen(in, "wb");
-  if (fp == NULL || fwrite(zip, 1, sizeof(zip), fp) != sizeof(zip)) {
-    if (fp != NULL)
-      fclose(fp);
-    fprintf(stderr, "zip-repair-shift: cannot write %s\n", in);
-    return 1;
-  }
-  fclose(fp);
-  err = unzRepair(in, out, tmp, &nrec, &bytes);
-  printf("zip-repair-shift: %s (recovered %lu entr%s)\n",
-         (err == Z_OK && nrec == 1) ? "OK" : "FAIL", (unsigned long) nrec,
-         nrec == 1 ? "y" : "ies");
-  return (err == Z_OK && nrec == 1) ? 0 : 1;
-}
-
 static int st_cache_legacy(httrackp *opt, int argc, char **argv) {
   int err;
 
@@ -2558,45 +2442,6 @@ static int st_makeindex(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-// hts_buildtopindex takes a system-charset path but verif_backblue() below it
-// expects utf-8, so on Windows a non-ASCII project dir gets the gifs written to
-// a mangled twin (issues #216/#217). argv[0] is a writable dir.
-static int st_topindex(httrackp *opt, int argc, char **argv) {
-  char projdir[HTS_URLMAXSIZE];
-  char path[HTS_URLMAXSIZE + 16]; /* projdir plus a basename */
-#ifdef _WIN32
-  /* the GUI hands hts_buildtopindex an ANSI path; mimic it. CP1252 'cafe' */
-  static const char *const projName = "caf\xE9";
-#else
-  /* POSIX system charset is UTF-8 */
-  static const char *const projName = "caf\xC3\xA9";
-#endif
-
-  assertf(argc >= 1);
-  snprintf(projdir, sizeof(projdir), "%s/%s", argv[0], projName);
-
-  /* structcheck(), not the utf-8 MKDIR family: same charset as buildtopindex */
-  snprintf(path, sizeof(path), "%s/", projdir);
-  assertf(structcheck(path) == 0);
-
-  /* returns 0 here: the dir holds no sub-project, only the gifs matter */
-  (void) hts_buildtopindex(opt, projdir, "");
-
-  /* the gifs must land in the project dir itself, not in a mangled sibling */
-  snprintf(path, sizeof(path), "%s/backblue.gif", projdir);
-  assertf(fexist(path));
-
-  /* raw unlink/rmdir: UNLINK is utf-8 on Windows, these paths aren't */
-  unlink(path);
-  snprintf(path, sizeof(path), "%s/fade.gif", projdir);
-  unlink(path);
-  snprintf(path, sizeof(path), "%s/index.html", projdir);
-  unlink(path);
-  rmdir(projdir);
-  printf("topindex self-test OK\n");
-  return 0;
-}
-
 /* Each inplace_escape_*() must equal escape_*() on a copy. */
 static int st_inplace_escape(httrackp *opt, int argc, char **argv) {
   /* >255 bytes forces the helper's malloct path, not the stack buffer */
@@ -3234,7 +3079,6 @@ static const struct selftest_entry {
     {"filterbounds", "", "matcher length/work caps reject hostile patterns",
      st_filterbounds},
     {"simplify", "<path>", "collapse ./ and ../ in a path", st_simplify},
-    {"expandhome", "<path>", "expand a leading ~/ into $HOME", st_expandhome},
     {"stripquery", "", "--strip-query pattern/key stripping self-test",
      st_stripquery},
     {"urlhack", "", "-%u url-hack sub-flag (www/slash/query) self-test",
@@ -3270,8 +3114,6 @@ static const struct selftest_entry {
      st_socks5},
     {"identabs", "", "ident_url_absolute one-byte fil[] overflow self-test",
      st_identabs},
-    {"stripport", "", "default :80 port strip preserves host (#627)",
-     st_stripport},
     {"header", "<raw-header-line> ...", "response header-line parsing",
      st_header},
     {"headerlong", "[header-name:]",
@@ -3299,9 +3141,6 @@ static const struct selftest_entry {
      st_cache_legacy},
     {"cache-corrupt", "<dir>", "cache read-side corruption self-test",
      st_cache_corrupt},
-    {"zip-repair-shift", "<dir>",
-     "cache zip-repair header read must not overflow a signed shift",
-     st_zip_repair_shift},
     {"dns", "", "DNS resolver/cache self-test", st_dns},
     {"dnstimeout", "", "a slow DNS resolve is bounded and holds no lock",
      st_dnstimeout},
@@ -3309,9 +3148,6 @@ static const struct selftest_entry {
     {"useragent", "", "default User-Agent self-test", st_useragent},
     {"makeindex", "[dir]", "hts_finish_makeindex footer/refresh self-test",
      st_makeindex},
-    {"topindex", "[dir]",
-     "hts_buildtopindex charset handling of a non-ASCII project dir",
-     st_topindex},
     {"inplace-escape", "", "inplace_escape_* vs escape_* equivalence self-test",
      st_inplace_escape},
     {"escape-room", "", "HT_ADD_HTMLESCAPED* reservation-factor self-test",

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/htsserver.h

@@ -164,12 +164,13 @@ HTS_UNUSED static int linputsoc_t(T_SOC soc, char *s, int max, int timeout) {
   return -1;
 }
 
-/* Same contract as hts_gethome(), which is hidden and out of reach from here */
 static const char *gethomedir(void) {
   const char *home = getenv("HOME");
 
-  /* An empty $HOME would put the base path and httrack.ini at the root */
-  return strnotempty(home) ? home : ".";
+  if (home)
+    return home;
+  else
+    return ".";
 }
 static int linput_cpp(FILE * fp, char *s, int max) {
   int rlen = 0;

src/htstools.c

@@ -896,20 +896,7 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
     if (fpo) {
       find_handle h;
 
-      // générer gif. verif_backblue() is utf-8, but our path is the system
-      // charset, so on Windows convert it or the gifs land in a mangled twin
-      // dir (#217). Elsewhere the system charset is already utf-8.
-#ifdef _WIN32
-      {
-        const char *const base = concat(catbuff, sizeof(catbuff), rpath, "/");
-        char *const base_utf8 =
-            hts_convertStringSystemToUTF8(base, strlen(base));
-        verif_backblue(opt, base_utf8 != NULL ? base_utf8 : base);
-        free(base_utf8);
-      }
-#else
-      verif_backblue(opt, concat(catbuff, sizeof(catbuff), rpath, "/"));
-#endif
+      verif_backblue(opt, concat(catbuff, sizeof(catbuff), rpath, "/")); // générer gif
       // Header
       hts_template_format(fpo, toptemplate_header,
               "<!-- Mirror and index made by HTTrack Website Copier/"

src/htsurlport.c

@@ -1,50 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: TCP port parser, shared by the engine, htsserver and    */
-/*       proxytrack                                              */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-#include "htsurlport.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-
-hts_boolean hts_parse_url_port(const char *a, int *port) {
-  char *end;
-  long p;
-
-  if (!isdigit((unsigned char) *a)) // strtol would eat a sign or leading space
-    return HTS_FALSE;
-  p = strtol(a, &end, 10);
-  if (*end != '\0' || p < 1 || p > 65535) // ERANGE lands out of range too
-    return HTS_FALSE;
-  *port = (int) p;
-  return HTS_TRUE;
-}

src/htsurlport.h

@@ -1,45 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: TCP port parser, shared by the engine, htsserver and    */
-/*       proxytrack                                              */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-#ifndef HTSURLPORT_DEFH
-#define HTSURLPORT_DEFH
-
-#include "htsglobal.h"
-
-/* Parse the port text "a" (after the ':', up to the end of the string): TRUE
-   and *port set for a bare decimal in 1..65535, else FALSE and *port left
-   alone. Not sscanf("%d"), which range-checks nothing and wraps past INT_MAX.
-   Its own file so proxytrack, which does not link the library, can share it. */
-hts_boolean hts_parse_url_port(const char *a, int *port);
-
-#endif

src/htsweb.c

@@ -63,9 +63,7 @@ Please visit our Website: http://www.httrack.com
 #include "md5.c"
 
 #include "htsserver.h"
-#include "htsurlport.h"
 #include "htsweb.h"
-#include "htscharset.h"
 
 #if USE_BEGINTHREAD==0
 #error fatal: no threads support
@@ -157,7 +155,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
@@ -260,10 +257,8 @@ int main(int argc, char *argv[]) {
   /* set commandline keys */
   for(i = 2; i < argc; i += 2) {
     if (strcmp(argv[i], "--port") == 0 && i + 1 < argc) {
-      // the range check ran after sscanf("%d") had wrapped a huge value into a
-      // plausible port, and listened there (#614). 0 (was the auto-pick) and
-      // 65535 (was refused, off by one) now both mean what they say.
-      if (!hts_parse_url_port(argv[i + 1], &defaultPort)) {
+      if (sscanf(argv[i + 1], "%d", &defaultPort) != 1 || defaultPort < 0
+          || defaultPort >= 65535) {
         fprintf(stderr, "couldn't set the port number to %s\n", argv[i + 1]);
         return -1;
       }