mirror of
https://github.com/xroche/httrack.git
synced 2026-07-18 06:40:13 +03:00
Compare commits
71 Commits
remove-dea
...
feature/en
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ed22dafd1 | ||
|
|
800d498893 | ||
|
|
991d259981 | ||
|
|
d1bf4f7a25 | ||
|
|
86e145fc1c | ||
|
|
d9ff780d0f | ||
|
|
b026c80bb6 | ||
|
|
e0648beff9 | ||
|
|
ee1aebd935 | ||
|
|
b4957f0625 | ||
|
|
c9d36c82c7 | ||
|
|
1fa0184468 | ||
|
|
79e46eeceb | ||
|
|
436ac53793 | ||
|
|
bc4b2c7b8e | ||
|
|
4fafe283b4 | ||
|
|
9ec5a3a067 | ||
|
|
cd38e6e68d | ||
|
|
e692e56592 | ||
|
|
7d9d4ed890 | ||
|
|
573167e8dd | ||
|
|
e26a5f5c6a | ||
|
|
627ae2b043 | ||
|
|
71ab3574ef | ||
|
|
076127ddea | ||
|
|
dced0208e1 | ||
|
|
6e34c30a7c | ||
|
|
eac13ea248 | ||
|
|
dc3e485f92 | ||
|
|
fac84f1631 | ||
|
|
c32d286938 | ||
|
|
5a7ab7a653 | ||
|
|
5756a9830c | ||
|
|
28c11d55eb | ||
|
|
b5f28f6eb5 | ||
|
|
3d65bb2e3b | ||
|
|
68897b09ce | ||
|
|
e8d1bf9c19 | ||
|
|
ef40277c24 | ||
|
|
797acecfd2 | ||
|
|
8237c3ed2b | ||
|
|
75b815e1fb | ||
|
|
8d02e60907 | ||
|
|
e70607e70c | ||
|
|
cada6a1ae3 | ||
|
|
145ea4769f | ||
|
|
c5da5a2f2e | ||
|
|
6eaefe6233 | ||
|
|
33249be5a0 | ||
|
|
167ede32c0 | ||
|
|
c8b7c63c9b | ||
|
|
04f37b2094 | ||
|
|
c07b19bc3d | ||
|
|
04bbb489cf | ||
|
|
a24b1d3c9f | ||
|
|
1abf867333 | ||
|
|
771d11326e | ||
|
|
7faceaf7d2 | ||
|
|
9105732112 | ||
|
|
9c01812141 | ||
|
|
7a02d5e411 | ||
|
|
3c7e9fa46d | ||
|
|
a707d4b845 | ||
|
|
65c1016a4e | ||
|
|
fd2252dc8c | ||
|
|
53a257448f | ||
|
|
8ba3cb6c03 | ||
|
|
b9afe755bd | ||
|
|
407916e3f6 | ||
|
|
15021cd470 | ||
|
|
5f7045c3a4 |
8
.gitattributes
vendored
Normal file
8
.gitattributes
vendored
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# Resource scripts are Windows tooling input and must stay CRLF: the engine has no
|
||||||
|
# encoding guard, so an autocrlf checkout could otherwise flatten them silently.
|
||||||
|
*.rc text eol=crlf
|
||||||
|
|
||||||
|
# The test scripts run under Git Bash on the Windows CI; a CRLF checkout makes
|
||||||
|
# bash die on $'\r' on every line of them.
|
||||||
|
*.test text eol=lf
|
||||||
|
*.sh text eol=lf
|
||||||
138
.github/workflows/ci.yml
vendored
138
.github/workflows/ci.yml
vendored
@@ -41,7 +41,7 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
build-essential clang autoconf automake libtool autoconf-archive \
|
build-essential clang autoconf automake libtool autoconf-archive \
|
||||||
zlib1g-dev libssl-dev
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
@@ -50,12 +50,17 @@ jobs:
|
|||||||
# committed generated files already let a plain checkout build.
|
# committed generated files already let a plain checkout build.
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
./configure
|
./configure
|
||||||
|
# a missing decoder would silently drop the coding from Accept-Encoding
|
||||||
|
grep -q "define HTS_USEBROTLI 1" config.h
|
||||||
|
grep -q "define HTS_USEZSTD 1" config.h
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: make -j"$(nproc)"
|
run: make -j"$(nproc)"
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: make check
|
run: |
|
||||||
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
@@ -80,7 +85,7 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
build-essential autoconf automake libtool autoconf-archive \
|
build-essential autoconf automake libtool autoconf-archive \
|
||||||
zlib1g-dev libssl-dev
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
@@ -99,7 +104,8 @@ jobs:
|
|||||||
sudo find /usr/bin /usr/local/bin -maxdepth 1 -name 'python3*' \
|
sudo find /usr/bin /usr/local/bin -maxdepth 1 -name 'python3*' \
|
||||||
-exec mv {} {}.hidden \;
|
-exec mv {} {}.hidden \;
|
||||||
! command -v python3
|
! command -v python3
|
||||||
make check
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
@@ -120,25 +126,70 @@ jobs:
|
|||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
brew install autoconf automake libtool autoconf-archive
|
brew install autoconf automake libtool autoconf-archive brotli zstd
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
ssl="$(brew --prefix openssl@3)"
|
ssl="$(brew --prefix openssl@3)"
|
||||||
|
brewp="$(brew --prefix)"
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
./configure CPPFLAGS="-I${ssl}/include" LDFLAGS="-L${ssl}/lib"
|
./configure CPPFLAGS="-I${ssl}/include -I${brewp}/include" \
|
||||||
|
LDFLAGS="-L${ssl}/lib -L${brewp}/lib"
|
||||||
|
grep -q "define HTS_USEBROTLI 1" config.h
|
||||||
|
grep -q "define HTS_USEZSTD 1" config.h
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: make -j"$(sysctl -n hw.ncpu)"
|
run: make -j"$(sysctl -n hw.ncpu)"
|
||||||
|
|
||||||
|
- name: Add loopback aliases (macOS lacks 127.0.0.2/.3)
|
||||||
|
# 19_local-connect-fallback needs the dead 127.0.0.2/.3 to refuse
|
||||||
|
# instantly like Linux; alias them onto lo0 so they don't stall to timeout.
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
sudo ifconfig lo0 alias 127.0.0.2 up
|
||||||
|
sudo ifconfig lo0 alias 127.0.0.3 up
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: make check
|
run: |
|
||||||
|
jobs=$(( $(sysctl -n hw.ncpu) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
run: cat tests/test-suite.log 2>/dev/null || true
|
run: cat tests/test-suite.log 2>/dev/null || true
|
||||||
|
|
||||||
|
# Runtime smoke of the WebHTTrack launcher on macOS: it carries a Darwin-only
|
||||||
|
# browser path (open -W) and nothing else exercises htsserver. Install into a
|
||||||
|
# temp prefix, then check webhttrack brings up htsserver and serves the UI.
|
||||||
|
webhttrack-macos:
|
||||||
|
name: webhttrack smoke (macOS arm64)
|
||||||
|
runs-on: macos-14
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Install build dependencies
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
brew install autoconf automake libtool autoconf-archive brotli zstd
|
||||||
|
|
||||||
|
- name: Build and install into a temp prefix
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
ssl="$(brew --prefix openssl@3)"
|
||||||
|
brewp="$(brew --prefix)"
|
||||||
|
autoreconf -fi
|
||||||
|
./configure CPPFLAGS="-I${ssl}/include -I${brewp}/include" \
|
||||||
|
LDFLAGS="-L${ssl}/lib -L${brewp}/lib" \
|
||||||
|
--prefix="$RUNNER_TEMP/inst"
|
||||||
|
make -j"$(sysctl -n hw.ncpu)"
|
||||||
|
make install
|
||||||
|
|
||||||
|
- name: Smoke-test webhttrack
|
||||||
|
run: bash tests/webhttrack-smoke.sh "$RUNNER_TEMP/inst"
|
||||||
|
|
||||||
# Portability/hardening: 32-bit (i386) build on the x86-64 runner via multilib
|
# Portability/hardening: 32-bit (i386) build on the x86-64 runner via multilib
|
||||||
# -- no extra hardware. Exercises the 32-bit size_t/pointer ABI, where size
|
# -- no extra hardware. Exercises the 32-bit size_t/pointer ABI, where size
|
||||||
# and bounds math can truncate or wrap in ways 64-bit never reveals (the axis
|
# and bounds math can truncate or wrap in ways 64-bit never reveals (the axis
|
||||||
@@ -159,7 +210,8 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
build-essential gcc-multilib autoconf automake libtool \
|
build-essential gcc-multilib autoconf automake libtool \
|
||||||
autoconf-archive zlib1g-dev:i386 libssl-dev:i386
|
autoconf-archive zlib1g-dev:i386 libssl-dev:i386 \
|
||||||
|
libbrotli-dev:i386 libzstd-dev:i386
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
@@ -171,7 +223,9 @@ jobs:
|
|||||||
run: make -j"$(nproc)"
|
run: make -j"$(nproc)"
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: make check
|
run: |
|
||||||
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
@@ -198,7 +252,7 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
build-essential autoconf automake libtool autoconf-archive \
|
build-essential autoconf automake libtool autoconf-archive \
|
||||||
zlib1g-dev libssl-dev
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev
|
||||||
|
|
||||||
- name: Configure (sanitized)
|
- name: Configure (sanitized)
|
||||||
run: |
|
run: |
|
||||||
@@ -226,7 +280,9 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
ASAN_OPTIONS: detect_leaks=0:abort_on_error=1:halt_on_error=1:strict_string_checks=1:malloc_fill_byte=202:max_malloc_fill_size=2147483647:free_fill_byte=203:max_free_fill_size=2147483647
|
ASAN_OPTIONS: detect_leaks=0:abort_on_error=1:halt_on_error=1:strict_string_checks=1:malloc_fill_byte=202:max_malloc_fill_size=2147483647:free_fill_byte=203:max_free_fill_size=2147483647
|
||||||
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
|
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
|
||||||
run: make check
|
run: |
|
||||||
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
@@ -272,12 +328,52 @@ jobs:
|
|||||||
# 01_engine-* only; zlib-dependent self-tests are named 01_zlib-* and
|
# 01_engine-* only; zlib-dependent self-tests are named 01_zlib-* and
|
||||||
# skipped here (uninstrumented libz floods MSan with false positives).
|
# skipped here (uninstrumented libz floods MSan with false positives).
|
||||||
tests="$(cd tests && ls 01_engine-*.test | tr '\n' ' ')"
|
tests="$(cd tests && ls 01_engine-*.test | tr '\n' ' ')"
|
||||||
make check TESTS="$tests"
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs" TESTS="$tests"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
run: cat tests/test-suite.log 2>/dev/null || true
|
run: cat tests/test-suite.log 2>/dev/null || true
|
||||||
|
|
||||||
|
# libFuzzer smoke: build the fuzz/ harnesses over the pure hostile-input
|
||||||
|
# parsers and replay each seed corpus under ASan+UBSan+LeakSanitizer. Replay
|
||||||
|
# (not open-ended mutation) keeps CI deterministic -- it can't hit strjoker's
|
||||||
|
# catastrophic backtracking -- and pins the regression seeds for the bugs the
|
||||||
|
# fuzzers found. Deep discovery is a maintainer / OSS-Fuzz activity.
|
||||||
|
fuzz:
|
||||||
|
name: fuzz (libFuzzer corpus replay, clang)
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Install build dependencies
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
build-essential clang autoconf automake libtool autoconf-archive \
|
||||||
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev
|
||||||
|
|
||||||
|
- name: Configure (fuzzers, static)
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
autoreconf -fi
|
||||||
|
./configure CC=clang \
|
||||||
|
CFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=all -g -O1 -fno-omit-frame-pointer" \
|
||||||
|
LDFLAGS="-fsanitize=address,undefined" \
|
||||||
|
--enable-fuzzers --disable-shared
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: make -j"$(nproc)"
|
||||||
|
|
||||||
|
- name: Replay corpora
|
||||||
|
env:
|
||||||
|
ASAN_OPTIONS: detect_leaks=1:abort_on_error=1:halt_on_error=1
|
||||||
|
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
|
||||||
|
run: bash fuzz/run-fuzzers.sh fuzz check
|
||||||
|
|
||||||
# Optional-dependency build: compile and test with HTTPS/OpenSSL disabled --
|
# Optional-dependency build: compile and test with HTTPS/OpenSSL disabled --
|
||||||
# the configuration users on minimal systems build, and one libssl is not even
|
# the configuration users on minimal systems build, and one libssl is not even
|
||||||
# installed here so configure cannot silently re-enable it. The matrix above
|
# installed here so configure cannot silently re-enable it. The matrix above
|
||||||
@@ -308,7 +404,9 @@ jobs:
|
|||||||
run: make -j"$(nproc)"
|
run: make -j"$(nproc)"
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: make check
|
run: |
|
||||||
|
jobs=$(( $(nproc) * 2 )); [ "$jobs" -le 16 ] || jobs=16
|
||||||
|
make check -j"$jobs"
|
||||||
|
|
||||||
- name: Print the test log on failure
|
- name: Print the test log on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
@@ -336,7 +434,7 @@ jobs:
|
|||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
ca-certificates git \
|
ca-certificates git \
|
||||||
build-essential autoconf automake libtool autoconf-archive \
|
build-essential autoconf automake libtool autoconf-archive \
|
||||||
zlib1g-dev libssl-dev \
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev \
|
||||||
debhelper devscripts lintian fakeroot
|
debhelper devscripts lintian fakeroot
|
||||||
|
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
@@ -380,7 +478,7 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
build-essential autoconf automake libtool autoconf-archive \
|
build-essential autoconf automake libtool autoconf-archive \
|
||||||
zlib1g-dev libssl-dev
|
zlib1g-dev libssl-dev libbrotli-dev libzstd-dev
|
||||||
|
|
||||||
- name: distcheck
|
- name: distcheck
|
||||||
run: |
|
run: |
|
||||||
@@ -456,6 +554,16 @@ jobs:
|
|||||||
- name: shfmt
|
- name: shfmt
|
||||||
run: shfmt -d -i 4 $SHELL_SCRIPTS
|
run: shfmt -d -i 4 $SHELL_SCRIPTS
|
||||||
|
|
||||||
|
# MSBuild rejects a malformed .vcxproj with a bare MSB4025 and no build, so
|
||||||
|
# catch it here in seconds rather than on a Windows runner minutes in.
|
||||||
|
- name: XML well-formedness (MSBuild project files)
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
for f in src/*.vcxproj; do
|
||||||
|
python3 -c "import sys,xml.dom.minidom; xml.dom.minidom.parse(sys.argv[1])" "$f"
|
||||||
|
echo "ok $f"
|
||||||
|
done
|
||||||
|
|
||||||
# Check clang-format on CHANGED LINES ONLY. The engine predates clang-format
|
# Check clang-format on CHANGED LINES ONLY. The engine predates clang-format
|
||||||
# (it was shaped by an old Visual Studio formatter) and does not round-trip,
|
# (it was shaped by an old Visual Studio formatter) and does not round-trip,
|
||||||
# so we never reformat the whole tree -- only the lines a PR touches.
|
# so we never reformat the whole tree -- only the lines a PR touches.
|
||||||
|
|||||||
63
.github/workflows/codeql.yml
vendored
Normal file
63
.github/workflows/codeql.yml
vendored
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
# CodeQL static analysis (C). The security-extended suite covers the classes
|
||||||
|
# this codebase actually fights: overflows, tainted-size allocs, format bugs.
|
||||||
|
name: CodeQL
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [master]
|
||||||
|
pull_request:
|
||||||
|
schedule:
|
||||||
|
# Weekly re-scan of master so new/updated queries land without a push.
|
||||||
|
- cron: "17 4 * * 1"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: codeql-${{ github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
analyze:
|
||||||
|
name: analyze (c-cpp)
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
# Upload findings to the repo's code-scanning dashboard.
|
||||||
|
security-events: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Install build dependencies
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
build-essential autoconf automake libtool autoconf-archive \
|
||||||
|
zlib1g-dev libssl-dev
|
||||||
|
|
||||||
|
- uses: github/codeql-action/init@v4
|
||||||
|
with:
|
||||||
|
languages: c-cpp
|
||||||
|
build-mode: manual
|
||||||
|
queries: security-extended
|
||||||
|
# fopen's umask-controlled 0666 is intended for mirror/cache/log
|
||||||
|
# output; the one credential file (cookies.txt) is kept 0600 on Unix.
|
||||||
|
config: |
|
||||||
|
query-filters:
|
||||||
|
- exclude:
|
||||||
|
id: cpp/world-writable-file-creation
|
||||||
|
|
||||||
|
# Manual build: CodeQL traces the compiler, so build exactly what ships.
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
autoreconf -fi
|
||||||
|
./configure
|
||||||
|
make -j"$(nproc)"
|
||||||
|
|
||||||
|
- uses: github/codeql-action/analyze@v4
|
||||||
|
with:
|
||||||
|
category: "/language:c-cpp"
|
||||||
199
.github/workflows/windows-build.yml
vendored
Normal file
199
.github/workflows/windows-build.yml
vendored
Normal file
@@ -0,0 +1,199 @@
|
|||||||
|
# Windows build of the engine (VS2022 v143 + vcpkg): libhttrack, the CLI,
|
||||||
|
# webhttrack, proxytrack.
|
||||||
|
#
|
||||||
|
# The autotools CI covers the unix builds; this covers the MSVC one, which had
|
||||||
|
# no coverage at all and had drifted (the old .vcproj pinned OpenSSL 1.0.1j).
|
||||||
|
# libhttrack.dll is what the WinHTTrack GUI links against.
|
||||||
|
name: windows-build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [master]
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
libhttrack:
|
||||||
|
runs-on: windows-2022
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: [x64, Win32]
|
||||||
|
configuration: [Release]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive # coucal lives in src/coucal
|
||||||
|
|
||||||
|
# Located through vswhere rather than microsoft/setup-msbuild: the repo
|
||||||
|
# only allows GitHub-owned actions.
|
||||||
|
- name: Find MSBuild
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||||
|
$msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild `
|
||||||
|
-find MSBuild\**\Bin\MSBuild.exe | Select-Object -First 1
|
||||||
|
if (-not $msbuild) { throw "MSBuild not found" }
|
||||||
|
Write-Host "MSBuild: $msbuild"
|
||||||
|
"MSBUILD=$msbuild" | Out-File -FilePath $env:GITHUB_ENV -Append
|
||||||
|
|
||||||
|
- name: Enable vcpkg MSBuild integration
|
||||||
|
shell: pwsh
|
||||||
|
run: vcpkg integrate install
|
||||||
|
|
||||||
|
# httrack and webhttrack carry a ProjectReference to libhttrack, so building
|
||||||
|
# them builds it first; proxytrack is standalone.
|
||||||
|
- name: Build
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
foreach ($proj in @("libhttrack", "httrack", "webhttrack", "proxytrack")) {
|
||||||
|
& $env:MSBUILD "src\$proj.vcxproj" `
|
||||||
|
/m `
|
||||||
|
/p:Configuration=${{ matrix.configuration }} `
|
||||||
|
/p:Platform=${{ matrix.platform }} `
|
||||||
|
/p:VcpkgEnableManifest=true `
|
||||||
|
/flp:LogFile=msbuild-$proj.log`;Verbosity=normal
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "$proj failed" }
|
||||||
|
}
|
||||||
|
|
||||||
|
# WinHTTrack links src\$(Platform)\$(Configuration)\libhttrack.lib, so the
|
||||||
|
# import lib and the DLL both have to land there under that exact name.
|
||||||
|
- name: Check the binaries landed where they are expected
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$dir = "src\${{ matrix.platform }}\${{ matrix.configuration }}"
|
||||||
|
$want = @("libhttrack.dll", "libhttrack.lib", "httrack.exe",
|
||||||
|
"webhttrack.exe", "proxytrack.exe")
|
||||||
|
foreach ($f in $want) {
|
||||||
|
if (-not (Test-Path "$dir\$f")) { throw "missing $dir\$f" }
|
||||||
|
Write-Host "found $dir\$f"
|
||||||
|
}
|
||||||
|
|
||||||
|
# A CRT split across the exe/DLL boundary links fine and crashes on the
|
||||||
|
# first cross-heap free, so assert both sides import the *same* vcruntime.
|
||||||
|
# Also assert the machine type: Test-Path alone would accept an x64 binary
|
||||||
|
# sitting in the Win32 output dir.
|
||||||
|
- name: Check the CRT is shared across the boundary
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
$dir = "src\${{ matrix.platform }}\${{ matrix.configuration }}"
|
||||||
|
$dumpbin = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" `
|
||||||
|
-latest -find VC\Tools\MSVC\**\bin\Host*\*\dumpbin.exe | Select-Object -First 1
|
||||||
|
if (-not $dumpbin) { throw "dumpbin not found" }
|
||||||
|
$wantMachine = if ("${{ matrix.platform }}" -eq "x64") { "x64" } else { "x86" }
|
||||||
|
|
||||||
|
function Get-Crt($path) {
|
||||||
|
$out = & $dumpbin /dependents /headers $path
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "dumpbin failed on $path" }
|
||||||
|
,@($out | Select-String -Pattern '^\s*(vcruntime\d+d?\.dll)$' |
|
||||||
|
ForEach-Object { $_.Matches[0].Groups[1].Value.ToLower() })
|
||||||
|
}
|
||||||
|
|
||||||
|
# Negative control: cmd.exe links the old msvcrt, not vcruntime140. If
|
||||||
|
# this came back non-empty the detector would match anything, and the
|
||||||
|
# assertion below would pass on a mismatched CRT too.
|
||||||
|
if ((Get-Crt "$env:SystemRoot\System32\cmd.exe").Count -ne 0) {
|
||||||
|
throw "negative control failed: the vcruntime detector matches anything"
|
||||||
|
}
|
||||||
|
|
||||||
|
$crts = @{}
|
||||||
|
foreach ($f in @("libhttrack.dll", "httrack.exe")) {
|
||||||
|
$crt = Get-Crt "$dir\$f"
|
||||||
|
if ($crt.Count -eq 0) { throw "$f imports no vcruntime: static or mismatched CRT" }
|
||||||
|
$crts[$f] = $crt
|
||||||
|
|
||||||
|
$hdr = & $dumpbin /headers "$dir\$f"
|
||||||
|
if (-not ($hdr | Select-String -SimpleMatch "machine ($wantMachine)")) {
|
||||||
|
throw "$f is not $wantMachine"
|
||||||
|
}
|
||||||
|
Write-Host "$f -> $($crt -join ',') ($wantMachine)"
|
||||||
|
}
|
||||||
|
|
||||||
|
$a = $crts["libhttrack.dll"] | Sort-Object
|
||||||
|
$b = $crts["httrack.exe"] | Sort-Object
|
||||||
|
if (Compare-Object $a $b) {
|
||||||
|
throw "CRT mismatch across the boundary: libhttrack.dll=$a httrack.exe=$b"
|
||||||
|
}
|
||||||
|
|
||||||
|
# The engine ships ~90 tests and none had ever run on Windows: "make check"
|
||||||
|
# is Linux/macOS only. These are the offline ones, driven from Git Bash
|
||||||
|
# against the native httrack.exe. They subsume the self-tests this step
|
||||||
|
# used to run inline (codecs, cache, fsize).
|
||||||
|
# The *_local-* ones crawl the bundled Python server over loopback: the real
|
||||||
|
# TLS handshake, cache and file writer, which nothing else on Windows covers.
|
||||||
|
- name: Run the engine test suite (offline tests)
|
||||||
|
shell: bash
|
||||||
|
working-directory: tests
|
||||||
|
timeout-minutes: 45
|
||||||
|
run: |
|
||||||
|
set -u
|
||||||
|
bin="$(cygpath -u "$GITHUB_WORKSPACE")/src/${{ matrix.platform }}/${{ matrix.configuration }}"
|
||||||
|
export PATH="$bin:$PATH"
|
||||||
|
command -v httrack >/dev/null || { echo "::error::no httrack.exe in $bin"; exit 1; }
|
||||||
|
|
||||||
|
# httrack.exe is native, so MSYS rewrites any argument shaped like a
|
||||||
|
# POSIX path, and a URL path is shaped exactly like one: "/a/b.html"
|
||||||
|
# reached the engine as "C:/Program Files/Git/a/b.html". Switch that
|
||||||
|
# off, and hand the tests a TMPDIR that is already a Windows path.
|
||||||
|
export MSYS_NO_PATHCONV=1
|
||||||
|
export MSYS2_ARG_CONV_EXCL='*'
|
||||||
|
TMPDIR="$(cygpath -m "$RUNNER_TEMP")"
|
||||||
|
export TMPDIR
|
||||||
|
|
||||||
|
# Mirror what configure hands the suite. LC_ALL sets the codeset MSYS maps
|
||||||
|
# a UTF-8 mirror name onto UTF-16 with, which the intl crawls "test -f".
|
||||||
|
export HTTPS_SUPPORT=yes BROTLI_ENABLED=yes ZSTD_ENABLED=yes
|
||||||
|
export LC_ALL=C.UTF-8
|
||||||
|
|
||||||
|
# A wedged crawl must not eat the job's whole timeout budget.
|
||||||
|
watchdog=""
|
||||||
|
command -v timeout >/dev/null && watchdog="timeout 600"
|
||||||
|
|
||||||
|
pass=0 fail=0 skip=0 failed="" skipped=""
|
||||||
|
for t in 00_runnable.test 01_engine-*.test 01_zlib-*.test \
|
||||||
|
*_local-*.test 13_crawl_proxy_https.test; do
|
||||||
|
rc=0
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
$watchdog bash "$t" >"$t.log" 2>&1 || rc=$?
|
||||||
|
case "$rc" in
|
||||||
|
0) pass=$((pass + 1)); echo "PASS $t" ;;
|
||||||
|
77) skip=$((skip + 1)) skipped="$skipped $t"; echo "SKIP $t" ;;
|
||||||
|
*)
|
||||||
|
fail=$((fail + 1)) failed="$failed $t"
|
||||||
|
echo "FAIL $t (exit $rc)"
|
||||||
|
# These assert with `test "$(...)" == "..." || exit 1`, which
|
||||||
|
# says nothing at all on failure. Re-run traced.
|
||||||
|
bash -x "$t" >>"$t.log" 2>&1 || true
|
||||||
|
tail -n 25 "$t.log" | sed 's/^/ /'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
echo "ran=$((pass + fail + skip)) pass=$pass fail=$fail skip=$skip" |
|
||||||
|
tee -a "$GITHUB_STEP_SUMMARY"
|
||||||
|
|
||||||
|
# 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" # 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; }
|
||||||
|
|
||||||
|
- name: Upload the test logs
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: engine-tests-${{ matrix.platform }}-${{ matrix.configuration }}
|
||||||
|
path: tests/*.log
|
||||||
|
if-no-files-found: warn
|
||||||
|
|
||||||
|
- name: Upload MSBuild logs
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: msbuild-${{ matrix.platform }}-${{ matrix.configuration }}
|
||||||
|
path: msbuild-*.log
|
||||||
|
if-no-files-found: ignore
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -34,8 +34,9 @@ Makefile
|
|||||||
*.so.*
|
*.so.*
|
||||||
*.a
|
*.a
|
||||||
|
|
||||||
# make dist output.
|
# make dist output; dist/ holds httrack-gh-release staging artifacts.
|
||||||
/httrack-*.tar.gz
|
/httrack-*.tar.gz
|
||||||
|
/dist/
|
||||||
|
|
||||||
# Editor / autotools backup files.
|
# Editor / autotools backup files.
|
||||||
*~
|
*~
|
||||||
|
|||||||
15
AGENTS.md
15
AGENTS.md
@@ -6,8 +6,19 @@ the operational checklist: toolchain, invariants, and how to ship a change.
|
|||||||
## Build & test
|
## Build & test
|
||||||
- Fresh clone first: `git submodule update --init src/coucal`
|
- Fresh clone first: `git submodule update --init src/coucal`
|
||||||
- `./bootstrap` (regenerates `configure` via `autoreconf`; needs autoconf,
|
- `./bootstrap` (regenerates `configure` via `autoreconf`; needs autoconf,
|
||||||
automake, libtool), then `bash configure && make && make check`. Or run
|
automake, libtool), then `bash configure && make -j"$(nproc)" && make check
|
||||||
`sh build.sh` to do bootstrap + configure + make in one shot.
|
-j"$(nproc)"`. Always pass `-j` to `make check`: the suite runs under
|
||||||
|
automake's parallel harness and each crawl test binds its own ephemeral-port
|
||||||
|
server, so `-j` never contends and a multi-minute serial run drops to
|
||||||
|
seconds. A new `.test` added to `$(TESTS)` is scheduled onto a free worker
|
||||||
|
automatically; only a test slower than the current longest raises the floor.
|
||||||
|
On a few-core Linux box, `-j` at 2x the core count is faster still: the tests
|
||||||
|
spend much of their wall time asleep (server trickles, httrack self-pacing),
|
||||||
|
so an idle core covers a sleeping one. CI uses `min(2*cores, 16)` on every
|
||||||
|
platform, macOS included: the test server raises its listen backlog
|
||||||
|
(`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.
|
||||||
|
|
||||||
## Hard invariants
|
## Hard invariants
|
||||||
- **Generated autotools files are NOT in git.** `configure`, every
|
- **Generated autotools files are NOT in git.** `configure`, every
|
||||||
|
|||||||
1
CLAUDE.local.md
Symbolic link
1
CLAUDE.local.md
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
/home/roche/git/httrack-works/CLAUDE.httrack.local.md
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
SUBDIRS = src man m4 libtest templates lang html tests
|
SUBDIRS = src man m4 libtest templates lang html tests fuzz
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
|||||||
1
README
1
README
@@ -40,7 +40,6 @@ These are the principals limits of HTTrack for that moment. Note that we did not
|
|||||||
that would have solved them.
|
that would have solved them.
|
||||||
|
|
||||||
- Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
|
- Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
|
||||||
- Some java classes may not find some files on them (class included)
|
|
||||||
- Cgi-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like -*cgi-bin*
|
- Cgi-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like -*cgi-bin*
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
70
configure.ac
70
configure.ac
@@ -1,6 +1,6 @@
|
|||||||
AC_PREREQ([2.71])
|
AC_PREREQ([2.71])
|
||||||
|
|
||||||
AC_INIT([httrack], [3.49.11], [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([
|
AC_COPYRIGHT([
|
||||||
HTTrack Website Copier, Offline Browser for Windows and Unix
|
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||||
Copyright (C) 1998-2015 Xavier Roche and other contributors
|
Copyright (C) 1998-2015 Xavier Roche and other contributors
|
||||||
@@ -29,11 +29,11 @@ AC_CONFIG_SRCDIR(src/httrack.c)
|
|||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_HEADERS(config.h)
|
AC_CONFIG_HEADERS(config.h)
|
||||||
AM_INIT_AUTOMAKE([subdir-objects])
|
AM_INIT_AUTOMAKE([subdir-objects])
|
||||||
# 3:3:0: 3.49.11 only adds enum values, macros and inline helpers to the
|
# 3:4:0: 3.49.12 tail-appends one field (why_url) to httrackp and otherwise only
|
||||||
# installed headers (no struct layout or exported signature changed vs
|
# deletes dead comments; no struct layout or exported signature broke vs 3.49.11,
|
||||||
# 3.49.10), so it stays soname .so.3; bump revision.
|
# 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.)
|
# (3:0:0 was the htsblk mime-buffer widening, the ABI break that moved .so.2 -> .so.3.)
|
||||||
VERSION_INFO="3:3:0"
|
VERSION_INFO="3:4:0"
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
@@ -64,16 +64,6 @@ AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
|
|||||||
# Export version info
|
# Export version info
|
||||||
AC_SUBST(VERSION_INFO)
|
AC_SUBST(VERSION_INFO)
|
||||||
|
|
||||||
# Versioned plugin name for dlopen() in hts_create_opt(); soname major is
|
|
||||||
# libtool's current - age, so this tracks VERSION_INFO bumps automatically.
|
|
||||||
HTS_SONAME_MAJOR=$((${VERSION_INFO%%:*} - ${VERSION_INFO##*:}))
|
|
||||||
case "$host_os" in
|
|
||||||
darwin*) HTS_LIBHTSJAVA_NAME="libhtsjava.$HTS_SONAME_MAJOR.dylib" ;;
|
|
||||||
*) HTS_LIBHTSJAVA_NAME="libhtsjava.so.$HTS_SONAME_MAJOR" ;;
|
|
||||||
esac
|
|
||||||
AC_DEFINE_UNQUOTED([HTS_LIBHTSJAVA_NAME], ["$HTS_LIBHTSJAVA_NAME"],
|
|
||||||
[Versioned libhtsjava runtime name, derived from VERSION_INFO])
|
|
||||||
|
|
||||||
### Default CFLAGS
|
### Default CFLAGS
|
||||||
DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
|
DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
|
||||||
-Wmultichar -Wwrite-strings -Wcast-qual -Wcast-align \
|
-Wmultichar -Wwrite-strings -Wcast-qual -Wcast-align \
|
||||||
@@ -102,7 +92,8 @@ AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -
|
|||||||
AX_CHECK_COMPILE_FLAG([-Werror=attribute-warning], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=attribute-warning"])
|
AX_CHECK_COMPILE_FLAG([-Werror=attribute-warning], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=attribute-warning"])
|
||||||
AX_CHECK_COMPILE_FLAG([-Werror=user-defined-warnings], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=user-defined-warnings"])
|
AX_CHECK_COMPILE_FLAG([-Werror=user-defined-warnings], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=user-defined-warnings"])
|
||||||
AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
|
AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
|
||||||
AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])
|
AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector-strong"],
|
||||||
|
[AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])])
|
||||||
AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
|
AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
|
||||||
AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
|
AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
|
||||||
AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
|
AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
|
||||||
@@ -110,9 +101,16 @@ AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,
|
|||||||
AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
|
AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
|
||||||
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
|
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
|
||||||
|
|
||||||
|
# Fortify libc calls (=3, else =2) unless the toolchain predefines it; skip
|
||||||
|
# sanitizer builds, whose interceptors want the unfortified calls.
|
||||||
|
case "$CFLAGS" in
|
||||||
|
*-fsanitize=*) ;;
|
||||||
|
*) AX_ADD_FORTIFY_SOURCE ;;
|
||||||
|
esac
|
||||||
|
|
||||||
# Force libc back into DT_NEEDED for libraries that reach it only through
|
# Force libc back into DT_NEEDED for libraries that reach it only through
|
||||||
# libhttrack (libhtsjava, the libtest callbacks), but only with a GNU-style
|
# libhttrack (the libtest callbacks), but only with a GNU-style linker; Apple
|
||||||
# linker; Apple ld rejects these flags and links libSystem unconditionally.
|
# ld rejects these flags and links libSystem unconditionally.
|
||||||
AX_CHECK_LINK_FLAG([-Wl,--push-state,--no-as-needed,-lc,--pop-state],
|
AX_CHECK_LINK_FLAG([-Wl,--push-state,--no-as-needed,-lc,--pop-state],
|
||||||
[LIBC_FORCE_LINK="-Wl,--push-state,--no-as-needed,-lc,--pop-state"])
|
[LIBC_FORCE_LINK="-Wl,--push-state,--no-as-needed,-lc,--pop-state"])
|
||||||
AC_SUBST([LIBC_FORCE_LINK])
|
AC_SUBST([LIBC_FORCE_LINK])
|
||||||
@@ -175,6 +173,10 @@ AC_CHECK_HEADERS([execinfo.h])
|
|||||||
### zlib
|
### zlib
|
||||||
CHECK_ZLIB()
|
CHECK_ZLIB()
|
||||||
|
|
||||||
|
### brotli and zstd content codings (optional)
|
||||||
|
CHECK_BROTLI()
|
||||||
|
CHECK_ZSTD()
|
||||||
|
|
||||||
### OpenSSL is explicitly enabled/disabled ?
|
### OpenSSL is explicitly enabled/disabled ?
|
||||||
AC_MSG_CHECKING(whether to enable https support)
|
AC_MSG_CHECKING(whether to enable https support)
|
||||||
AC_ARG_ENABLE([https],
|
AC_ARG_ENABLE([https],
|
||||||
@@ -310,6 +312,37 @@ AC_ARG_ENABLE([online-unit-tests],
|
|||||||
])
|
])
|
||||||
AC_SUBST(ONLINE_UNIT_TESTS,$online_unit_tests)
|
AC_SUBST(ONLINE_UNIT_TESTS,$online_unit_tests)
|
||||||
|
|
||||||
|
## libFuzzer harnesses (fuzz/); requires clang
|
||||||
|
AC_MSG_CHECKING(whether to build fuzzers)
|
||||||
|
AC_ARG_ENABLE([fuzzers],
|
||||||
|
[AS_HELP_STRING([--enable-fuzzers],[Build libFuzzer harnesses in fuzz/ (requires clang) @<:@default=no@:>@])],
|
||||||
|
[
|
||||||
|
case "${enableval}" in
|
||||||
|
no|yes)
|
||||||
|
fuzzers=$enableval
|
||||||
|
AC_MSG_RESULT($enableval)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_ERROR(bad value for fuzzers, expected yes/no)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
],
|
||||||
|
[
|
||||||
|
fuzzers=no
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
])
|
||||||
|
if test x"$fuzzers" = x"yes"; then
|
||||||
|
# Instrument the whole build for coverage; harnesses link -fsanitize=fuzzer.
|
||||||
|
AX_CHECK_COMPILE_FLAG([-fsanitize=fuzzer-no-link],
|
||||||
|
[DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fsanitize=fuzzer-no-link"],
|
||||||
|
[AC_MSG_ERROR([--enable-fuzzers requires libFuzzer support (clang)])])
|
||||||
|
# clang's static sanitizer runtimes clash with -Wl,--no-undefined on the .so.
|
||||||
|
if test x"$enable_shared" != x"no"; then
|
||||||
|
AC_MSG_ERROR([--enable-fuzzers requires --disable-shared])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL([FUZZERS], [test x"$fuzzers" = x"yes"])
|
||||||
|
|
||||||
# Final output
|
# Final output
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
@@ -321,5 +354,6 @@ lang/Makefile
|
|||||||
html/Makefile
|
html/Makefile
|
||||||
libtest/Makefile
|
libtest/Makefile
|
||||||
tests/Makefile
|
tests/Makefile
|
||||||
|
fuzz/Makefile
|
||||||
])
|
])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|||||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@@ -1,3 +1,13 @@
|
|||||||
|
httrack (3.49.12-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New upstream release: security and crawl-correctness fixes (remote stack
|
||||||
|
overflow in Content-Type/-Encoding parsing, fuzzer-found parser over-reads,
|
||||||
|
world-readable cookies.txt, filter-pattern denial of service) plus a new
|
||||||
|
--why filter diagnostic; full list in history.txt.
|
||||||
|
* Build with _FORTIFY_SOURCE and -fstack-protector-strong.
|
||||||
|
|
||||||
|
-- Xavier Roche <xavier@debian.org> Fri, 10 Jul 2026 21:11:09 +0200
|
||||||
|
|
||||||
httrack (3.49.11-1) unstable; urgency=medium
|
httrack (3.49.11-1) unstable; urgency=medium
|
||||||
|
|
||||||
* New upstream release: crawl correctness and security fixes (network-facing
|
* New upstream release: crawl correctness and security fixes (network-facing
|
||||||
|
|||||||
2
debian/control
vendored
2
debian/control
vendored
@@ -2,7 +2,7 @@ Source: httrack
|
|||||||
Section: web
|
Section: web
|
||||||
Maintainer: Xavier Roche <roche@httrack.com>
|
Maintainer: Xavier Roche <roche@httrack.com>
|
||||||
Standards-Version: 4.7.4
|
Standards-Version: 4.7.4
|
||||||
Build-Depends: debhelper-compat (= 14), autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
|
Build-Depends: debhelper-compat (= 14), autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev, libbrotli-dev, libzstd-dev
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
Homepage: http://www.httrack.com
|
Homepage: http://www.httrack.com
|
||||||
Vcs-Git: https://github.com/xroche/httrack.git
|
Vcs-Git: https://github.com/xroche/httrack.git
|
||||||
|
|||||||
5
debian/copyright
vendored
5
debian/copyright
vendored
@@ -7,9 +7,8 @@ Files: *
|
|||||||
Copyright: 1998-2026 Xavier Roche and other contributors
|
Copyright: 1998-2026 Xavier Roche and other contributors
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
Comment:
|
Comment:
|
||||||
The engine includes contributions from Yann Philippot (src/htsjava.c,
|
htsbasenet.h links against the system OpenSSL library (originally by Eric
|
||||||
src/htsjava.h). htsbasenet.h links against the system OpenSSL library
|
Young); no OpenSSL/SSLeay code is bundled here.
|
||||||
(originally by Eric Young); no OpenSSL/SSLeay code is bundled here.
|
|
||||||
|
|
||||||
Files: src/minizip/*
|
Files: src/minizip/*
|
||||||
Copyright: 1998-2010 Gilles Vollant
|
Copyright: 1998-2010 Gilles Vollant
|
||||||
|
|||||||
1
debian/libhttrack-dev.files
vendored
1
debian/libhttrack-dev.files
vendored
@@ -1,5 +1,4 @@
|
|||||||
usr/include/httrack
|
usr/include/httrack
|
||||||
usr/lib/*/libhttrack.{so}
|
usr/lib/*/libhttrack.{so}
|
||||||
usr/lib/*/libhtsjava.{so}
|
|
||||||
usr/share/httrack/libtest
|
usr/share/httrack/libtest
|
||||||
usr/lib/*/httrack/libtest
|
usr/lib/*/httrack/libtest
|
||||||
|
|||||||
1
debian/libhttrack3.files
vendored
1
debian/libhttrack3.files
vendored
@@ -1,3 +1,2 @@
|
|||||||
usr/lib/*/libhttrack.so.3*
|
usr/lib/*/libhttrack.so.3*
|
||||||
usr/lib/*/libhtsjava.so.3*
|
|
||||||
usr/share/httrack/templates
|
usr/share/httrack/templates
|
||||||
|
|||||||
45
fuzz/Makefile.am
Normal file
45
fuzz/Makefile.am
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
# libFuzzer harnesses; built only with --enable-fuzzers (requires clang).
|
||||||
|
if FUZZERS
|
||||||
|
noinst_PROGRAMS = fuzz-charset fuzz-meta fuzz-idna fuzz-entities \
|
||||||
|
fuzz-unescape fuzz-filters fuzz-url fuzz-header fuzz-cachendx
|
||||||
|
endif
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
@DEFAULT_CFLAGS@ \
|
||||||
|
@THREADS_CFLAGS@ \
|
||||||
|
@V6_FLAG@ \
|
||||||
|
@LFS_FLAG@ \
|
||||||
|
-I$(top_srcdir)/src \
|
||||||
|
-I$(top_srcdir)/src/coucal
|
||||||
|
|
||||||
|
# Static-link libhttrack.la: the internal symbols are hidden in the .so.
|
||||||
|
AM_LDFLAGS = @DEFAULT_LDFLAGS@ -fsanitize=fuzzer -static-libtool-libs
|
||||||
|
LDADD = $(top_builddir)/src/libhttrack.la $(THREADS_LIBS)
|
||||||
|
|
||||||
|
fuzz_charset_SOURCES = fuzz-charset.c fuzz.h
|
||||||
|
fuzz_meta_SOURCES = fuzz-meta.c fuzz.h
|
||||||
|
fuzz_idna_SOURCES = fuzz-idna.c fuzz.h
|
||||||
|
fuzz_entities_SOURCES = fuzz-entities.c fuzz.h
|
||||||
|
fuzz_unescape_SOURCES = fuzz-unescape.c fuzz.h
|
||||||
|
fuzz_filters_SOURCES = fuzz-filters.c fuzz.h
|
||||||
|
fuzz_url_SOURCES = fuzz-url.c fuzz.h
|
||||||
|
fuzz_header_SOURCES = fuzz-header.c fuzz.h
|
||||||
|
fuzz_cachendx_SOURCES = fuzz-cachendx.c fuzz.h
|
||||||
|
|
||||||
|
# List corpus files explicitly: automake does not expand EXTRA_DIST globs.
|
||||||
|
EXTRA_DIST = README.md run-fuzzers.sh \
|
||||||
|
corpus/charset/utf8.txt corpus/charset/latin1.txt corpus/charset/sjis.txt \
|
||||||
|
corpus/meta/meta-charset.html corpus/meta/meta-http-equiv.html \
|
||||||
|
corpus/idna/idna.txt corpus/idna/unicode.txt \
|
||||||
|
corpus/idna/regress-multilabel-leak.txt \
|
||||||
|
corpus/entities/entities.txt \
|
||||||
|
corpus/unescape/percent.txt \
|
||||||
|
corpus/filters/filter.bin corpus/filters/filter-size.bin \
|
||||||
|
corpus/filters/regress-empty-subject-unique.bin \
|
||||||
|
corpus/filters/redos-star-classes.bin \
|
||||||
|
corpus/url/http-url.txt corpus/url/relative-path.txt \
|
||||||
|
corpus/url/regress-file-empty-path.txt corpus/url/regress-long-path-abort.txt \
|
||||||
|
corpus/header/full-response.txt corpus/header/redirect.txt \
|
||||||
|
corpus/cachendx/new-format.txt corpus/cachendx/old-format.txt \
|
||||||
|
corpus/cachendx/regress-overadvance.bin \
|
||||||
|
corpus/cachendx/regress-truncated-entry.bin
|
||||||
15
fuzz/README.md
Normal file
15
fuzz/README.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Fuzzing httrack
|
||||||
|
|
||||||
|
libFuzzer harnesses for the pure hostile-input parsers (charset/UTF-8/IDNA codecs, entity and percent decoders, wildcard filters, URL splitter). Off by default; needs clang.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./bootstrap
|
||||||
|
mkdir /var/tmp/bld-fuzz && cd /var/tmp/bld-fuzz
|
||||||
|
CC=clang CFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=all -g -O1" \
|
||||||
|
LDFLAGS="-fsanitize=address,undefined" \
|
||||||
|
bash /path/to/httrack/configure --enable-fuzzers --disable-shared
|
||||||
|
make
|
||||||
|
bash /path/to/httrack/fuzz/run-fuzzers.sh fuzz 60 # 60s per target
|
||||||
|
```
|
||||||
|
|
||||||
|
Run one target by hand: `fuzz/fuzz-url -max_total_time=300 corpusdir fuzz/corpus/url`. Seed corpora live in `corpus/<target>/`; a crash reproducer is replayed with `fuzz/fuzz-url crash-file`.
|
||||||
7
fuzz/corpus/cachendx/new-format.txt
Normal file
7
fuzz/corpus/cachendx/new-format.txt
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
8
|
||||||
|
CACHE-1.1
|
||||||
|
28
|
||||||
|
Mon, 01 Jan 2024 00:00:00 GMT
|
||||||
|
www.example.com
|
||||||
|
/index.html
|
||||||
|
123
|
||||||
5
fuzz/corpus/cachendx/old-format.txt
Normal file
5
fuzz/corpus/cachendx/old-format.txt
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
3
|
||||||
|
1.0
|
||||||
|
www.example.com
|
||||||
|
/page
|
||||||
|
5
|
||||||
2
fuzz/corpus/cachendx/regress-overadvance.bin
Normal file
2
fuzz/corpus/cachendx/regress-overadvance.bin
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
32768
|
||||||
|
CACHE-1.1
|
||||||
5
fuzz/corpus/cachendx/regress-truncated-entry.bin
Normal file
5
fuzz/corpus/cachendx/regress-truncated-entry.bin
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
8
|
||||||
|
CACHE-1.1
|
||||||
|
1
|
||||||
|
x
|
||||||
|
www.example.com
|
||||||
1
fuzz/corpus/charset/latin1.txt
Normal file
1
fuzz/corpus/charset/latin1.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
café naďve ¤
|
||||||
1
fuzz/corpus/charset/sjis.txt
Normal file
1
fuzz/corpus/charset/sjis.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
コンピュータ
|
||||||
BIN
fuzz/corpus/charset/utf8.txt
Normal file
BIN
fuzz/corpus/charset/utf8.txt
Normal file
Binary file not shown.
1
fuzz/corpus/entities/entities.txt
Normal file
1
fuzz/corpus/entities/entities.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
&<>A☃é¬arealentity;�
|
||||||
BIN
fuzz/corpus/filters/filter-size.bin
Normal file
BIN
fuzz/corpus/filters/filter-size.bin
Normal file
Binary file not shown.
BIN
fuzz/corpus/filters/filter.bin
Normal file
BIN
fuzz/corpus/filters/filter.bin
Normal file
Binary file not shown.
BIN
fuzz/corpus/filters/redos-star-classes.bin
Normal file
BIN
fuzz/corpus/filters/redos-star-classes.bin
Normal file
Binary file not shown.
1
fuzz/corpus/filters/regress-empty-subject-unique.bin
Normal file
1
fuzz/corpus/filters/regress-empty-subject-unique.bin
Normal file
@@ -0,0 +1 @@
|
|||||||
|
**((
|
||||||
10
fuzz/corpus/header/full-response.txt
Normal file
10
fuzz/corpus/header/full-response.txt
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
HTTP/1.1 200 OK
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Length: 1234
|
||||||
|
Content-Encoding: gzip
|
||||||
|
Last-Modified: Mon, 01 Jan 2024 00:00:00 GMT
|
||||||
|
Etag: "abc"
|
||||||
|
Location: http://example.com/x
|
||||||
|
Set-Cookie: ID=42; path=/; domain=.example.com
|
||||||
|
Content-Range: bytes 0-99/100
|
||||||
|
Transfer-Encoding: chunked
|
||||||
3
fuzz/corpus/header/redirect.txt
Normal file
3
fuzz/corpus/header/redirect.txt
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
HTTP/1.0 301 Moved
|
||||||
|
Location: /elsewhere
|
||||||
|
Content-Disposition: attachment; filename="a.pdf"
|
||||||
1
fuzz/corpus/idna/idna.txt
Normal file
1
fuzz/corpus/idna/idna.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
xn--bcher-kva.example.com
|
||||||
1
fuzz/corpus/idna/regress-multilabel-leak.txt
Normal file
1
fuzz/corpus/idna/regress-multilabel-leak.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
büchev.例åbücheple
|
||||||
1
fuzz/corpus/idna/unicode.txt
Normal file
1
fuzz/corpus/idna/unicode.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
bücher.例子.example
|
||||||
1
fuzz/corpus/meta/meta-charset.html
Normal file
1
fuzz/corpus/meta/meta-charset.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<html><head><meta charset="utf-8"></head><body>x</body></html>
|
||||||
1
fuzz/corpus/meta/meta-content-first.html
Normal file
1
fuzz/corpus/meta/meta-content-first.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<meta content="text/html; charset=gb2312" http-equiv="content-type">
|
||||||
1
fuzz/corpus/meta/meta-http-equiv.html
Normal file
1
fuzz/corpus/meta/meta-http-equiv.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||||
1
fuzz/corpus/meta/meta-truncated.html
Normal file
1
fuzz/corpus/meta/meta-truncated.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<meta charset='utf-8
|
||||||
1
fuzz/corpus/meta/meta-unquoted.html
Normal file
1
fuzz/corpus/meta/meta-unquoted.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<meta charset = utf-8 />
|
||||||
1
fuzz/corpus/unescape/percent.txt
Normal file
1
fuzz/corpus/unescape/percent.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
%41%zz%%20%c3%a9+%2e%2e%2f
|
||||||
1
fuzz/corpus/url/http-url.txt
Normal file
1
fuzz/corpus/url/http-url.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
http://user:pass@www.example.com:8080/a/b/../c/./d.html?q=1#frag
|
||||||
1
fuzz/corpus/url/regress-file-empty-path.txt
Normal file
1
fuzz/corpus/url/regress-file-empty-path.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
file://
|
||||||
1
fuzz/corpus/url/regress-long-path-abort.txt
Normal file
1
fuzz/corpus/url/regress-long-path-abort.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ftpumŠ[/../e0O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/.../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W//O/../f9O_i../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/.../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W//O/../f9O_i<5F>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._f9O_i../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/.../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W//O/../f9O_i<5F>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/i<>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_im<69>W/.¿ù../O/../9O_imÙ<6D>Š<EFBFBD>W/../_/../../e0O/../f9O_./f9O_i<5F>W/../O/../90O/./e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_imÙ<6D>Š<EFBFBD>W/../O/.._i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9O_i/../O/../f9O_i<5F>W/../O/../90O/../itpumÙ/ftpumŠ[/../e0O/../itpumÙ<6D>Š[/../O/../f9O_i<5F>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/../f9OmÙ<6D>Š<EFBFBD>W/../O/../9O_imÙ<6D>Š<EFBFBD>W/../O/..O_imÙ<6D>Š<EFBFBD>W/../O/../../e0O/9O_imÙ<6D>Š<EFBFBD>W/../O/../
|
||||||
1
fuzz/corpus/url/relative-path.txt
Normal file
1
fuzz/corpus/url/relative-path.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ftp://ftp.example.com/pub/../file.txt
|
||||||
65
fuzz/fuzz-cachendx.c
Normal file
65
fuzz/fuzz-cachendx.c
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||||
|
Copyright (C) 2026 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the cache-index (.ndx) parser: a corrupt or truncated index must not
|
||||||
|
walk the length-prefixed cache_brstr/cache_binput scan past the buffer.
|
||||||
|
Mirrors the -#C cache-listing scan (htscoremain.c). */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htscache.h"
|
||||||
|
#include "htslib.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *buf = fuzz_strdup(data, size);
|
||||||
|
const char *const end = buf + size;
|
||||||
|
char firstline[256];
|
||||||
|
char *a = buf;
|
||||||
|
|
||||||
|
/* header: two length-prefixed fields (version, last-modified) */
|
||||||
|
a += cache_brstr(a, firstline, sizeof(firstline));
|
||||||
|
a += cache_brstr(a, firstline, sizeof(firstline));
|
||||||
|
|
||||||
|
/* body: newline-delimited host/file/position triples; the length-prefixed
|
||||||
|
scan must stay inside the buffer */
|
||||||
|
while (a != NULL && a < end) {
|
||||||
|
char BIGSTK line[HTS_URLMAXSIZE * 2];
|
||||||
|
char linepos[256];
|
||||||
|
int pos;
|
||||||
|
|
||||||
|
a = strchr(a + 1, '\n');
|
||||||
|
if (a == NULL)
|
||||||
|
break;
|
||||||
|
a++;
|
||||||
|
a += cache_binput(a, end, line, HTS_URLMAXSIZE);
|
||||||
|
a += cache_binput(a, end, line + strlen(line), HTS_URLMAXSIZE);
|
||||||
|
a += cache_binput(a, end, linepos, 200);
|
||||||
|
sscanf(linepos, "%d", &pos);
|
||||||
|
(void) pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
freet(buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
84
fuzz/fuzz-charset.c
Normal file
84
fuzz/fuzz-charset.c
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the charset codecs: hts_convertStringToUTF8/FromUTF8 and the
|
||||||
|
UTF-8/UCS4 primitives (htscharset.c). First input byte picks the charset. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htscharset.h"
|
||||||
|
|
||||||
|
static const char *const charsets[] = {
|
||||||
|
"utf-8", "iso-8859-1", "iso-8859-2", "iso-8859-15", "windows-1252",
|
||||||
|
"us-ascii", "shift_jis", "euc-jp", "iso-2022-jp", "gb2312",
|
||||||
|
"big5", "euc-kr", "koi8-r", "utf-16", "unknown-charset",
|
||||||
|
};
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
const char *charset;
|
||||||
|
char *s;
|
||||||
|
|
||||||
|
if (size == 0)
|
||||||
|
return 0;
|
||||||
|
charset = charsets[data[0] % (sizeof(charsets) / sizeof(charsets[0]))];
|
||||||
|
data++, size--;
|
||||||
|
s = fuzz_strdup(data, size);
|
||||||
|
|
||||||
|
{
|
||||||
|
char *utf8 = hts_convertStringToUTF8(s, size, charset);
|
||||||
|
freet(utf8);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
char *enc = hts_convertStringFromUTF8(s, size, charset);
|
||||||
|
freet(enc);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
size_t nChars = 0;
|
||||||
|
hts_UCS4 *ucs = hts_convertUTF8StringToUCS4(s, size, &nChars);
|
||||||
|
|
||||||
|
if (ucs != NULL) {
|
||||||
|
char *back = hts_convertUCS4StringToUTF8(ucs, nChars);
|
||||||
|
freet(back);
|
||||||
|
freet(ucs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
while (i < size) {
|
||||||
|
hts_UCS4 uc = 0;
|
||||||
|
const size_t nr = hts_readUTF8(s + i, size - i, &uc);
|
||||||
|
char out[8];
|
||||||
|
|
||||||
|
if (nr == 0)
|
||||||
|
break;
|
||||||
|
hts_writeUTF8(uc, out, sizeof(out));
|
||||||
|
i += nr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
freet(s);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
51
fuzz/fuzz-entities.c
Normal file
51
fuzz/fuzz-entities.c
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the HTML entity decoder (htsencoding.c). First input byte picks the
|
||||||
|
destination size, so truncation bounds get exercised too. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htsencoding.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
static const size_t dsizes[] = {1, 2, 8, 64, 4096};
|
||||||
|
size_t dsize;
|
||||||
|
char *src, *dest;
|
||||||
|
|
||||||
|
if (size == 0)
|
||||||
|
return 0;
|
||||||
|
dsize = dsizes[data[0] % (sizeof(dsizes) / sizeof(dsizes[0]))];
|
||||||
|
data++, size--;
|
||||||
|
src = fuzz_strdup(data, size);
|
||||||
|
dest = malloct(dsize);
|
||||||
|
|
||||||
|
(void) hts_unescapeEntities(src, dest, dsize);
|
||||||
|
(void) hts_unescapeEntitiesWithCharset(src, dest, dsize, "iso-8859-1");
|
||||||
|
|
||||||
|
freet(dest);
|
||||||
|
freet(src);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
65
fuzz/fuzz-filters.c
Normal file
65
fuzz/fuzz-filters.c
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the wildcard filter matcher (htsfilters.c; #148 bracket-range OOB was
|
||||||
|
here). Input splits on the first NUL: pattern, then subject string. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htsfilters.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *buf = fuzz_strdup(data, size);
|
||||||
|
const char *joker = buf;
|
||||||
|
const uint8_t *sep = memchr(data, '\0', size);
|
||||||
|
/* subject in its own allocation so ASan bounds it apart from the pattern */
|
||||||
|
char *nom = sep != NULL ? fuzz_strdup(sep + 1, (data + size) - (sep + 1))
|
||||||
|
: fuzz_strdup(data + size, 0);
|
||||||
|
|
||||||
|
(void) strjoker(nom, joker, NULL, NULL);
|
||||||
|
{
|
||||||
|
LLint sz = (LLint) size;
|
||||||
|
int size_flag = 0;
|
||||||
|
|
||||||
|
(void) strjoker(nom, joker, &sz, &size_flag);
|
||||||
|
}
|
||||||
|
(void) strjokerfind(nom, joker);
|
||||||
|
{
|
||||||
|
char *filter = malloct(strlen(joker) + 2);
|
||||||
|
char *filters[1];
|
||||||
|
LLint sz = (LLint) size;
|
||||||
|
int size_flag = 0, depth = 0;
|
||||||
|
|
||||||
|
filter[0] = '-';
|
||||||
|
memcpy(filter + 1, joker, strlen(joker) + 1);
|
||||||
|
filters[0] = filter;
|
||||||
|
(void) fa_strjoker(0, filters, 1, nom, &sz, &size_flag, &depth);
|
||||||
|
freet(filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
freet(nom);
|
||||||
|
freet(buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
74
fuzz/fuzz-header.c
Normal file
74
fuzz/fuzz-header.c
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||||
|
Copyright (C) 2026 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the HTTP response-header parser (htslib.c): treatfirstline on the
|
||||||
|
status line, treathead on each following header. Both consume raw bytes
|
||||||
|
off the wire and copy fields into fixed htsblk buffers; treathead also
|
||||||
|
mutates its line in place and drives cookie parsing. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htslib.h"
|
||||||
|
#include "htsbauth.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *buf = fuzz_strdup(data, size);
|
||||||
|
htsblk r;
|
||||||
|
t_cookie *cookie = calloct(1, sizeof(*cookie));
|
||||||
|
char *line = malloct(size + 1);
|
||||||
|
char *p = buf;
|
||||||
|
int first = 1;
|
||||||
|
|
||||||
|
memset(&r, 0, sizeof(r));
|
||||||
|
cookie->max_len = (int) sizeof(cookie->data);
|
||||||
|
r.location = malloct(HTS_URLMAXSIZE * 2);
|
||||||
|
r.location[0] = '\0';
|
||||||
|
|
||||||
|
/* feed one header line at a time, as the receive loop does */
|
||||||
|
while (p != NULL && *p != '\0') {
|
||||||
|
char *nl = strchr(p, '\n');
|
||||||
|
size_t n = (nl != NULL) ? (size_t) (nl - p) : strlen(p);
|
||||||
|
size_t i, len = 0;
|
||||||
|
|
||||||
|
/* binput drops every '\r' on the wire; mirror it */
|
||||||
|
for (i = 0; i < n; i++)
|
||||||
|
if (p[i] != '\r')
|
||||||
|
line[len++] = p[i];
|
||||||
|
line[len] = '\0';
|
||||||
|
if (first) {
|
||||||
|
treatfirstline(&r, line);
|
||||||
|
first = 0;
|
||||||
|
} else {
|
||||||
|
treathead(cookie, "www.example.com", "/", &r, line);
|
||||||
|
}
|
||||||
|
p = (nl != NULL) ? nl + 1 : NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
freet(r.location);
|
||||||
|
freet(line);
|
||||||
|
freet(cookie);
|
||||||
|
freet(buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
47
fuzz/fuzz-idna.c
Normal file
47
fuzz/fuzz-idna.c
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the IDNA/punycode codec (htscharset.c, CVE-prone lineage). */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htscharset.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *s = fuzz_strdup(data, size);
|
||||||
|
|
||||||
|
{
|
||||||
|
char *idna = hts_convertStringUTF8ToIDNA(s, size);
|
||||||
|
freet(idna);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
char *utf8 = hts_convertStringIDNAToUTF8(s, size);
|
||||||
|
freet(utf8);
|
||||||
|
}
|
||||||
|
(void) hts_isStringIDNA(s, size);
|
||||||
|
|
||||||
|
freet(s);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
40
fuzz/fuzz-meta.c
Normal file
40
fuzz/fuzz-meta.c
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz hts_getCharsetFromMeta (htscharset.c): scans raw attacker HTML for a
|
||||||
|
<meta> charset declaration. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htscharset.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *html = fuzz_strdup(data, size);
|
||||||
|
char *charset = hts_getCharsetFromMeta(html, size);
|
||||||
|
|
||||||
|
freet(charset);
|
||||||
|
freet(html);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
53
fuzz/fuzz-unescape.c
Normal file
53
fuzz/fuzz-unescape.c
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the URL percent-decoders (htslib.c). First input byte picks the
|
||||||
|
output buffer size, so the bounded-copy contract is exercised. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "httrack-library.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
static const size_t bsizes[] = {1, 2, 16, 256, 8192};
|
||||||
|
size_t bsize;
|
||||||
|
char *s, *catbuff;
|
||||||
|
|
||||||
|
if (size == 0)
|
||||||
|
return 0;
|
||||||
|
bsize = bsizes[data[0] % (sizeof(bsizes) / sizeof(bsizes[0]))];
|
||||||
|
data++, size--;
|
||||||
|
s = fuzz_strdup(data, size);
|
||||||
|
catbuff = malloct(bsize);
|
||||||
|
|
||||||
|
(void) unescape_http(catbuff, bsize, s);
|
||||||
|
(void) unescape_http_unharm(catbuff, bsize, s, 0);
|
||||||
|
(void) unescape_http_unharm(catbuff, bsize, s, 1);
|
||||||
|
unescape_amp(s);
|
||||||
|
|
||||||
|
freet(catbuff);
|
||||||
|
freet(s);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
49
fuzz/fuzz-url.c
Normal file
49
fuzz/fuzz-url.c
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
/* ------------------------------------------------------------ */
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Fuzz the URL splitter and path normalizer (htslib.c): ident_url_absolute
|
||||||
|
is the first parser to touch a raw URL; fil_simplifie collapses ./ and ../
|
||||||
|
in place. */
|
||||||
|
#include "fuzz.h"
|
||||||
|
#include "htscore.h"
|
||||||
|
#include "htslib.h"
|
||||||
|
|
||||||
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||||
|
char *s = fuzz_strdup(data, size);
|
||||||
|
lien_adrfil *af = calloct(1, sizeof(*af));
|
||||||
|
/* fil_simplifie rewrites in place and may grow an empty path to "./" */
|
||||||
|
char *path = malloct(size + 3);
|
||||||
|
|
||||||
|
(void) ident_url_absolute(s, af);
|
||||||
|
memcpy(path, s, size + 1);
|
||||||
|
fil_simplifie(path);
|
||||||
|
|
||||||
|
freet(path);
|
||||||
|
freet(af);
|
||||||
|
freet(s);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
@@ -25,46 +25,27 @@ would dishonor our work and waste the many hours we have spent on it.
|
|||||||
Please visit our Website: http://www.httrack.com
|
Please visit our Website: http://www.httrack.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* Shared helpers for the libFuzzer harnesses. */
|
||||||
/* File: Java classes parser .h */
|
#ifndef FUZZ_H
|
||||||
/* Author: Yann Philippot */
|
#define FUZZ_H
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
|
|
||||||
#ifndef HTSJAVA_DEFH
|
#define HTS_INTERNAL_BYTECODE
|
||||||
#define HTSJAVA_DEFH
|
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef HTS_DEF_FWSTRUCT_JAVA_HEADER
|
#include "htsbase.h"
|
||||||
#define HTS_DEF_FWSTRUCT_JAVA_HEADER
|
|
||||||
typedef struct JAVA_HEADER JAVA_HEADER;
|
|
||||||
#endif
|
|
||||||
/* 10-byte on-disk .class header image, fread() directly: fields need exact
|
|
||||||
widths (LP64's 8-byte 'unsigned long' magic never matched 0xCAFEBABE). */
|
|
||||||
struct JAVA_HEADER {
|
|
||||||
uint32_t magic;
|
|
||||||
uint16_t minor;
|
|
||||||
uint16_t major;
|
|
||||||
uint16_t count;
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifndef HTS_DEF_FWSTRUCT_RESP_STRUCT
|
/* Heap NUL-terminated copy of the fuzzer input, so ASan bounds every read. */
|
||||||
#define HTS_DEF_FWSTRUCT_RESP_STRUCT
|
static char *fuzz_strdup(const uint8_t *data, size_t size) {
|
||||||
typedef struct RESP_STRUCT RESP_STRUCT;
|
char *s = malloct(size + 1);
|
||||||
#endif
|
|
||||||
struct RESP_STRUCT {
|
|
||||||
int file_position;
|
|
||||||
//
|
|
||||||
unsigned int index1;
|
|
||||||
unsigned int type;
|
|
||||||
char name[1024];
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Library internal definictions */
|
memcpy(s, data, size);
|
||||||
#ifdef HTS_INTERNAL_BYTECODE
|
s[size] = '\0';
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
EXTERNAL_FUNCTION int hts_plug_java(httrackp * opt, const char *argv);
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
41
fuzz/run-fuzzers.sh
Executable file
41
fuzz/run-fuzzers.sh
Executable file
@@ -0,0 +1,41 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Drive every built harness against its seed corpus.
|
||||||
|
# run-fuzzers.sh <build-fuzz-dir> check deterministic replay (CI smoke)
|
||||||
|
# run-fuzzers.sh <build-fuzz-dir> [seconds] timed mutation run (discovery)
|
||||||
|
# Replay is crash/leak-only and never mutates; the per-unit -timeout guards
|
||||||
|
# both modes against pathological slowdowns (e.g. pre-#501 strjoker).
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
srcdir=$(cd "$(dirname "$0")" && pwd)
|
||||||
|
bld=${1:?usage: run-fuzzers.sh <build-fuzz-dir> [check|seconds]}
|
||||||
|
mode=${2:-20}
|
||||||
|
|
||||||
|
status=0
|
||||||
|
for f in "$bld"/fuzz-*; do
|
||||||
|
if [ ! -f "$f" ] || [ ! -r "$f" ]; then continue; fi
|
||||||
|
case "$f" in *.o | *.c | *.dSYM) continue ;; esac
|
||||||
|
name=$(basename "$f")
|
||||||
|
corpus="$srcdir/corpus/${name#fuzz-}"
|
||||||
|
if [ "$mode" = "check" ]; then
|
||||||
|
echo "=== $name (replay) ==="
|
||||||
|
[ -d "$corpus" ] || continue
|
||||||
|
if ! "$f" -runs=0 -timeout=25 -rss_limit_mb=2048 "$corpus"; then
|
||||||
|
echo "*** $name FAILED on its corpus" >&2
|
||||||
|
status=1
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
work=$(mktemp -d)
|
||||||
|
args=("$work")
|
||||||
|
[ -d "$corpus" ] && args+=("$corpus")
|
||||||
|
echo "=== $name (${mode}s) ==="
|
||||||
|
if ! "$f" -max_total_time="$mode" -timeout=25 -rss_limit_mb=2048 \
|
||||||
|
-artifact_prefix="$work/" -print_final_stats=1 "${args[@]}"; then
|
||||||
|
echo "*** $name FAILED; artifacts:" >&2
|
||||||
|
ls -l "$work" >&2
|
||||||
|
status=1
|
||||||
|
else
|
||||||
|
rm -rf "$work"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
exit $status
|
||||||
17
history.txt
17
history.txt
@@ -4,6 +4,23 @@ HTTrack Website Copier release history:
|
|||||||
|
|
||||||
This file lists all changes and fixes that have been made for HTTrack
|
This file lists all changes and fixes that have been made for HTTrack
|
||||||
|
|
||||||
|
3.49-12
|
||||||
|
+ New: --why explains which filter rule accepts or rejects a given URL, then exits (#505)
|
||||||
|
+ Fixed: links carrying raw UTF-8 bytes were fetched double-encoded and 404'd (#516)
|
||||||
|
+ Fixed: an uncompressed body mislabeled as gzip no longer loses the page (#515)
|
||||||
|
+ Fixed: remote stack overflow and uninitialized read in Content-Type/-Encoding parsing (#506)
|
||||||
|
+ Fixed: several over-reads and a leak in the filter, URL and IDNA parsers (#499)
|
||||||
|
+ Fixed: bound the cache-index (.ndx) parser to its buffer (#507)
|
||||||
|
+ Fixed: catastrophic backtracking on '*'-heavy filter patterns (#513)
|
||||||
|
+ Fixed: cookies.txt was created world-readable (#511)
|
||||||
|
+ Fixed: a single corrupt cache entry no longer aborts the whole mirror (#494)
|
||||||
|
+ Fixed: cache-reconcile policy was broken for zip caches (#491, #493, #495)
|
||||||
|
+ Fixed: cancelling a crawl mid type-check no longer orphans .delayed placeholders (#496)
|
||||||
|
+ Fixed: detect URLs after the first inline script and in mid-tag attributes (#497)
|
||||||
|
+ Changed: build with _FORTIFY_SOURCE and -fstack-protector-strong (#504)
|
||||||
|
+ Changed: removed the pre-3.31 (.dat/.ndx) cache import (#512)
|
||||||
|
+ Changed: multiple internal hardening and build improvements (libFuzzer harnesses, CodeQL, dead-code removal)
|
||||||
|
|
||||||
3.49-11
|
3.49-11
|
||||||
+ New: parse robots.txt Allow rules and path wildcards per RFC 9309 (#452)
|
+ New: parse robots.txt Allow rules and path wildcards per RFC 9309 (#452)
|
||||||
+ New: advertise deflate in Accept-Encoding and decode deflate responses (#450)
|
+ New: advertise deflate in Accept-Encoding and decode deflate responses (#450)
|
||||||
|
|||||||
@@ -609,10 +609,9 @@ most mirrors do work. We still are working to improve the mirror quality of HTTr
|
|||||||
<br>
|
<br>
|
||||||
|
|
||||||
</a><a NAME="Q2b">Q: <strong>Some Java applets do not work properly!</strong><br>
|
</a><a NAME="Q2b">Q: <strong>Some Java applets do not work properly!</strong><br>
|
||||||
A: <em>Java applets may not work in some cases, for example if HTTrack failed to detect all included classes
|
A: <em>Java applets may not work in some cases, because HTTrack does not parse compiled class files to find
|
||||||
or files called within the class file. Sometimes, Java applets need to be online, because remote files are
|
the resources they load. Java applets often need to be online anyway, since remote files are fetched directly
|
||||||
directly caught. Finally, the site structure can be incompatible with the class (always try to keep the original site structure
|
at runtime.<br>
|
||||||
when you want to get Java classes)<br>
|
|
||||||
If there is no way to make some classes work properly, you can exclude them with the filters.
|
If there is no way to make some classes work properly, you can exclude them with the filters.
|
||||||
They will be available, but only online.
|
They will be available, but only online.
|
||||||
</em>
|
</em>
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ Build options:
|
|||||||
Spider options:
|
Spider options:
|
||||||
bN accept cookies in cookies.txt (0=do not accept,* 1=accept) (--cookies[=N])
|
bN accept cookies in cookies.txt (0=do not accept,* 1=accept) (--cookies[=N])
|
||||||
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always) (--check-type[=N])
|
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always) (--check-type[=N])
|
||||||
j *parse Java Classes (j0 don't parse) (--parse-java[=N])
|
j *parse scripts (j0 don't parse) (--parse-java[=N])
|
||||||
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always) (--robots[=N])
|
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always) (--robots[=N])
|
||||||
%h force HTTP/1.0 requests (reduce update features, only for old servers or proxies) (--http-10)
|
%h force HTTP/1.0 requests (reduce update features, only for old servers or proxies) (--http-10)
|
||||||
%B tolerant requests (accept bogus responses on some servers, but not standard!) (--tolerant)
|
%B tolerant requests (accept bogus responses on some servers, but not standard!) (--tolerant)
|
||||||
@@ -417,7 +417,7 @@ site. Specifically, the defauls are:
|
|||||||
X *purge old files after update (X0 keep delete)
|
X *purge old files after update (X0 keep delete)
|
||||||
bN accept cookies in cookies.txt (0=do not accept,* 1=accept)
|
bN accept cookies in cookies.txt (0=do not accept,* 1=accept)
|
||||||
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always)
|
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always)
|
||||||
j *parse Java Classes (j0 don't parse)
|
j *parse scripts (j0 don't parse)
|
||||||
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always)
|
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always)
|
||||||
C create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before)
|
C create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before)
|
||||||
f *log file mode
|
f *log file mode
|
||||||
@@ -497,9 +497,9 @@ about your browser retaining them.
|
|||||||
<p align=justify> This causes different document types to be analyzed
|
<p align=justify> This causes different document types to be analyzed
|
||||||
differently.
|
differently.
|
||||||
|
|
||||||
<pre><b><i> j *parse Java Classes (j0 don't parse) </i></b></pre>
|
<pre><b><i> j *parse scripts (j0 don't parse) </i></b></pre>
|
||||||
|
|
||||||
<p align=justify> This causes Java class files to be parsed looking for
|
<p align=justify> This causes scripts to be parsed looking for
|
||||||
URLs.
|
URLs.
|
||||||
|
|
||||||
<pre><b><i> sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always) </i></b></pre>
|
<pre><b><i> sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always) </i></b></pre>
|
||||||
@@ -1178,7 +1178,7 @@ accepted and sent back in order to allow access.
|
|||||||
Spider options:
|
Spider options:
|
||||||
bN accept cookies in cookies.txt (0=do not accept,* 1=accept)
|
bN accept cookies in cookies.txt (0=do not accept,* 1=accept)
|
||||||
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always)
|
u check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always)
|
||||||
j *parse Java Classes (j0 don't parse)
|
j *parse scripts (j0 don't parse)
|
||||||
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always)
|
sN follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always)
|
||||||
%h force HTTP/1.0 requests (reduce update features, only for old servers or proxies)
|
%h force HTTP/1.0 requests (reduce update features, only for old servers or proxies)
|
||||||
%B tolerant requests (accept bogus responses on some servers, but not standard!)
|
%B tolerant requests (accept bogus responses on some servers, but not standard!)
|
||||||
@@ -2451,12 +2451,10 @@ work. We still are working to improve the mirror quality of HTTrack.
|
|||||||
|
|
||||||
<p align=justify><b>Q: Some Java applets do not work properly! </b>
|
<p align=justify><b>Q: Some Java applets do not work properly! </b>
|
||||||
|
|
||||||
<p align=justify> A: Java applets may not work in some cases, for
|
<p align=justify> A: Java applets may not work in some cases, because
|
||||||
example if HTTrack failed to detect all included classes or files called
|
HTTrack does not parse compiled class files to find the resources they
|
||||||
within the class file. Sometimes, Java applets need to be online,
|
load. Java applets often need to be online anyway, since remote files
|
||||||
because remote files are directly caught. Finally, the site structure
|
are fetched directly at runtime.
|
||||||
can be incompatible with the class (always try to keep the original site
|
|
||||||
structure when you want to get Java classes)
|
|
||||||
|
|
||||||
<p align=justify> If there is no way to make some classes work properly,
|
<p align=justify> If there is no way to make some classes work properly,
|
||||||
you can exclude them with the filters. They will be available, but only
|
you can exclude them with the filters. They will be available, but only
|
||||||
|
|||||||
@@ -764,9 +764,9 @@ check, * u1 check but /, u2 check always)
|
|||||||
<td width="78%">
|
<td width="78%">
|
||||||
|
|
||||||
|
|
||||||
<p>*parse Java Classes (j0 don t parse, bitmask: |1 parse
|
<p>*parse scripts (j0 don t parse, bitmask: |1 parse
|
||||||
default, |2 don t parse .class |4 don t parse .js |8 don t
|
default, |4 don t parse .js |8 don t be aggressive)
|
||||||
be aggressive) (--parse-java[=N])</p></td></tr>
|
(--parse-java[=N])</p></td></tr>
|
||||||
<tr valign="top" align="left">
|
<tr valign="top" align="left">
|
||||||
<td width="11%"></td>
|
<td width="11%"></td>
|
||||||
<td width="6%">
|
<td width="6%">
|
||||||
@@ -889,8 +889,8 @@ only) (--protocol[=N])</p></td></tr>
|
|||||||
<td width="78%">
|
<td width="78%">
|
||||||
|
|
||||||
|
|
||||||
<p>disable a specific external mime module (-%w htsswf -%w
|
<p>disable a specific external mime module (-%w
|
||||||
htsjava) (--disable-module <param>)</p></td></tr>
|
httrack-plugin) (--disable-module <param>)</p></td></tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<p style="margin-left:11%; margin-top: 1em"><b>Browser
|
<p style="margin-left:11%; margin-top: 1em"><b>Browser
|
||||||
@@ -2175,10 +2175,6 @@ Several scripts generating complex filenames may not find
|
|||||||
them (ex:
|
them (ex:
|
||||||
img.src=’image’+a+Mobj.dst+’.gif’)</small></p>
|
img.src=’image’+a+Mobj.dst+’.gif’)</small></p>
|
||||||
|
|
||||||
<p style="margin-left:11%; margin-top: 1em"><small>- Some
|
|
||||||
java classes may not find some files on them (class
|
|
||||||
included)</small></p>
|
|
||||||
|
|
||||||
<p style="margin-left:11%; margin-top: 1em"><small>-
|
<p style="margin-left:11%; margin-top: 1em"><small>-
|
||||||
Cgi-bin links may not work properly in some cases
|
Cgi-bin links may not work properly in some cases
|
||||||
(parameters needed). To avoid them: use filters like
|
(parameters needed). To avoid them: use filters like
|
||||||
|
|||||||
@@ -288,8 +288,8 @@ This option define whether the engine has to abandon a host if a timeout/"too sl
|
|||||||
&P extended parsing, attempt to parse all links (even in unknown tags or Javascript)
|
&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
|
This option activates the extended parsing, that attempt to find links in unknown Html code/javascript
|
||||||
|
|
||||||
j *parse Java Classes (j0 don't parse)
|
j *parse scripts (j0 don't parse)
|
||||||
This option define whether the engine has to parse java files or not to catch included files
|
This option defines whether the engine has to parse scripts or not to catch included files
|
||||||
|
|
||||||
I *make an index (I0 don't make)
|
I *make an index (I0 don't make)
|
||||||
This option define whether the engine has to generate an index.html on the top directory
|
This option define whether the engine has to generate an index.html on the top directory
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ Note: the <i>Initialization</i>, <i>Main functions</i>, <i>Options handling</i>
|
|||||||
<li>the <tt>htsdefines.h</tt> prototype file, which describes callback function prototypes</li>
|
<li>the <tt>htsdefines.h</tt> prototype file, which describes callback function prototypes</li>
|
||||||
<li>the <tt>htsopt.h</tt> prototype file, which describes the full httrackp* structure</li>
|
<li>the <tt>htsopt.h</tt> prototype file, which describes the full httrackp* structure</li>
|
||||||
<li>the <tt>callbacks-example*.c</tt> files given in the httrack archive</li>
|
<li>the <tt>callbacks-example*.c</tt> files given in the httrack archive</li>
|
||||||
<li>the <tt>htsjava.c</tt> source file (the java class plugin ; overrides 'detect' and 'parse')</li>
|
|
||||||
<li>the example given at the end of this document</li>
|
<li>the example given at the end of this document</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|||||||
@@ -118,8 +118,8 @@ h4 { margin: 0; font-weight: bold; font-size: 1.18em; }
|
|||||||
<br>Avoid "never", because the local mirror could be bogus
|
<br>Avoid "never", because the local mirror could be bogus
|
||||||
</small><br><br>
|
</small><br><br>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<li>Parse java files</li>
|
<li>Parse scripts</li>
|
||||||
<br><small>Must the engine parse .java files (java classes) to seek included filenames?
|
<br><small>Must the engine parse scripts to seek included filenames?
|
||||||
<br>It is checked by default
|
<br>It is checked by default
|
||||||
</small><br><br>
|
</small><br><br>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
|||||||
28
lang.def
28
lang.def
@@ -1006,3 +1006,31 @@ LANG_SERVEND
|
|||||||
Server terminated
|
Server terminated
|
||||||
LANG_FATALERR
|
LANG_FATALERR
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
LANG_PROXYTYPE
|
||||||
|
Proxy type:
|
||||||
|
LANG_PROXYTYPETIP
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
LANG_COOKIEFILE
|
||||||
|
Load cookies from file:
|
||||||
|
LANG_COOKIEFILETIP
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
LANG_PAUSEFILES
|
||||||
|
Pause between files:
|
||||||
|
LANG_PAUSEFILESTIP
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
LANG_KEEPWWW
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
LANG_KEEPWWWTIP
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
LANG_KEEPSLASHES
|
||||||
|
Keep double slashes in URLs
|
||||||
|
LANG_KEEPSLASHESTIP
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
LANG_KEEPQUERYORDER
|
||||||
|
Keep the original query-string order
|
||||||
|
LANG_KEEPQUERYORDERTIP
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
LANG_STRIPQUERY
|
||||||
|
Strip query keys:
|
||||||
|
LANG_STRIPQUERYTIP
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Ñúðâúðúò íå îòãîâàðÿ
|
Ñúðâúðúò íå îòãîâàðÿ
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Ôàòàëíà ãðåøêà ïðè ñúçäàâàíåòî íà òîçè îãëåäàëåí ñàéò
|
Ôàòàëíà ãðåøêà ïðè ñúçäàâàíåòî íà òîçè îãëåäàëåí ñàéò
|
||||||
|
Proxy type:
|
||||||
|
Òèï íà ïðîêñè:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Ïðîòîêîë íà ïðîêñè: HTTP èëè SOCKS5 (ñòàíäàðòíèÿò ïîðò íà SOCKS5 å 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Çàðåæäàíå íà 'áèñêâèòêè' îò ôàéë:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Ïðåäâàðèòåëíî çàðåæäàíå íà 'áèñêâèòêè' îò ôàéë Netscape cookies.txt ïðåäè îáõîæäàíåòî.
|
||||||
|
Pause between files:
|
||||||
|
Ïàóçà ìåæäó ôàéëîâåòå:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Ñëó÷àéíî çàáàâÿíå ìåæäó èçòåãëÿíèÿòà íà ôàéëîâå, â ñåêóíäè. Èçïîëçâàéòå MIN:MAX çà ñëó÷àåí äèàïàçîí (íàïðèìåð 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Çàïàçâàíå íà ïðåôèêñà www. (áåç ñëèâàíå íà www.host ñ host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host è host äà íå ñå òðåòèðàò êàòî åäèí è ñúù ñàéò.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Çàïàçâàíå íà äâîéíèòå íàêëîíåíè ÷åðòè â URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Áåç ïðåìàõâàíå íà ïîâòàðÿùèòå ñå íàêëîíåíè ÷åðòè â URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Çàïàçâàíå íà îðèãèíàëíèÿ ðåä íà ïàðàìåòðèòå â çàÿâêàòà
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Áåç ïðåíàðåæäàíå íà ïàðàìåòðèòå íà çàÿâêàòà ïðè ïðåìàõâàíå íà äóáëèðàíè URL.
|
||||||
|
Strip query keys:
|
||||||
|
Ïðåìàõâàíå íà êëþ÷îâå îò çàÿâêàòà:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Êëþ÷îâå îò çàÿâêàòà, ðàçäåëåíè ñúñ çàïåòàÿ, êîèòî äà ñå ïðåìàõíàò îò èìåòî íà çàïèñàíèÿ ôàéë (íàïðèìåð sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Servidor desconectado
|
Servidor desconectado
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Ha ocurrido un error fatal durante esta copia
|
Ha ocurrido un error fatal durante esta copia
|
||||||
|
Proxy type:
|
||||||
|
Tipo de proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocolo del proxy: HTTP o SOCKS5 (el puerto SOCKS5 predeterminado es 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Cargar cookies desde un archivo:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Precargar cookies desde un archivo Netscape cookies.txt antes de comenzar la descarga.
|
||||||
|
Pause between files:
|
||||||
|
Pausa entre archivos:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Retardo aleatorio entre descargas de archivos, en segundos. Use MIN:MAX para un rango aleatorio (p. ej. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Mantener el prefijo www. (no combinar www.host con host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
No tratar www.host y host como el mismo sitio.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Mantener las barras dobles en las URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
No colapsar las barras duplicadas en las URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Mantener el orden original de la query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
No reordenar los parámetros de la query string al deduplicar las URL.
|
||||||
|
Strip query keys:
|
||||||
|
Eliminar claves de query string:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Claves de query string, separadas por comas, que se eliminarán del nombre de los archivos guardados (p. ej. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Typ proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protokol proxy: HTTP nebo SOCKS5 (výchozí port SOCKS5 je 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Naèíst cookies ze souboru:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Naèíst cookies ze souboru Netscape cookies.txt pøed zahájením stahování.
|
||||||
|
Pause between files:
|
||||||
|
Prodleva mezi soubory:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Náhodná prodleva mezi stahováním souborù, v sekundách. Pro náhodný rozsah použijte MIN:MAX (napø. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Zachovat pøedponu www. (nesluèovat www.host s host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Nepovažovat www.host a host za stejný web.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Zachovat dvojitá lomítka v URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Nesluèovat opakovaná lomítka v URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Zachovat pùvodní poøadí øetìzce dotazu
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Nemìnit poøadí parametrù øetìzce dotazu pøi odstraòování duplicitních URL.
|
||||||
|
Strip query keys:
|
||||||
|
Odebrat klíèe dotazu:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Klíèe dotazu oddìlené èárkami, které se vynechají z pojmenování ukládaných souborù (napø. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
伺服器已終止
|
伺服器已終止
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
這鏡像發生了不可回復的錯誤
|
這鏡像發生了不可回復的錯誤
|
||||||
|
Proxy type:
|
||||||
|
proxy 類型:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
proxy 協定: HTTP 或 SOCKS5 (SOCKS5 的預設連接埠為 1080)。
|
||||||
|
Load cookies from file:
|
||||||
|
從檔案載入 cookies:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
在抓取前從 Netscape 格式的 cookies.txt 檔案預先載入 cookies。
|
||||||
|
Pause between files:
|
||||||
|
檔案之間暫停:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
檔案下載之間的隨機延遲(秒)。使用 MIN:MAX 指定隨機範圍 (例如 2:8)。
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
保留 www. 前綴 (不將 www.host 與 host 合併)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
不將 www.host 與 host 視為同一站點。
|
||||||
|
Keep double slashes in URLs
|
||||||
|
保留 URL 中的雙斜線
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
不合併 URL 中重複的斜線。
|
||||||
|
Keep the original query-string order
|
||||||
|
保留查詢字串的原始順序
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
在對 URL 去重時不重新排列查詢字串參數。
|
||||||
|
Strip query keys:
|
||||||
|
移除查詢鍵:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
以逗號分隔的查詢鍵,將其從儲存檔案的命名中移除 (例如 sid,utm_source)。
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
代理类型:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
代理协议: HTTP 或 SOCKS5 (SOCKS5 的默认端口为 1080)。
|
||||||
|
Load cookies from file:
|
||||||
|
从文件加载 cookies:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
在抓取前从 Netscape 格式的 cookies.txt 文件预加载 cookies。
|
||||||
|
Pause between files:
|
||||||
|
文件间暂停:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
文件下载之间的随机延迟(秒)。使用 MIN:MAX 指定随机范围 (例如 2:8)。
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
保留 www. 前缀 (不将 www.host 与 host 合并)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
不把 www.host 和 host 视为同一站点。
|
||||||
|
Keep double slashes in URLs
|
||||||
|
保留 URL 中的双斜杠
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
不合并 URL 中重复的斜杠。
|
||||||
|
Keep the original query-string order
|
||||||
|
保留查询字符串的原始顺序
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
在对 URL 去重时不重新排列查询字符串参数。
|
||||||
|
Strip query keys:
|
||||||
|
剥离查询键:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
用逗号分隔的查询键,将其从保存文件的命名中删除 (例如 sid,utm_source)。
|
||||||
|
|||||||
@@ -930,3 +930,31 @@ Server terminated
|
|||||||
Poslužitelj je razriješen
|
Poslužitelj je razriješen
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Tijekom ovog zrcaljenja je nastala fatalna pogreška
|
Tijekom ovog zrcaljenja je nastala fatalna pogreška
|
||||||
|
Proxy type:
|
||||||
|
Vrsta posrednika:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protokol posrednika: HTTP ili SOCKS5 (zadani port za SOCKS5 je 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Uèitati kolaèiæe iz datoteke:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Prije zrcaljenja uèitati kolaèiæe iz datoteke Netscape cookies.txt.
|
||||||
|
Pause between files:
|
||||||
|
Stanka izmeðu datoteka:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Nasumièna odgoda izmeðu preuzimanja datoteka, u sekundama. Za nasumièni raspon koristiti MIN:MAX (npr. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Zadr¾ati www. predmetak (ne spajati www.host s host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host i host ne smatrati istim web-mjestom.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Zadr¾ati dvostruke kose crte u URL-ovima
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Ne sa¾imati ponovljene kose crte u URL-ovima.
|
||||||
|
Keep the original query-string order
|
||||||
|
Zadr¾ati izvorni redoslijed teksta za upite
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Ne mijenjati redoslijed parametara teksta za upite pri uklanjanju dvostrukih URL-ova.
|
||||||
|
Strip query keys:
|
||||||
|
Ukloniti kljuèeve upita:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Zarezom odvojeni kljuèevi upita koji se izostavljaju iz naziva spremljenih datoteka (npr. sid,utm_source).
|
||||||
|
|||||||
@@ -976,3 +976,31 @@ Click on this notification to restart the interrupted mirror
|
|||||||
Klik på denne notifikation for at genstarte den afbrudte spejlkopiering
|
Klik på denne notifikation for at genstarte den afbrudte spejlkopiering
|
||||||
HTTrack: could not save profile for '%s'!
|
HTTrack: could not save profile for '%s'!
|
||||||
HTTrack: kunne ikke gemme profil for '%s'!
|
HTTrack: kunne ikke gemme profil for '%s'!
|
||||||
|
Proxy type:
|
||||||
|
Proxytype:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxyprotokol: HTTP eller SOCKS5 (SOCKS5 bruger som standard port 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Indlæs cookies fra fil:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Indlæs cookies fra en Netscape cookies.txt-fil, før crawlingen starter.
|
||||||
|
Pause between files:
|
||||||
|
Pause mellem filer:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Tilfældig forsinkelse mellem filoverførsler, i sekunder. Brug MIN:MAX for et tilfældigt interval (f.eks. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Behold www.-præfikset (sammenlæg ikke www.host med host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Behandl ikke www.host og host som det samme websted.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Behold dobbelte skråstreger i URL'er
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Sammenfold ikke gentagne skråstreger i URL'er.
|
||||||
|
Keep the original query-string order
|
||||||
|
Behold den oprindelige rækkefølge i forespørgselsstrengen
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Omorden ikke forespørgselsstrengens parametre, når dublerede URL'er fjernes.
|
||||||
|
Strip query keys:
|
||||||
|
Fjern forespørgselsnøgler:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kommaseparerede forespørgselsnøgler, der udelades i navngivningen af gemte filer (f.eks. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Der Server wurde beendet
|
Der Server wurde beendet
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Fataler Fehler während der Webseiten-Kopie
|
Fataler Fehler während der Webseiten-Kopie
|
||||||
|
Proxy type:
|
||||||
|
Proxy-Typ:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxy-Protokoll: HTTP oder SOCKS5 (Standardport von SOCKS5 ist 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Cookies aus Datei laden:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Cookies aus einer Netscape-cookies.txt-Datei laden, bevor das Crawlen beginnt.
|
||||||
|
Pause between files:
|
||||||
|
Pause zwischen Dateien:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Zufällige Verzögerung zwischen Datei-Downloads, in Sekunden. MIN:MAX für einen Zufallsbereich verwenden (z. B. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
www.-Präfix beibehalten (www.host nicht mit host zusammenführen)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host und host nicht als dieselbe Website behandeln.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Doppelte Schrägstriche in URLs beibehalten
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Doppelte Schrägstriche in URLs nicht zusammenführen.
|
||||||
|
Keep the original query-string order
|
||||||
|
Ursprüngliche Reihenfolge des Query-Strings beibehalten
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Query-String-Parameter beim Entfernen doppelter URLs nicht neu anordnen.
|
||||||
|
Strip query keys:
|
||||||
|
Query-Schlüssel entfernen:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kommagetrennte Query-Schlüssel, die bei der Benennung gespeicherter Dateien entfallen (z. B. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Proxy tüüp:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxy protokoll: HTTP või SOCKS5 (SOCKS5 vaikeport on 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Lae küpsised failist:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Lae küpsised eelnevalt Netscape cookies.txt failist enne kopeerimist.
|
||||||
|
Pause between files:
|
||||||
|
Paus failide vahel:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Juhuslik viivitus failide allalaadimiste vahel, sekundites. Juhusliku vahemiku jaoks kasuta MIN:MAX (nt 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Säilita www. eesliide (ära ühenda www.host ja host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Ära käsitle www.host ja host sama saidina.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Säilita topeltkaldkriipsud URL-ides
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Ära ühenda korduvaid kaldkriipse URL-ides.
|
||||||
|
Keep the original query-string order
|
||||||
|
Säilita päringustringi algne järjekord
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Ära järjesta päringustringi parameetreid ümber URL-ide korduste eemaldamisel.
|
||||||
|
Strip query keys:
|
||||||
|
Eemalda päringuvõtmed:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Komadega eraldatud päringuvõtmed, mis jäetakse salvestatud faili nimest välja (nt sid,utm_source).
|
||||||
|
|||||||
@@ -976,3 +976,31 @@ Click on this notification to restart the interrupted mirror
|
|||||||
Click on this notification to restart the interrupted mirror
|
Click on this notification to restart the interrupted mirror
|
||||||
HTTrack: could not save profile for '%s'!
|
HTTrack: could not save profile for '%s'!
|
||||||
HTTrack: could not save profile for '%s'!
|
HTTrack: could not save profile for '%s'!
|
||||||
|
Proxy type:
|
||||||
|
Proxy type:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Load cookies from file:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Pause between files:
|
||||||
|
Pause between files:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Keep the original query-string order
|
||||||
|
Keep the original query-string order
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Strip query keys:
|
||||||
|
Strip query keys:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
|||||||
@@ -931,3 +931,31 @@ Palvelin lopetettu
|
|||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Tällä peilillä tapahtui vakava virhe
|
Tällä peilillä tapahtui vakava virhe
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Välityspalvelimen tyyppi:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Välityspalvelimen protokolla: HTTP tai SOCKS5 (SOCKS5:n oletusportti on 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Lataa evästeet tiedostosta:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Lataa evästeet Netscape cookies.txt -tiedostosta ennen sivuston läpikäyntiä.
|
||||||
|
Pause between files:
|
||||||
|
Tauko tiedostojen välillä:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Satunnainen viive tiedostolatausten välillä, sekunteina. Käytä muotoa MIN:MAX satunnaista väliä varten (esim. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Säilytä www.-etuliite (älä yhdistä www.host- ja host-osoitteita)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Älä käsittele www.host- ja host-osoitteita samana sivustona.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Säilytä kaksoiskenoviivat URL-osoitteissa
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Älä yhdistä toistuvia kenoviivoja URL-osoitteissa.
|
||||||
|
Keep the original query-string order
|
||||||
|
Säilytä kyselymerkkijonon alkuperäinen järjestys
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Älä järjestä kyselymerkkijonon parametreja uudelleen, kun URL-osoitteiden kaksoiskappaleet poistetaan.
|
||||||
|
Strip query keys:
|
||||||
|
Poista kyselyavaimet:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Pilkuin erotellut kyselyavaimet, jotka jätetään pois tallennettujen tiedostojen nimeämisestä (esim. sid,utm_source).
|
||||||
|
|||||||
@@ -976,3 +976,31 @@ Build a mail archive
|
|||||||
Construire une archive mail
|
Construire une archive mail
|
||||||
Default referer URL
|
Default referer URL
|
||||||
Champ referer par défaut
|
Champ referer par défaut
|
||||||
|
Proxy type:
|
||||||
|
Type de proxy :
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocole du proxy : HTTP ou SOCKS5 (le port SOCKS5 par défaut est 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Charger les cookies depuis un fichier :
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Précharger les cookies depuis un fichier Netscape cookies.txt avant la copie du site.
|
||||||
|
Pause between files:
|
||||||
|
Pause entre les fichiers :
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Délai aléatoire entre les téléchargements de fichiers, en secondes. Utilisez MIN:MAX pour une plage aléatoire (par ex. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Conserver le préfixe www. (ne pas fusionner www.host avec host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Ne pas traiter www.host et host comme le même site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Conserver les doubles barres obliques dans les URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Ne pas réduire les barres obliques en double dans les URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Conserver l'ordre d'origine de la query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Ne pas réordonner les paramètres de la query string lors de la déduplication des URL.
|
||||||
|
Strip query keys:
|
||||||
|
Supprimer les clés de query string :
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Clés de query string à retirer du nommage des fichiers enregistrés, séparées par des virgules (par ex. sid,utm_source).
|
||||||
|
|||||||
@@ -930,3 +930,31 @@ Server terminated
|
|||||||
Ακυρώθηκε από τον εξυπηρετητή
|
Ακυρώθηκε από τον εξυπηρετητή
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Ένα καταστροφικό σφάλμα προκλήθηκε κατά την αντιγραφή αυτού του τόπου
|
Ένα καταστροφικό σφάλμα προκλήθηκε κατά την αντιγραφή αυτού του τόπου
|
||||||
|
Proxy type:
|
||||||
|
Τύπος proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Πρωτόκολλο proxy: HTTP ή SOCKS5 (η προεπιλεγμένη θύρα του SOCKS5 είναι 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Φόρτωση cookies από αρχείο:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Προφόρτωση των cookies από ένα αρχείο Netscape cookies.txt πριν την ανίχνευση.
|
||||||
|
Pause between files:
|
||||||
|
Παύση μεταξύ αρχείων:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Τυχαία καθυστέρηση μεταξύ των λήψεων αρχείων, σε δευτερόλεπτα. Χρησιμοποιήστε MIN:MAX για τυχαίο εύρος (π.χ. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Διατήρηση του προθέματος www. (χωρίς συγχώνευση του www.host με το host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Να μην θεωρούνται τα www.host και host ως ο ίδιος ιστότοπος.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Διατήρηση των διπλών καθέτων στα URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Να μην συμπτύσσονται οι διπλές κάθετοι στα URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Διατήρηση της αρχικής σειράς του ερωτήματος αναζήτησης
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Να μην αναδιατάσσονται οι παράμετροι του ερωτήματος αναζήτησης κατά την αφαίρεση διπλότυπων URL.
|
||||||
|
Strip query keys:
|
||||||
|
Αφαίρεση κλειδιών ερωτήματος:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Κλειδιά ερωτήματος χωρισμένα με κόμμα, που θα αφαιρεθούν από την ονομασία των αποθηκευμένων αρχείων (π.χ. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Server disconnesso
|
Server disconnesso
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Si è verificato un errore fatale durante la copia
|
Si è verificato un errore fatale durante la copia
|
||||||
|
Proxy type:
|
||||||
|
Tipo di proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocollo del proxy: HTTP o SOCKS5 (la porta SOCKS5 predefinita è 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Carica i cookie da un file:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Precarica i cookie da un file Netscape cookies.txt prima della copia.
|
||||||
|
Pause between files:
|
||||||
|
Pausa tra i file:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Ritardo casuale tra i download dei file, in secondi. Usa MIN:MAX per un intervallo casuale (ad es. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Mantieni il prefisso www. (non unire www.host con host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Non trattare www.host e host come lo stesso sito.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Mantieni le doppie barre negli URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Non ridurre le barre duplicate negli URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Mantieni l'ordine originale della query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Non riordinare i parametri della query string durante la deduplicazione degli URL.
|
||||||
|
Strip query keys:
|
||||||
|
Rimuovi chiavi della query string:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Chiavi della query string, separate da virgole, da rimuovere dai nomi dei file salvati (ad es. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
プロキシの種類:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
プロキシのプロトコル: HTTP または SOCKS5 (SOCKS5 の既定ポートは 1080)。
|
||||||
|
Load cookies from file:
|
||||||
|
クッキーをファイルから読み込む:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
クロールを開始する前に Netscape の cookies.txt ファイルからクッキーを読み込みます。
|
||||||
|
Pause between files:
|
||||||
|
ファイル間の待機:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
ファイルのダウンロード間のランダムな遅延(秒)。範囲を指定するには MIN:MAX を使用します (例: 2:8)。
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
www. プレフィックスを保持する (www.host と host を統合しない)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host と host を同じサイトとして扱いません。
|
||||||
|
Keep double slashes in URLs
|
||||||
|
URL 内の二重スラッシュを保持する
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
URL 内の連続したスラッシュをまとめません。
|
||||||
|
Keep the original query-string order
|
||||||
|
クエリ文字列の元の順序を保持する
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
URL の重複排除時にクエリ文字列のパラメータを並べ替えません。
|
||||||
|
Strip query keys:
|
||||||
|
削除するクエリキー:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
保存ファイル名の生成から除外するクエリキーをカンマ区切りで指定します (例: sid,utm_source)。
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Ñåðâåðîò å ïðåêèíàò
|
Ñåðâåðîò å ïðåêèíàò
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Íàñòàíà ôàòàëíà ãðåøêà ïðè îâî¼ mirror
|
Íàñòàíà ôàòàëíà ãðåøêà ïðè îâî¼ mirror
|
||||||
|
Proxy type:
|
||||||
|
ÂØß ÝÐ ßàÞÚáØ:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
¿àÞâÞÚÞÛ ÝÐ ßàÞÚáØ: HTTP ØÛØ SOCKS5 (áâÐÝÔÐàÔÝÐâÐ ßÞàâÐ ÝÐ SOCKS5 Õ 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
²çØâÐø ÚÞÛÐçØúÐ ÞÔ ÔÐâÞâÕÚÐ:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
¾ÔÝÐßàÕÔ ÒçØâÐø ÚÞÛÐçØúÐ ÞÔ ÔÐâÞâÕÚÐ Netscape cookies.txt ßàÕÔ ßàÕ×ÕÜÐúÕâÞ.
|
||||||
|
Pause between files:
|
||||||
|
¿Ðã×Ð ÜÕóã ÔÐâÞâÕÚØ:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
ÁÛãçÐøÝÞ ÔÞæÝÕúÕ ÜÕóã ßàÕ×ÕÜÐúÐâÐ ÝÐ ÔÐâÞâÕÚØ, ÒÞ áÕÚãÝÔØ. ºÞàØáâØ MIN:MAX ×Ð áÛãçÐÕÝ ÞßáÕÓ (ÝÐ ßàØÜÕà 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
·ÐÔàÖØ ÓÞ ßàÕäØÚáÞâ www. (ÝÕ áßÞøãÒÐø www.host áÞ host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
½Õ âàÕâØàÐø ÓØ www.host Ø host ÚÐÚÞ Øáâ áÐøâ.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
·ÐÔàÖØ ÓØ ÔÒÞøÝØâÕ ÚÞáØ æàâØ ÒÞ URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
½Õ ÞâáâàÐÝãÒÐø ÓØ ßÞÒâÞàÕÝØâÕ ÚÞáØ æàâØ ÒÞ URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
·ÐÔàÖØ ÓÞ Ø×ÒÞàÝØÞâ àÕÔÞáÛÕÔ ÝÐ ßÐàÐÜÕâàØâÕ ÒÞ ÑÐàÐúÕâÞ
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
½Õ ÜÕÝãÒÐø ÓÞ àÕÔÞáÛÕÔÞâ ÝÐ ßÐàÐÜÕâàØâÕ ÝÐ ÑÐàÐúÕâÞ ßàØ ÞâáâàÐÝãÒÐúÕ ÔãßÛØÚÐâØ URL.
|
||||||
|
Strip query keys:
|
||||||
|
¾âáâàÐÝØ ÚÛãçÕÒØ ÞÔ ÑÐàÐúÕâÞ:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
ºÛãçÕÒØ ÞÔ ÑÐàÐúÕâÞ, ÞÔÔÕÛÕÝØ áÞ ×ÐߨàÚÐ, èâÞ áÕ ÞâáâàÐÝãÒÐÐâ ÞÔ ØÜÕâÞ ÝÐ ×ÐçãÒÐÝÐâÐ ÔÐâÞâÕÚÐ (ÝÐ ßàØÜÕà sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
A kiszolgáló befejezte a kapcsolatot
|
A kiszolgáló befejezte a kapcsolatot
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Végzetes hiba történt a tükrözés közben
|
Végzetes hiba történt a tükrözés közben
|
||||||
|
Proxy type:
|
||||||
|
Proxy típusa:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxy protokoll: HTTP vagy SOCKS5 (a SOCKS5 alapértelmezett portja 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Sütik betöltése fájlból:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Sütik elõzetes betöltése egy Netscape cookies.txt fájlból a tükrözés elõtt.
|
||||||
|
Pause between files:
|
||||||
|
Szünet a fájlok között:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Véletlenszerû késleltetés a fájlletöltések között, másodpercben. Véletlen tartományhoz használja a MIN:MAX formát (pl. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
A www. elõtag megtartása (ne vonja össze a www.host és a host címet)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Ne kezelje a www.host és a host címet ugyanazon webhelyként.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Dupla perjelek megtartása az URL-ekben
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Ne vonja össze az ismétlõdõ perjeleket az URL-ekben.
|
||||||
|
Keep the original query-string order
|
||||||
|
Az eredeti lekérdezési szöveg sorrendjének megtartása
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Ne rendezze át a lekérdezési szöveg paramétereit az ismétlõdõ URL-ek kiszûrésekor.
|
||||||
|
Strip query keys:
|
||||||
|
Lekérdezési kulcsok eltávolítása:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Vesszõvel elválasztott lekérdezési kulcsok, amelyeket el kell hagyni a mentett fájl elnevezésébõl (pl. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Server beeindigd
|
Server beeindigd
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Een fatale fout is opgetreden tijdens deze spiegeling
|
Een fatale fout is opgetreden tijdens deze spiegeling
|
||||||
|
Proxy type:
|
||||||
|
Proxytype:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxyprotocol: HTTP of SOCKS5 (standaardpoort van SOCKS5 is 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Cookies uit bestand laden:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Cookies vooraf laden uit een Netscape cookies.txt-bestand voordat het crawlen begint.
|
||||||
|
Pause between files:
|
||||||
|
Pauze tussen bestanden:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Willekeurige vertraging tussen bestandsdownloads, in seconden. Gebruik MIN:MAX voor een willekeurig bereik (bijv. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
www.-voorvoegsel behouden (www.host niet samenvoegen met host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Behandel www.host en host niet als dezelfde site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Dubbele schuine strepen in URL's behouden
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Dubbele schuine strepen in URL's niet samenvoegen.
|
||||||
|
Keep the original query-string order
|
||||||
|
Oorspronkelijke volgorde van de query string behouden
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Query string-parameters niet herordenen bij het ontdubbelen van URL's.
|
||||||
|
Strip query keys:
|
||||||
|
Query-sleutels verwijderen:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Door komma's gescheiden query-sleutels die bij het benoemen van opgeslagen bestanden worden weggelaten (bijv. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Proxytype:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxyprotokoll: HTTP eller SOCKS5 (SOCKS5 bruker som standard port 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Last inn cookies fra fil:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Last inn cookies fra en Netscape cookies.txt-fil før crawlingen starter.
|
||||||
|
Pause between files:
|
||||||
|
Pause mellom filer:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Tilfeldig forsinkelse mellom filnedlastinger, i sekunder. Bruk MIN:MAX for et tilfeldig intervall (f.eks. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Behold www.-prefikset (slå ikke sammen www.host med host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Behandle ikke www.host og host som samme nettsted.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Behold doble skråstreker i URL-er
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Slå ikke sammen gjentatte skråstreker i URL-er.
|
||||||
|
Keep the original query-string order
|
||||||
|
Behold den opprinnelige rekkefølgen i spørrestrengen
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Endre ikke rekkefølgen på spørrestrengens parametere når dupliserte URL-er fjernes.
|
||||||
|
Strip query keys:
|
||||||
|
Fjern spørrenøkler:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kommaseparerte spørrenøkler som utelates i navngivingen av lagrede filer (f.eks. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Serwer zakonczyl prace
|
Serwer zakonczyl prace
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Podczas tworzenia lustra wydarzyl sie fatalny blad.
|
Podczas tworzenia lustra wydarzyl sie fatalny blad.
|
||||||
|
Proxy type:
|
||||||
|
Typ proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protokó³ proxy: HTTP lub SOCKS5 (domy¶lny port SOCKS5 to 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Wczytaj ciasteczka z pliku:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Wczytaj ciasteczka z pliku Netscape cookies.txt przed rozpoczêciem pobierania.
|
||||||
|
Pause between files:
|
||||||
|
Pauza miêdzy plikami:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Losowe opó¼nienie miêdzy pobieraniem plików, w sekundach. U¿yj MIN:MAX dla losowego zakresu (np. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Zachowaj przedrostek www. (nie ³±cz www.host z host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Nie traktuj www.host i host jako tej samej witryny.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Zachowaj podwójne uko¶niki w adresach URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Nie scalaj powtórzonych uko¶ników w adresach URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Zachowaj oryginaln± kolejno¶æ ci±gu zapytania
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Nie zmieniaj kolejno¶ci parametrów zapytania podczas usuwania duplikatów adresów URL.
|
||||||
|
Strip query keys:
|
||||||
|
Usuñ klucze zapytania:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Rozdzielone przecinkami klucze zapytania pomijane przy nazywaniu zapisanych plików (np. sid,utm_source).
|
||||||
|
|||||||
@@ -976,3 +976,31 @@ Click on this notification to restart the interrupted mirror
|
|||||||
Clique nesta notificação para reiniciar o espelho interrompido
|
Clique nesta notificação para reiniciar o espelho interrompido
|
||||||
HTTrack: could not save profile for '%s'!
|
HTTrack: could not save profile for '%s'!
|
||||||
HTTrack: não foi possível salvar o perfil para '%s'!
|
HTTrack: não foi possível salvar o perfil para '%s'!
|
||||||
|
Proxy type:
|
||||||
|
Tipo de proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocolo do proxy: HTTP ou SOCKS5 (a porta SOCKS5 padrão é 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Carregar cookies de um arquivo:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Pré-carregar cookies de um arquivo Netscape cookies.txt antes de iniciar a cópia.
|
||||||
|
Pause between files:
|
||||||
|
Pausa entre arquivos:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Atraso aleatório entre downloads de arquivos, em segundos. Use MIN:MAX para um intervalo aleatório (ex.: 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Manter o prefixo www. (não mesclar www.host com host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Não tratar www.host e host como o mesmo site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Manter as barras duplas nas URLs
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Não reduzir as barras duplicadas nas URLs.
|
||||||
|
Keep the original query-string order
|
||||||
|
Manter a ordem original da query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Não reordenar os parâmetros da query string ao remover URLs duplicadas.
|
||||||
|
Strip query keys:
|
||||||
|
Remover chaves da query string:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Chaves da query string, separadas por vírgulas, a serem removidas da nomeação dos arquivos salvos (ex.: sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Tipo de proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocolo do proxy: HTTP ou SOCKS5 (a porta SOCKS5 predefinida é 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Carregar cookies de um ficheiro:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Pré-carregar cookies de um ficheiro Netscape cookies.txt antes de iniciar a cópia.
|
||||||
|
Pause between files:
|
||||||
|
Pausa entre ficheiros:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Atraso aleatório entre transferências de ficheiros, em segundos. Utilize MIN:MAX para um intervalo aleatório (por ex. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Manter o prefixo www. (não combinar www.host com host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Não tratar www.host e host como o mesmo site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Manter as barras duplas nos URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Não reduzir as barras duplicadas nos URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Manter a ordem original da query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Não reordenar os parâmetros da query string ao eliminar URL duplicados.
|
||||||
|
Strip query keys:
|
||||||
|
Remover chaves da query string:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Chaves da query string, separadas por vírgulas, a remover da nomeação dos ficheiros guardados (por ex. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Server terminat
|
Server terminat
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
A survenit o eroare fatală în timpul acestei clonări.
|
A survenit o eroare fatală în timpul acestei clonări.
|
||||||
|
Proxy type:
|
||||||
|
Tip proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protocol proxy: HTTP sau SOCKS5 (portul SOCKS5 implicit este 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Încarca cookies dintr-un fisier:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Preîncarca cookies dintr-un fisier Netscape cookies.txt înainte de copiere.
|
||||||
|
Pause between files:
|
||||||
|
Pauza între fisiere:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Întârziere aleatoare între descarcari de fisiere, în secunde. Folositi MIN:MAX pentru un interval aleatoriu (de ex. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Pastreaza prefixul www. (nu combina www.host cu host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Nu trata www.host si host ca fiind acelasi site.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Pastreaza barele duble din URL-uri
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Nu comprima barele duplicate din URL-uri.
|
||||||
|
Keep the original query-string order
|
||||||
|
Pastreaza ordinea originala din query string
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Nu reordona parametrii din query string la eliminarea URL-urilor duplicate.
|
||||||
|
Strip query keys:
|
||||||
|
Elimina cheile din query string:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Chei din query string, separate prin virgula, de eliminat din denumirea fisierelor salvate (de ex. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Server terminated
|
Server terminated
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Âî âðåìÿ òåêóùåé çàêà÷êè ïðîèçîøëà ôàòàëüíàÿ îøèáêà
|
Âî âðåìÿ òåêóùåé çàêà÷êè ïðîèçîøëà ôàòàëüíàÿ îøèáêà
|
||||||
|
Proxy type:
|
||||||
|
Òèï ïðîêñè:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Ïðîòîêîë ïðîêñè: HTTP èëè SOCKS5 (ïî óìîë÷àíèþ SOCKS5 èñïîëüçóåò ïîðò 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Çàãðóçèòü cookies èç ôàéëà:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Ïðåäâàðèòåëüíî çàãðóçèòü cookies èç ôàéëà Netscape cookies.txt ïåðåä çàêà÷êîé.
|
||||||
|
Pause between files:
|
||||||
|
Ïàóçà ìåæäó ôàéëàìè:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Ñëó÷àéíàÿ çàäåðæêà ìåæäó çàêà÷êàìè ôàéëîâ, â ñåêóíäàõ. Èñïîëüçóéòå MIN:MAX äëÿ ñëó÷àéíîãî äèàïàçîíà (íàïðèìåð, 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Ñîõðàíÿòü ïðåôèêñ www. (íå îáúåäèíÿòü www.host ñ host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Íå ñ÷èòàòü www.host è host îäíèì è òåì æå ñàéòîì.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Ñîõðàíÿòü äâîéíûå ñëýøè â URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Íå óäàëÿòü ïîâòîðÿþùèåñÿ ñëýøè â URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Ñîõðàíÿòü èñõîäíûé ïîðÿäîê ïàðàìåòðîâ çàïðîñà
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Íå ìåíÿòü ïîðÿäîê ïàðàìåòðîâ ñòðîêè çàïðîñà ïðè óäàëåíèè äóáëèêàòîâ URL.
|
||||||
|
Strip query keys:
|
||||||
|
Óäàëÿòü êëþ÷è çàïðîñà:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Êëþ÷è çàïðîñà ÷åðåç çàïÿòóþ, óäàëÿåìûå èç èìåíè ñîõðàíÿåìîãî ôàéëà (íàïðèìåð, sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Typ proxy:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protokol proxy: HTTP alebo SOCKS5 (predvolený port SOCKS5 je 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Naèíta» cookies zo súboru:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Naèíta» cookies zo súboru Netscape cookies.txt pred zaèatím s»ahovania.
|
||||||
|
Pause between files:
|
||||||
|
Prestávka medzi súbormi:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Náhodné oneskorenie medzi s»ahovaním súborov, v sekundách. Pre náhodný rozsah pou¾ite MIN:MAX (napr. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Zachova» predponu www. (nezluèova» www.host s host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Nepova¾ova» www.host a host za tú istú lokalitu.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Zachova» dvojité lomky v URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Nezluèova» opakované lomky v URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Zachova» pôvodné poradie re»azca dotazu
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Nemeni» poradie parametrov re»azca dotazu pri odstraòovaní duplicitných URL.
|
||||||
|
Strip query keys:
|
||||||
|
Odstráni» kµúèe dotazu:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kµúèe dotazu oddelené èiarkami, ktoré sa vynechajú z pomenovania ukladaných súborov (napr. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Vrsta proxyja:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Protokol proxy: HTTP ali SOCKS5 (privzeta vrata SOCKS5 so 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Nalozi piskotke iz datoteke:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Predhodno nalozi piskotke iz datoteke Netscape cookies.txt pred zajemanjem.
|
||||||
|
Pause between files:
|
||||||
|
Premor med datotekami:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Nakljucni zamik med prenosi datotek, v sekundah. Za nakljucni obseg uporabite MIN:MAX (npr. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Ohrani predpono www. (ne zdruzi www.host z host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host in host ne obravnavaj kot isto spletno mesto.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Ohrani dvojne posevnice v URL-jih
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Ne zdruzuj podvojenih posevnic v URL-jih.
|
||||||
|
Keep the original query-string order
|
||||||
|
Ohrani izvirni vrstni red poizvedovalnega niza
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Pri odstranjevanju podvojenih URL-jev ne spreminjaj vrstnega reda parametrov poizvedbe.
|
||||||
|
Strip query keys:
|
||||||
|
Odstrani kljuce poizvedbe:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Z vejicami loceni kljuci poizvedbe, ki se izpustijo pri poimenovanju shranjenih datotek (npr. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Proxytyp:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxyprotokoll: HTTP eller SOCKS5 (SOCKS5 använder som standard port 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Läs in cookies från fil:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Läs in cookies från en Netscape cookies.txt-fil innan crawlningen börjar.
|
||||||
|
Pause between files:
|
||||||
|
Paus mellan filer:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Slumpmässig fördröjning mellan filnedladdningar, i sekunder. Använd MIN:MAX för ett slumpmässigt intervall (t.ex. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Behåll www.-prefixet (slå inte ihop www.host med host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Behandla inte www.host och host som samma webbplats.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Behåll dubbla snedstreck i URL:er
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Slå inte ihop upprepade snedstreck i URL:er.
|
||||||
|
Keep the original query-string order
|
||||||
|
Behåll frågesträngens ursprungliga ordning
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Ändra inte ordningen på frågesträngens parametrar när dubbletter av URL:er tas bort.
|
||||||
|
Strip query keys:
|
||||||
|
Ta bort frågenycklar:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kommaseparerade frågenycklar som utelämnas vid namngivningen av sparade filer (t.ex. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Sunucu sonlandýrdý
|
Sunucu sonlandýrdý
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Bu yansýlama iþlemi sýrasýnda ölümcül bir hata oluþtu
|
Bu yansýlama iþlemi sýrasýnda ölümcül bir hata oluþtu
|
||||||
|
Proxy type:
|
||||||
|
Proxy türü:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proxy protokolü: HTTP veya SOCKS5 (SOCKS5 varsayýlan portu 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Çerezleri dosyadan yükle:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Taramadan önce bir Netscape cookies.txt dosyasýndan çerezleri önceden yükle.
|
||||||
|
Pause between files:
|
||||||
|
Dosyalar arasýnda bekleme:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Dosya indirmeleri arasýnda saniye cinsinden rastgele gecikme. Rastgele bir aralýk için MIN:MAX kullanýn (örn. 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
www. önekini koru (www.host ile host'u birleþtirme)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host ve host'u ayný site olarak deðerlendirme.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
URL'lerdeki çift eðik çizgileri koru
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
URL'lerdeki yinelenen eðik çizgileri birleþtirme.
|
||||||
|
Keep the original query-string order
|
||||||
|
Özgün sorgu dizesi sýrasýný koru
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
URL'lerin yinelenenlerini ayýklarken sorgu dizesi parametrelerini yeniden sýralama.
|
||||||
|
Strip query keys:
|
||||||
|
Sorgu anahtarlarýný çýkar:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Kaydedilen dosya adlandýrmasýndan çýkarýlacak, virgülle ayrýlmýþ sorgu anahtarlarý (örn. sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
|
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
|
|
||||||
|
Proxy type:
|
||||||
|
Òèï ïðîêñ³:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Ïðîòîêîë ïðîêñ³: HTTP àáî SOCKS5 (çà çàìîâ÷óâàííÿì SOCKS5 âèêîðèñòîâóº ïîðò 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Çàâàíòàæèòè cookies ç ôàéëó:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Ïîïåðåäíüî çàâàíòàæèòè cookies ç ôàéëó Netscape cookies.txt ïåðåä çàâàíòàæåííÿì.
|
||||||
|
Pause between files:
|
||||||
|
Ïàóçà ì³æ ôàéëàìè:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Âèïàäêîâà çàòðèìêà ì³æ çàâàíòàæåííÿìè ôàéë³â, ó ñåêóíäàõ. Âèêîðèñòîâóéòå MIN:MAX äëÿ âèïàäêîâîãî ä³àïàçîíó (íàïðèêëàä, 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
Çáåð³ãàòè ïðåô³êñ www. (íå îá'ºäíóâàòè www.host ç host)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
Íå ââàæàòè www.host ³ host îäíèì ³ òèì ñàìèì ñàéòîì.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
Çáåð³ãàòè ïîäâ³éí³ ñëåø³ â URL
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
Íå âèäàëÿòè ïîâòîðþâàí³ ñëåø³ â URL.
|
||||||
|
Keep the original query-string order
|
||||||
|
Çáåð³ãàòè ïî÷àòêîâèé ïîðÿäîê ïàðàìåòð³â çàïèòó
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
Íå çì³íþâàòè ïîðÿäîê ïàðàìåòð³â ðÿäêà çàïèòó ï³ä ÷àñ óñóíåííÿ äóáë³êàò³â URL.
|
||||||
|
Strip query keys:
|
||||||
|
Âèëó÷àòè êëþ÷³ çàïèòó:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Êëþ÷³ çàïèòó ÷åðåç êîìó, ÿê³ âèëó÷àþòüñÿ ç ³ìåí³ çáåðåæåíîãî ôàéëó (íàïðèêëàä, sid,utm_source).
|
||||||
|
|||||||
@@ -928,3 +928,31 @@ Server terminated
|
|||||||
Server terminated
|
Server terminated
|
||||||
A fatal error has occurred during this mirror
|
A fatal error has occurred during this mirror
|
||||||
Joriy ko’chirish vaqtida jiddiy xatolik yuz berdi
|
Joriy ko’chirish vaqtida jiddiy xatolik yuz berdi
|
||||||
|
Proxy type:
|
||||||
|
Proksi turi:
|
||||||
|
Proxy protocol: HTTP, or SOCKS5 (SOCKS5 default port is 1080).
|
||||||
|
Proksi protokoli: HTTP yoki SOCKS5 (SOCKS5 ning standart porti 1080).
|
||||||
|
Load cookies from file:
|
||||||
|
Fayldan cookies yuklamoq:
|
||||||
|
Preload cookies from a Netscape cookies.txt file before crawling.
|
||||||
|
Ko’chirib olishdan oldin Netscape cookies.txt faylidan cookies’ni oldindan yuklamoq.
|
||||||
|
Pause between files:
|
||||||
|
Fayllar orasidagi pauza:
|
||||||
|
Random delay between file downloads, in seconds. Use MIN:MAX for a random range (e.g. 2:8).
|
||||||
|
Fayllarni ko’chirib olish orasidagi tasodifiy kechikish, soniyalarda. Tasodifiy diapazon uchun MIN:MAX dan foydalaning (masalan, 2:8).
|
||||||
|
Keep the www. prefix (do not merge www.host with host)
|
||||||
|
www. prefiksini saqlash (www.host ni host bilan birlashtirmaslik)
|
||||||
|
Do not treat www.host and host as the same site.
|
||||||
|
www.host va host ni bir xil sayt deb hisoblamaslik.
|
||||||
|
Keep double slashes in URLs
|
||||||
|
URL lardagi qo’sh sleshlarni saqlash
|
||||||
|
Do not collapse duplicate slashes in URLs.
|
||||||
|
URL lardagi takroriy sleshlarni olib tashlamaslik.
|
||||||
|
Keep the original query-string order
|
||||||
|
So’rov satrining asl tartibini saqlash
|
||||||
|
Do not reorder query-string parameters when deduplicating URLs.
|
||||||
|
URL dublikatlarini olib tashlashda so’rov satri parametrlari tartibini o’zgartirmaslik.
|
||||||
|
Strip query keys:
|
||||||
|
Olib tashlanadigan so’rov kalitlari:
|
||||||
|
Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
|
||||||
|
Saqlangan fayl nomidan olib tashlanadigan, vergul bilan ajratilgan so’rov kalitlari (masalan, sid,utm_source).
|
||||||
|
|||||||
119
m4/ax_add_fortify_source.m4
Normal file
119
m4/ax_add_fortify_source.m4
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
# ===========================================================================
|
||||||
|
# https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_ADD_FORTIFY_SOURCE
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
|
||||||
|
# redefinition warnings, other cpp warnings or linker. Some distributions
|
||||||
|
# (such as Ubuntu or Gentoo Linux) enable _FORTIFY_SOURCE globally in
|
||||||
|
# their compilers, leading to unnecessary warnings in the form of
|
||||||
|
#
|
||||||
|
# <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
|
||||||
|
# <built-in>: note: this is the location of the previous definition
|
||||||
|
#
|
||||||
|
# which is a problem if -Werror is enabled. This macro checks whether
|
||||||
|
# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
|
||||||
|
# to CPPFLAGS.
|
||||||
|
#
|
||||||
|
# Newer mingw-w64 msys2 package comes with a bug in
|
||||||
|
# headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support,
|
||||||
|
# and would need -lssp or -fstack-protector. See
|
||||||
|
# https://github.com/msys2/MINGW-packages/issues/5803. Try to actually
|
||||||
|
# link it.
|
||||||
|
#
|
||||||
|
# LICENSE
|
||||||
|
#
|
||||||
|
# Copyright (c) 2017 David Seifert <soap@gentoo.org>
|
||||||
|
# Copyright (c) 2019, 2023 Reini Urban <rurban@cpan.org>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 10
|
||||||
|
|
||||||
|
AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
|
||||||
|
ac_save_cflags=$CFLAGS
|
||||||
|
ac_cwerror_flag=yes
|
||||||
|
AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"])
|
||||||
|
ax_add_fortify_3_failed=
|
||||||
|
AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=3 to CPPFLAGS])
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([],
|
||||||
|
[[
|
||||||
|
#ifndef _FORTIFY_SOURCE
|
||||||
|
return 0;
|
||||||
|
#else
|
||||||
|
_FORTIFY_SOURCE_already_defined;
|
||||||
|
#endif
|
||||||
|
]]
|
||||||
|
)],
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_SOURCE([[
|
||||||
|
#define _FORTIFY_SOURCE 3
|
||||||
|
#include <string.h>
|
||||||
|
int main(void) {
|
||||||
|
char *s = " ";
|
||||||
|
strcpy(s, "x");
|
||||||
|
return strlen(s)-1;
|
||||||
|
}
|
||||||
|
]]
|
||||||
|
)],
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
CFLAGS=$ac_save_cflags
|
||||||
|
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3"
|
||||||
|
], [
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
ax_add_fortify_3_failed=1
|
||||||
|
],
|
||||||
|
),
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
ax_add_fortify_3_failed=1
|
||||||
|
])
|
||||||
|
if test -n "$ax_add_fortify_3_failed"
|
||||||
|
then
|
||||||
|
AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([],
|
||||||
|
[[
|
||||||
|
#ifndef _FORTIFY_SOURCE
|
||||||
|
return 0;
|
||||||
|
#else
|
||||||
|
_FORTIFY_SOURCE_already_defined;
|
||||||
|
#endif
|
||||||
|
]]
|
||||||
|
)],
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_SOURCE([[
|
||||||
|
#define _FORTIFY_SOURCE 2
|
||||||
|
#include <string.h>
|
||||||
|
int main(void) {
|
||||||
|
char *s = " ";
|
||||||
|
strcpy(s, "x");
|
||||||
|
return strlen(s)-1;
|
||||||
|
}
|
||||||
|
]]
|
||||||
|
)],
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
CFLAGS=$ac_save_cflags
|
||||||
|
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
|
||||||
|
], [
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
CFLAGS=$ac_save_cflags
|
||||||
|
],
|
||||||
|
),
|
||||||
|
[
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
CFLAGS=$ac_save_cflags
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
])
|
||||||
66
m4/check_codecs.m4
Normal file
66
m4/check_codecs.m4
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
dnl @synopsis CHECK_BROTLI()
|
||||||
|
dnl @synopsis CHECK_ZSTD()
|
||||||
|
dnl
|
||||||
|
dnl Look for libbrotlidec and libzstd, the decoders for the "br" and "zstd"
|
||||||
|
dnl HTTP content codings. Both are optional: a missing library only drops the
|
||||||
|
dnl coding from Accept-Encoding. --with-brotli=DIR / --with-zstd=DIR point at a
|
||||||
|
dnl prefix; --without-brotli / --without-zstd disable the coding; the default
|
||||||
|
dnl is to use the library when it is found.
|
||||||
|
dnl
|
||||||
|
dnl Define HTS_USEBROTLI / HTS_USEZSTD to 1 or 0, and substitute BROTLI_LIBS /
|
||||||
|
dnl ZSTD_LIBS.
|
||||||
|
|
||||||
|
dnl CHECK_CODEC(name, NAME, header, library, symbol, companion-libs)
|
||||||
|
AC_DEFUN([CHECK_CODEC], [
|
||||||
|
AC_ARG_WITH([$1],
|
||||||
|
[AS_HELP_STRING([--with-$1@<:@=DIR@:>@],[Enable the $1 content coding @<:@default=auto@:>@])],
|
||||||
|
[codec_want=$withval], [codec_want=auto])
|
||||||
|
$2_LIBS=""
|
||||||
|
codec_have=no
|
||||||
|
if test "$codec_want" != "no"; then
|
||||||
|
codec_old_cppflags="$CPPFLAGS"
|
||||||
|
codec_old_ldflags="$LDFLAGS"
|
||||||
|
codec_dir=no
|
||||||
|
if test "$codec_want" != "yes" -a "$codec_want" != "auto"; then
|
||||||
|
codec_dir=yes
|
||||||
|
# An explicit prefix is authoritative: if the header is not under
|
||||||
|
# it, error rather than silently pick a system copy.
|
||||||
|
if test ! -f "$codec_want/include/$3"; then
|
||||||
|
AC_MSG_ERROR([$1 requested at $codec_want but $codec_want/include/$3 is missing])
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS -I$codec_want/include"
|
||||||
|
LDFLAGS="$LDFLAGS -L$codec_want/lib"
|
||||||
|
fi
|
||||||
|
AC_CHECK_HEADER([$3], [codec_h=yes], [codec_h=no])
|
||||||
|
AC_CHECK_LIB([$4], [$5], [codec_lib=yes], [codec_lib=no], [$6])
|
||||||
|
CPPFLAGS="$codec_old_cppflags"
|
||||||
|
LDFLAGS="$codec_old_ldflags"
|
||||||
|
if test "$codec_h" = "yes" -a "$codec_lib" = "yes"; then
|
||||||
|
codec_have=yes
|
||||||
|
$2_LIBS="-l$4 $6"
|
||||||
|
if test "$codec_dir" = "yes"; then
|
||||||
|
$2_LIBS="-L$codec_want/lib -l$4 $6"
|
||||||
|
# The rest of configure still needs the header path.
|
||||||
|
CPPFLAGS="$CPPFLAGS -I$codec_want/include"
|
||||||
|
fi
|
||||||
|
elif test "$codec_want" != "auto"; then
|
||||||
|
AC_MSG_ERROR([$1 requested but lib$4/$3 not found])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_MSG_CHECKING([whether to enable the $1 content coding])
|
||||||
|
AC_MSG_RESULT([$codec_have])
|
||||||
|
if test "$codec_have" = "yes"; then
|
||||||
|
AC_DEFINE([HTS_USE$2], [1], [Define to 1 to decode the $1 content coding])
|
||||||
|
else
|
||||||
|
AC_DEFINE([HTS_USE$2], [0], [Define to 1 to decode the $1 content coding])
|
||||||
|
fi
|
||||||
|
AC_SUBST([$2_LIBS])
|
||||||
|
AC_SUBST([$2_ENABLED], [$codec_have])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl brotlidec needs brotlicommon (the static dictionary) for a fully-static link.
|
||||||
|
AC_DEFUN([CHECK_BROTLI],
|
||||||
|
[CHECK_CODEC([brotli], [BROTLI], [brotli/decode.h], [brotlidec], [BrotliDecoderDecompressStream], [-lbrotlicommon])])
|
||||||
|
|
||||||
|
AC_DEFUN([CHECK_ZSTD],
|
||||||
|
[CHECK_CODEC([zstd], [ZSTD], [zstd.h], [zstd], [ZSTD_decompressStream], [])])
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
.\"
|
.\"
|
||||||
.\" This file is generated by man/makeman.sh; do not edit by hand.
|
.\" This file is generated by man/makeman.sh; do not edit by hand.
|
||||||
.\" SPDX-License-Identifier: GPL-3.0-or-later
|
.\" SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
.TH httrack 1 "27 June 2026" "httrack website copier"
|
.TH httrack 1 "14 July 2026" "httrack website copier"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
httrack \- offline browser : copy websites to a local directory
|
httrack \- offline browser : copy websites to a local directory
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@@ -51,6 +51,7 @@ httrack \- offline browser : copy websites to a local directory
|
|||||||
[ \fB\-%T, \-\-utf8\-conversion\fR ]
|
[ \fB\-%T, \-\-utf8\-conversion\fR ]
|
||||||
[ \fB\-bN, \-\-cookies[=N]\fR ]
|
[ \fB\-bN, \-\-cookies[=N]\fR ]
|
||||||
[ \fB\-%K, \-\-cookies\-file\fR ]
|
[ \fB\-%K, \-\-cookies\-file\fR ]
|
||||||
|
[ \fB\-%Y, \-\-why\fR ]
|
||||||
[ \fB\-u, \-\-check\-type[=N]\fR ]
|
[ \fB\-u, \-\-check\-type[=N]\fR ]
|
||||||
[ \fB\-j, \-\-parse\-java[=N]\fR ]
|
[ \fB\-j, \-\-parse\-java[=N]\fR ]
|
||||||
[ \fB\-sN, \-\-robots[=N]\fR ]
|
[ \fB\-sN, \-\-robots[=N]\fR ]
|
||||||
@@ -134,7 +135,7 @@ continue an interrupted mirror using the cache (\-\-continue)
|
|||||||
mirror ALL links located in the first level pages (mirror links) (\-\-mirrorlinks)
|
mirror ALL links located in the first level pages (mirror links) (\-\-mirrorlinks)
|
||||||
.SS Proxy options:
|
.SS Proxy options:
|
||||||
.IP \-P
|
.IP \-P
|
||||||
proxy use (\-P proxy:port or \-P user:pass@proxy:port) (\-\-proxy <param>)
|
proxy use (\-P [socks5://][user:pass@]proxy:port) (\-\-proxy <param>)
|
||||||
.IP \-%f
|
.IP \-%f
|
||||||
*use proxy for ftp (f0 don't use) (\-\-httpproxy\-ftp[=N])
|
*use proxy for ftp (f0 don't use) (\-\-httpproxy\-ftp[=N])
|
||||||
.IP \-%b
|
.IP \-%b
|
||||||
@@ -218,10 +219,12 @@ links conversion to UTF\-8 (\-\-utf8\-conversion)
|
|||||||
accept cookies in cookies.txt (0=do not accept,* 1=accept) (\-\-cookies[=N])
|
accept cookies in cookies.txt (0=do not accept,* 1=accept) (\-\-cookies[=N])
|
||||||
.IP \-%K
|
.IP \-%K
|
||||||
load extra cookies from a Netscape cookies.txt (\-\-cookies\-file <param>)
|
load extra cookies from a Netscape cookies.txt (\-\-cookies\-file <param>)
|
||||||
|
.IP \-%Y
|
||||||
|
explain which filter rule accepts or rejects a URL, then exit (\-\-why <param>)
|
||||||
.IP \-u
|
.IP \-u
|
||||||
check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always) (\-\-check\-type[=N])
|
check document type if unknown (cgi,asp..) (u0 don't check, * u1 check but /, u2 check always) (\-\-check\-type[=N])
|
||||||
.IP \-j
|
.IP \-j
|
||||||
*parse Java Classes (j0 don't parse, bitmask: |1 parse default, |2 don't parse .class |4 don't parse .js |8 don't be aggressive) (\-\-parse\-java[=N])
|
*parse scripts (j0 don't parse, bitmask: |1 parse default, |4 don't parse .js |8 don't be aggressive) (\-\-parse\-java[=N])
|
||||||
.IP \-sN
|
.IP \-sN
|
||||||
follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always (even strict rules)) (\-\-robots[=N])
|
follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always (even strict rules)) (\-\-robots[=N])
|
||||||
.IP \-%h
|
.IP \-%h
|
||||||
@@ -245,7 +248,7 @@ can also be used to force a specific file type: \-\-assume foo.cgi=text/html
|
|||||||
.IP \-@iN
|
.IP \-@iN
|
||||||
internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6 only) (\-\-protocol[=N])
|
internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6 only) (\-\-protocol[=N])
|
||||||
.IP \-%w
|
.IP \-%w
|
||||||
disable a specific external mime module (\-%w htsswf \-%w htsjava) (\-\-disable\-module <param>)
|
disable a specific external mime module (\-%w httrack\-plugin) (\-\-disable\-module <param>)
|
||||||
.SS Browser ID:
|
.SS Browser ID:
|
||||||
.IP \-F
|
.IP \-F
|
||||||
user\-agent field sent in HTTP headers (\-F "user\-agent name") (\-\-user\-agent <param>)
|
user\-agent field sent in HTTP headers (\-F "user\-agent name") (\-\-user\-agent <param>)
|
||||||
@@ -511,8 +514,6 @@ that would have solved them.
|
|||||||
.SM
|
.SM
|
||||||
\- Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
|
\- Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
|
||||||
.SM
|
.SM
|
||||||
\- Some java classes may not find some files on them (class included)
|
|
||||||
.SM
|
|
||||||
\- Cgi\-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like \-*cgi\-bin*
|
\- Cgi\-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like \-*cgi\-bin*
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Please reports bugs to
|
Please reports bugs to
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ httrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
|
|||||||
proxytrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
|
proxytrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
|
||||||
htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
|
htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
|
||||||
|
|
||||||
lib_LTLIBRARIES = libhttrack.la libhtsjava.la
|
lib_LTLIBRARIES = libhttrack.la
|
||||||
|
|
||||||
htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
|
htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
|
||||||
proxytrack_SOURCES = proxy/main.c \
|
proxytrack_SOURCES = proxy/main.c \
|
||||||
@@ -61,7 +61,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
|
|||||||
htshelp.c htslib.c htscoremain.c \
|
htshelp.c htslib.c htscoremain.c \
|
||||||
htsname.c htsrobots.c htstools.c htswizard.c \
|
htsname.c htsrobots.c htstools.c htswizard.c \
|
||||||
htsalias.c htsthread.c htsindex.c htsbauth.c \
|
htsalias.c htsthread.c htsindex.c htsbauth.c \
|
||||||
htsmd5.c htszlib.c htswrap.c htsconcat.c \
|
htsmd5.c htscodec.c htsproxy.c htszlib.c htswrap.c htsconcat.c \
|
||||||
htsmodules.c htscharset.c punycode.c htsencoding.c htssniff.c \
|
htsmodules.c htscharset.c punycode.c htsencoding.c htssniff.c \
|
||||||
md5.c \
|
md5.c \
|
||||||
minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \
|
minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \
|
||||||
@@ -72,25 +72,20 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
|
|||||||
htshelp.h htsindex.h htslib.h htsmd5.h \
|
htshelp.h htsindex.h htslib.h htsmd5.h \
|
||||||
htsmodules.h htsname.h htsnet.h htssniff.h \
|
htsmodules.h htsname.h htsnet.h htssniff.h \
|
||||||
htsopt.h htsrobots.h htsthread.h \
|
htsopt.h htsrobots.h htsthread.h \
|
||||||
htstools.h htswizard.h htswrap.h htszlib.h \
|
htstools.h htswizard.h htswrap.h htscodec.h htsproxy.h htszlib.h \
|
||||||
htsstrings.h htsarrays.h httrack-library.h \
|
htsstrings.h htsarrays.h httrack-library.h \
|
||||||
htscharset.h punycode.h htsencoding.h \
|
htscharset.h punycode.h htsencoding.h \
|
||||||
htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \
|
htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \
|
||||||
md5.h coucal/murmurhash3.h \
|
md5.h coucal/murmurhash3.h \
|
||||||
minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h
|
minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h
|
||||||
libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS)
|
libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(BROTLI_LIBS) $(ZSTD_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS)
|
||||||
libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST
|
libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST
|
||||||
libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)
|
libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)
|
||||||
|
|
||||||
libhtsjava_la_SOURCES = htsjava.c htsjava.h
|
|
||||||
libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
|
|
||||||
# This thin JNI wrapper reaches libc only through libhttrack, so the direct
|
|
||||||
# libc edge is dropped from DT_NEEDED (library-not-linked-against-libc). Force
|
|
||||||
# libc back as a dependency; configure gates the flag since only a GNU-style
|
|
||||||
# linker accepts it (LIBC_FORCE_LINK is empty on e.g. macOS).
|
|
||||||
libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) $(LIBC_FORCE_LINK)
|
|
||||||
|
|
||||||
EXTRA_DIST = httrack.h webhttrack \
|
EXTRA_DIST = httrack.h webhttrack \
|
||||||
|
version.rc \
|
||||||
|
libhttrack.rc \
|
||||||
|
httrack.rc \
|
||||||
coucal/murmurhash3.h.diff \
|
coucal/murmurhash3.h.diff \
|
||||||
coucal/murmurhash3.h.orig \
|
coucal/murmurhash3.h.orig \
|
||||||
minizip/iowin32.c \
|
minizip/iowin32.c \
|
||||||
@@ -113,13 +108,13 @@ EXTRA_DIST = httrack.h webhttrack \
|
|||||||
proxy/proxystrings.h \
|
proxy/proxystrings.h \
|
||||||
proxy/proxytrack.h \
|
proxy/proxytrack.h \
|
||||||
proxy/store.h \
|
proxy/store.h \
|
||||||
proxy/proxytrack.vcproj \
|
|
||||||
coucal/LICENSE \
|
coucal/LICENSE \
|
||||||
coucal/Makefile \
|
coucal/Makefile \
|
||||||
coucal/README.md \
|
coucal/README.md \
|
||||||
coucal/sample.c \
|
coucal/sample.c \
|
||||||
coucal/tests.c \
|
coucal/tests.c \
|
||||||
htsjava.vcproj \
|
vcpkg.json \
|
||||||
httrack.dsp httrack.dsw httrack.vcproj \
|
httrack.vcxproj \
|
||||||
libhttrack.dsp libhttrack.dsw libhttrack.vcproj \
|
libhttrack.vcxproj \
|
||||||
webhttrack.dsp webhttrack.dsw webhttrack.vcproj
|
proxytrack.vcxproj \
|
||||||
|
webhttrack.vcxproj
|
||||||
|
|||||||
@@ -114,6 +114,8 @@ const char *hts_optalias[][4] = {
|
|||||||
"strip [host/pattern=]key1,key2,... from URLs"},
|
"strip [host/pattern=]key1,key2,... from URLs"},
|
||||||
{"cookies-file", "-%K", "param1",
|
{"cookies-file", "-%K", "param1",
|
||||||
"load extra cookies from a Netscape cookies.txt"},
|
"load extra cookies from a Netscape cookies.txt"},
|
||||||
|
{"why", "-%Y", "param1",
|
||||||
|
"explain which filter rule accepts or rejects a URL, then exit"},
|
||||||
{"pause", "-%G", "param1",
|
{"pause", "-%G", "param1",
|
||||||
"random pause of MIN[:MAX] seconds between files"},
|
"random pause of MIN[:MAX] seconds between files"},
|
||||||
{"generate-errors", "-o", "single", ""},
|
{"generate-errors", "-o", "single", ""},
|
||||||
|
|||||||
603
src/htsback.c
603
src/htsback.c
@@ -44,6 +44,8 @@ Please visit our Website: http://www.httrack.com
|
|||||||
#include "htsback.h"
|
#include "htsback.h"
|
||||||
|
|
||||||
#include "htsftp.h"
|
#include "htsftp.h"
|
||||||
|
#include "htscodec.h"
|
||||||
|
#include "htsproxy.h"
|
||||||
#if HTS_USEZLIB
|
#if HTS_USEZLIB
|
||||||
#include "htszlib.h"
|
#include "htszlib.h"
|
||||||
#else
|
#else
|
||||||
@@ -68,6 +70,15 @@ static int slot_can_be_cached_on_disk(const lien_back * back);
|
|||||||
static int slot_can_be_cleaned(const lien_back * back);
|
static int slot_can_be_cleaned(const lien_back * back);
|
||||||
static int slot_can_be_finalized(httrackp * opt, const lien_back * back);
|
static int slot_can_be_finalized(httrackp * opt, const lien_back * back);
|
||||||
|
|
||||||
|
/* Which hard quota, if any, is currently aborting the mirror. */
|
||||||
|
typedef enum {
|
||||||
|
HTS_MIRROR_LIMIT_NONE = 0,
|
||||||
|
HTS_MIRROR_LIMIT_SIZE,
|
||||||
|
HTS_MIRROR_LIMIT_TIME,
|
||||||
|
} hts_mirror_limit;
|
||||||
|
|
||||||
|
static hts_mirror_limit back_mirror_limit(httrackp *opt);
|
||||||
|
|
||||||
struct_back *back_new(httrackp *opt, int back_max) {
|
struct_back *back_new(httrackp *opt, int back_max) {
|
||||||
int i;
|
int i;
|
||||||
struct_back *sback = calloct(1, sizeof(struct_back));
|
struct_back *sback = calloct(1, sizeof(struct_back));
|
||||||
@@ -129,8 +140,9 @@ int back_connect_fallback_due(int addr_index, int addr_count, int elapsed,
|
|||||||
|
|
||||||
/* Pending-connect result for a non-blocking socket reported ready by select():
|
/* Pending-connect result for a non-blocking socket reported ready by select():
|
||||||
0 = connected, >0 = the connect errno (refused, unreachable, ...), -1 if the
|
0 = connected, >0 = the connect errno (refused, unreachable, ...), -1 if the
|
||||||
probe itself failed. A failed connect is reported writable too, so this is
|
probe itself failed. A failed connect is reported ready as well (writable on
|
||||||
how success is told from failure without blocking. */
|
posix, exception set on winsock), so this is how success is told from failure
|
||||||
|
without blocking. */
|
||||||
static int connect_socket_error(T_SOC soc) {
|
static int connect_socket_error(T_SOC soc) {
|
||||||
int soerr = 0;
|
int soerr = 0;
|
||||||
socklen_t len = (socklen_t) sizeof(soerr);
|
socklen_t len = (socklen_t) sizeof(soerr);
|
||||||
@@ -524,12 +536,13 @@ int back_nsoc_overall(const struct_back * sback) {
|
|||||||
|
|
||||||
/* generate temporary file on lien_back */
|
/* generate temporary file on lien_back */
|
||||||
/* Note: utf-8 */
|
/* Note: utf-8 */
|
||||||
static int create_back_tmpfile(httrackp * opt, lien_back *const back) {
|
static int create_back_tmpfile(httrackp *opt, lien_back *const back,
|
||||||
|
const char *ext) {
|
||||||
// do not use tempnam() but a regular filename
|
// do not use tempnam() but a regular filename
|
||||||
back->tmpfile_buffer[0] = '\0';
|
back->tmpfile_buffer[0] = '\0';
|
||||||
if (back->url_sav != NULL && back->url_sav[0] != '\0') {
|
if (back->url_sav != NULL && back->url_sav[0] != '\0') {
|
||||||
snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s.z",
|
snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s.%s",
|
||||||
back->url_sav);
|
back->url_sav, ext);
|
||||||
back->tmpfile = back->tmpfile_buffer;
|
back->tmpfile = back->tmpfile_buffer;
|
||||||
if (structcheck(back->tmpfile) != 0) {
|
if (structcheck(back->tmpfile) != 0) {
|
||||||
hts_log_print(opt, LOG_WARNING, "can not create directory to %s",
|
hts_log_print(opt, LOG_WARNING, "can not create directory to %s",
|
||||||
@@ -537,9 +550,8 @@ static int create_back_tmpfile(httrackp * opt, lien_back *const back) {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer),
|
snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s/tmp%d.%s",
|
||||||
"%s/tmp%d.z", StringBuff(opt->path_html_utf8),
|
StringBuff(opt->path_html_utf8), opt->state.tmpnameid++, ext);
|
||||||
opt->state.tmpnameid++);
|
|
||||||
back->tmpfile = back->tmpfile_buffer;
|
back->tmpfile = back->tmpfile_buffer;
|
||||||
}
|
}
|
||||||
/* OK */
|
/* OK */
|
||||||
@@ -547,6 +559,39 @@ static int create_back_tmpfile(httrackp * opt, lien_back *const back) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Move src onto dst; RENAME does not clobber an existing target on Windows. */
|
||||||
|
static hts_boolean replace_file(const char *src, const char *dst) {
|
||||||
|
if (RENAME(src, dst) == 0)
|
||||||
|
return HTS_TRUE;
|
||||||
|
(void) UNLINK(dst);
|
||||||
|
return RENAME(src, dst) == 0 ? HTS_TRUE : HTS_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Commit or restore a re-fetch backup (#77 follow-up): a re-fetch over an
|
||||||
|
existing file moved the good copy to back->tmpfile before truncating url_sav.
|
||||||
|
commit keeps the new file and drops the backup; else restore it so an aborted
|
||||||
|
transfer leaves the previous copy intact. Skips the zlib .z temp. */
|
||||||
|
static void back_finalize_backup(httrackp *opt, lien_back *const back,
|
||||||
|
const hts_boolean commit) {
|
||||||
|
if (back->tmpfile == NULL || back->r.compressed)
|
||||||
|
return;
|
||||||
|
if (commit) {
|
||||||
|
(void) UNLINK(back->tmpfile); /* new copy is good; drop the backup */
|
||||||
|
} else {
|
||||||
|
if (back->r.out != NULL) {
|
||||||
|
fclose(back->r.out);
|
||||||
|
back->r.out = NULL;
|
||||||
|
}
|
||||||
|
/* On failure keep the backup: an orphaned temp beats losing the good copy.
|
||||||
|
*/
|
||||||
|
if (!replace_file(back->tmpfile, back->url_sav))
|
||||||
|
hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
|
||||||
|
"could not restore %s; previous copy kept as %s",
|
||||||
|
back->url_sav, back->tmpfile);
|
||||||
|
}
|
||||||
|
back->tmpfile = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
// objet (lien) téléchargé ou transféré depuis le cache
|
// objet (lien) téléchargé ou transféré depuis le cache
|
||||||
//
|
//
|
||||||
// fermer les paramètres de transfert,
|
// fermer les paramètres de transfert,
|
||||||
@@ -582,6 +627,11 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
LLintP " got " LLintP "): %s%s", back[p].r.totalsize,
|
LLintP " got " LLintP "): %s%s", back[p].r.totalsize,
|
||||||
back[p].r.size, back[p].url_adr, back[p].url_fil);
|
back[p].r.size, back[p].url_adr, back[p].url_fil);
|
||||||
}
|
}
|
||||||
|
back_finalize_backup(opt, &back[p], HTS_FALSE);
|
||||||
|
/* Keep the surviving copy in new.lst, else the update purge drops the
|
||||||
|
file we refused to overwrite with the partial body (#562). */
|
||||||
|
if (fexist_utf8(back[p].url_sav))
|
||||||
|
filenote(&opt->state.strc, back[p].url_sav, NULL);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -591,8 +641,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
if (!back[p].testmode) { // not test mode
|
if (!back[p].testmode) { // not test mode
|
||||||
const char *state = "unknown";
|
const char *state = "unknown";
|
||||||
|
|
||||||
/* décompression */
|
/* Undo the content coding */
|
||||||
#if HTS_USEZLIB
|
|
||||||
if (back[p].r.compressed) {
|
if (back[p].r.compressed) {
|
||||||
if (back[p].r.size > 0) {
|
if (back[p].r.size > 0) {
|
||||||
// stats
|
// stats
|
||||||
@@ -600,7 +649,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
// en mémoire -> passage sur disque
|
// en mémoire -> passage sur disque
|
||||||
if (!back[p].r.is_write) {
|
if (!back[p].r.is_write) {
|
||||||
// do not use tempnam() but a regular filename
|
// do not use tempnam() but a regular filename
|
||||||
if (create_back_tmpfile(opt, &back[p]) == 0) {
|
if (create_back_tmpfile(opt, &back[p], "z") == 0) {
|
||||||
assertf(back[p].tmpfile != NULL);
|
assertf(back[p].tmpfile != NULL);
|
||||||
/* note: tmpfile is utf-8 */
|
/* note: tmpfile is utf-8 */
|
||||||
back[p].r.out = FOPEN(back[p].tmpfile, "wb");
|
back[p].r.out = FOPEN(back[p].tmpfile, "wb");
|
||||||
@@ -638,28 +687,67 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
// décompression
|
// décompression
|
||||||
if (back[p].tmpfile != NULL) {
|
if (back[p].tmpfile != NULL) {
|
||||||
if (back[p].url_sav[0]) {
|
if (back[p].url_sav[0]) {
|
||||||
|
const hts_codec codec =
|
||||||
|
hts_codec_parse(back[p].r.contentencoding);
|
||||||
|
/* Never decode over url_sav: a failed decode would destroy the
|
||||||
|
copy an --update re-fetch is supposed to refresh (#557). */
|
||||||
|
char BIGSTK unpacked[HTS_URLMAXSIZE * 2 + 4]; // room for ".u"
|
||||||
LLint size;
|
LLint size;
|
||||||
|
|
||||||
file_notify(opt, back[p].url_adr, back[p].url_fil,
|
snprintf(unpacked, sizeof(unpacked), "%s.u", back[p].url_sav);
|
||||||
back[p].url_sav, 1, 1, back[p].r.notmodified);
|
if ((size = hts_codec_unpack(codec, back[p].tmpfile,
|
||||||
filecreateempty(&opt->state.strc, back[p].url_sav); // filenote & co
|
unpacked)) >= 0) {
|
||||||
if ((size = hts_zunpack(back[p].tmpfile, back[p].url_sav)) >= 0) {
|
|
||||||
back[p].r.size = back[p].r.totalsize = size;
|
back[p].r.size = back[p].r.totalsize = size;
|
||||||
// fichier -> mémoire
|
|
||||||
if (!back[p].r.is_write) {
|
if (!back[p].r.is_write) {
|
||||||
|
// fichier -> mémoire ; le fichier est écrit plus tard
|
||||||
deleteaddr(&back[p].r);
|
deleteaddr(&back[p].r);
|
||||||
back[p].r.adr = readfile_utf8(back[p].url_sav);
|
back[p].r.adr = readfile_utf8(unpacked);
|
||||||
if (!back[p].r.adr) {
|
if (!back[p].r.adr) {
|
||||||
back[p].r.statuscode = STATUSCODE_INVALID;
|
back[p].r.statuscode = STATUSCODE_INVALID;
|
||||||
strcpybuff(back[p].r.msg,
|
strcpybuff(back[p].r.msg,
|
||||||
"Read error when decompressing");
|
"Read error when decompressing");
|
||||||
}
|
}
|
||||||
UNLINK(back[p].url_sav);
|
UNLINK(unpacked);
|
||||||
|
} else if (replace_file(unpacked, back[p].url_sav)) {
|
||||||
|
/* The temp bypassed filecreate(), which is what chmods. */
|
||||||
|
#ifndef _WIN32
|
||||||
|
chmod(back[p].url_sav, HTS_ACCESS_FILE);
|
||||||
|
#endif
|
||||||
|
file_notify(opt, back[p].url_adr, back[p].url_fil,
|
||||||
|
back[p].url_sav, 1, 1, back[p].r.notmodified);
|
||||||
|
filenote(&opt->state.strc, back[p].url_sav, NULL);
|
||||||
|
} else {
|
||||||
|
back[p].r.statuscode = STATUSCODE_INVALID;
|
||||||
|
strcpybuff(back[p].r.msg,
|
||||||
|
"Write error when decompressing (can not rename "
|
||||||
|
"the temporary file)");
|
||||||
|
/* Keep the decoded body: the failed replace may have
|
||||||
|
removed the previous copy, leaving this as the only one.
|
||||||
|
*/
|
||||||
|
hts_log_print(
|
||||||
|
opt, LOG_WARNING | LOG_ERRNO,
|
||||||
|
"could not replace %s; decoded copy kept as %s",
|
||||||
|
back[p].url_sav, unpacked);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
back[p].r.statuscode = STATUSCODE_INVALID;
|
back[p].r.statuscode = STATUSCODE_INVALID;
|
||||||
strcpybuff(back[p].r.msg, "Error when decompressing");
|
snprintf(back[p].r.msg, sizeof(back[p].r.msg),
|
||||||
|
codec == HTS_CODEC_UNSUPPORTED
|
||||||
|
? "Unsupported Content-Encoding (%s)"
|
||||||
|
: "Error when decompressing (%s)",
|
||||||
|
back[p].r.contentencoding);
|
||||||
|
/* Drop the undecoded body so the writer can't commit the
|
||||||
|
coded bytes as the page; url_sav is left untouched. */
|
||||||
|
if (!back[p].r.is_write)
|
||||||
|
deleteaddr(&back[p].r);
|
||||||
|
UNLINK(unpacked);
|
||||||
}
|
}
|
||||||
|
/* A failed decode keeps the previously-mirrored copy: note it,
|
||||||
|
or the update purge (in old.lst, absent from new.lst) would
|
||||||
|
delete what we just took care not to overwrite. */
|
||||||
|
if (back[p].r.statuscode == STATUSCODE_INVALID &&
|
||||||
|
fexist_utf8(back[p].url_sav))
|
||||||
|
filenote(&opt->state.strc, back[p].url_sav, NULL);
|
||||||
}
|
}
|
||||||
/* ensure that no remaining temporary file exists */
|
/* ensure that no remaining temporary file exists */
|
||||||
unlink(back[p].tmpfile);
|
unlink(back[p].tmpfile);
|
||||||
@@ -672,7 +760,9 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
// unflag
|
// unflag
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
/* Body fully received: keep the freshly written url_sav, drop the
|
||||||
|
backup of the previous copy. */
|
||||||
|
back_finalize_backup(opt, &back[p], HTS_TRUE);
|
||||||
/* Write mode to disk */
|
/* Write mode to disk */
|
||||||
if (back[p].r.is_write && back[p].r.adr != NULL) {
|
if (back[p].r.is_write && back[p].r.adr != NULL) {
|
||||||
freet(back[p].r.adr);
|
freet(back[p].r.adr);
|
||||||
@@ -691,7 +781,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
if (back[p].r.statuscode == HTTP_OK) { // OK (ou 304 en backing)
|
if (back[p].r.statuscode == HTTP_OK) { // OK (ou 304 en backing)
|
||||||
if (back[p].r.is_write) { // Written file
|
if (back[p].r.is_write) { // Written file
|
||||||
if (may_be_hypertext_mime(opt, back[p].r.contenttype, back[p].url_fil)) { // to parse!
|
if (may_be_hypertext_mime(opt, back[p].r.contenttype, back[p].url_fil)) { // to parse!
|
||||||
off_t sz;
|
LLint sz;
|
||||||
|
|
||||||
sz = fsize_utf8(back[p].url_sav);
|
sz = fsize_utf8(back[p].url_sav);
|
||||||
if (sz > 0) { // ok, exists!
|
if (sz > 0) { // ok, exists!
|
||||||
@@ -768,7 +858,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
else
|
else
|
||||||
strcatbuff(flags, "-");
|
strcatbuff(flags, "-");
|
||||||
if (back[p].r.compressed)
|
if (back[p].r.compressed)
|
||||||
strcatbuff(flags, "Z"); // gzip
|
strcatbuff(flags, "Z"); // content coding
|
||||||
else
|
else
|
||||||
strcatbuff(flags, "-");
|
strcatbuff(flags, "-");
|
||||||
/* Err I had to split these.. */
|
/* Err I had to split these.. */
|
||||||
@@ -777,9 +867,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
fprintf(cache->txt, LLintP, (LLint) back[p].r.totalsize);
|
fprintf(cache->txt, LLintP, (LLint) back[p].r.totalsize);
|
||||||
fprintf(cache->txt, "\t%s\t", flags);
|
fprintf(cache->txt, "\t%s\t", flags);
|
||||||
}
|
}
|
||||||
#if HTS_USEZLIB
|
|
||||||
back[p].r.compressed = 0;
|
back[p].r.compressed = 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (back[p].r.statuscode == HTTP_OK) {
|
if (back[p].r.statuscode == HTTP_OK) {
|
||||||
if (back[p].r.size >= 0) {
|
if (back[p].r.size >= 0) {
|
||||||
@@ -901,6 +989,9 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Aborted, error, or not ready: url_sav (if written) is broken; restore the
|
||||||
|
previous copy from the backup. */
|
||||||
|
back_finalize_backup(opt, &back[p], HTS_FALSE);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1646,138 +1737,104 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// tester cache
|
// tester cache
|
||||||
if ((strcmp(adr, "file://")) /* pas fichier */
|
if ((strcmp(adr, "file://")) /* pas fichier */
|
||||||
&&((!test) || (cache->type == 1)) /* cache prioritaire, laisser passer en test! */
|
&& ((!test) ||
|
||||||
&&((strnotempty(save)) || (strcmp(fil, "/robots.txt") == 0))) { // si en test on ne doit pas utiliser le cache sinon telescopage avec le 302..
|
(cache->type == 1)) /* cache prioritaire, laisser passer en test! */
|
||||||
#if HTS_FAST_CACHE
|
&&
|
||||||
|
((strnotempty(save)) || (strcmp(fil, "/robots.txt") ==
|
||||||
|
0))) { // si en test on ne doit pas utiliser le
|
||||||
|
// cache sinon telescopage avec le 302..
|
||||||
intptr_t hash_pos;
|
intptr_t hash_pos;
|
||||||
int hash_pos_return = 0;
|
int hash_pos_return = 0;
|
||||||
#else
|
|
||||||
char *a = NULL;
|
|
||||||
#endif
|
|
||||||
#if HTS_FAST_CACHE
|
|
||||||
if (cache->hashtable) {
|
if (cache->hashtable) {
|
||||||
#else
|
|
||||||
if (cache->use) {
|
|
||||||
#endif
|
|
||||||
char BIGSTK buff[HTS_URLMAXSIZE * 4];
|
char BIGSTK buff[HTS_URLMAXSIZE * 4];
|
||||||
|
|
||||||
#if HTS_FAST_CACHE
|
|
||||||
strcpybuff(buff, adr);
|
strcpybuff(buff, adr);
|
||||||
strcatbuff(buff, fil);
|
strcatbuff(buff, fil);
|
||||||
hash_pos_return = coucal_read(cache->hashtable, buff, &hash_pos);
|
hash_pos_return = coucal_read(cache->hashtable, buff, &hash_pos);
|
||||||
#else
|
|
||||||
buff[0] = '\0';
|
|
||||||
strcatbuff(buff, "\n");
|
|
||||||
strcatbuff(buff, adr);
|
|
||||||
strcatbuff(buff, "\n");
|
|
||||||
strcatbuff(buff, fil);
|
|
||||||
strcatbuff(buff, "\n");
|
|
||||||
a = strstr(cache->use, buff);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Ok, noté en cache->. mais bien présent dans le cache ou sur disque?
|
|
||||||
#if HTS_FAST_CACHE
|
|
||||||
// negative values when data is not in cache
|
// negative values when data is not in cache
|
||||||
if (hash_pos_return < 0) {
|
if (hash_pos_return < 0) {
|
||||||
#else
|
if (!test) { // not test mode
|
||||||
if (a) {
|
/* note: no check with IS_DELAYED_EXT() enabled - postcheck by
|
||||||
#endif
|
* client please! */
|
||||||
if (!test) { // non mode test
|
if (save[0] != '\0' && !IS_DELAYED_EXT(save) &&
|
||||||
#if HTS_FAST_CACHE==0
|
fsize_utf8(fconv(catbuff, sizeof(catbuff), save)) <=
|
||||||
int pos = -1;
|
0) { // final file missing or empty
|
||||||
|
int found = 0;
|
||||||
|
|
||||||
a += strlen(buff);
|
/* It is possible that the file has been moved due to changes in
|
||||||
sscanf(a, "%d", &pos); // lire position
|
* build structure */
|
||||||
#endif
|
{
|
||||||
|
char BIGSTK previous_save[HTS_URLMAXSIZE * 2];
|
||||||
|
htsblk r;
|
||||||
|
|
||||||
#if HTS_FAST_CACHE==0
|
previous_save[0] = '\0';
|
||||||
if (pos < 0) { // pas de mise en cache data, vérifier existence
|
r = cache_readex(opt, cache, adr, fil, /*head */ NULL,
|
||||||
#endif
|
|
||||||
/* note: no check with IS_DELAYED_EXT() enabled - postcheck by client please! */
|
|
||||||
if (save[0] != '\0' && !IS_DELAYED_EXT(save) && fsize_utf8(fconv(catbuff, sizeof(catbuff), save)) <= 0) { // fichier final n'existe pas ou est vide!
|
|
||||||
int found = 0;
|
|
||||||
|
|
||||||
/* It is possible that the file has been moved due to changes in build structure */
|
|
||||||
{
|
|
||||||
char BIGSTK previous_save[HTS_URLMAXSIZE * 2];
|
|
||||||
htsblk r;
|
|
||||||
|
|
||||||
previous_save[0] = '\0';
|
|
||||||
r =
|
|
||||||
cache_readex(opt, cache, adr, fil, /*head */ NULL,
|
|
||||||
/*bound to back[p] (temporary) */
|
/*bound to back[p] (temporary) */
|
||||||
back[p].location_buffer, previous_save, /*ro */
|
back[p].location_buffer, previous_save, /*ro */
|
||||||
1);
|
1);
|
||||||
/* Is supposed to be on disk only */
|
/* Is supposed to be on disk only */
|
||||||
if (r.is_write && previous_save[0] != '\0') {
|
if (r.is_write && previous_save[0] != '\0') {
|
||||||
/* Exists, but with another (old) filename: rename (almost) silently */
|
/* Exists, but with another (old) filename: rename (almost)
|
||||||
if (strcmp(previous_save, save) != 0
|
* silently */
|
||||||
&& fexist_utf8(fconv(catbuff, sizeof(catbuff), previous_save))) {
|
if (strcmp(previous_save, save) != 0 &&
|
||||||
rename(fconv(catbuff, sizeof(catbuff), previous_save),
|
fexist_utf8(
|
||||||
fconv(catbuff2, sizeof(catbuff2), save));
|
fconv(catbuff, sizeof(catbuff), previous_save))) {
|
||||||
if (fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) {
|
rename(fconv(catbuff, sizeof(catbuff), previous_save),
|
||||||
found = 1;
|
fconv(catbuff2, sizeof(catbuff2), save));
|
||||||
hts_log_print(opt, LOG_DEBUG,
|
if (fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) {
|
||||||
"File '%s' has been renamed since last mirror to '%s' ; applying changes",
|
found = 1;
|
||||||
previous_save, save);
|
hts_log_print(opt, LOG_DEBUG,
|
||||||
} else {
|
"File '%s' has been renamed since last "
|
||||||
hts_log_print(opt, LOG_ERROR,
|
"mirror to '%s' ; applying changes",
|
||||||
"Could not rename '%s' to '%s' ; will have to retransfer it",
|
previous_save, save);
|
||||||
previous_save, save);
|
} else {
|
||||||
}
|
hts_log_print(opt, LOG_ERROR,
|
||||||
|
"Could not rename '%s' to '%s' ; will have "
|
||||||
|
"to retransfer it",
|
||||||
|
previous_save, save);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
back[p].location_buffer[0] = '\0';
|
|
||||||
}
|
}
|
||||||
|
back[p].location_buffer[0] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
/* Not found ? */
|
/* Not found ? */
|
||||||
if (!found) {
|
if (!found) {
|
||||||
#if HTS_FAST_CACHE
|
// invalidate: gone from disk, force a refetch
|
||||||
hash_pos_return = 0;
|
hash_pos_return = 0;
|
||||||
#else
|
if (opt->norecatch) {
|
||||||
a = NULL;
|
if (!fexist_utf8(fconv(
|
||||||
#endif
|
catbuff, sizeof(catbuff),
|
||||||
// dévalider car non présent sur disque dans structure originale!!!
|
save))) { // declared but missing: user erased it
|
||||||
// sinon, le fichier est ok à priori, mais on renverra un if-modified-since pour
|
FILE *fp =
|
||||||
// en être sûr
|
FOPEN(fconv(catbuff, sizeof(catbuff), save), "wb");
|
||||||
if (opt->norecatch) { // tester norecatch
|
|
||||||
if (!fexist_utf8(fconv(catbuff, sizeof(catbuff), save))) { // fichier existe pas mais déclaré: on l'a effacé
|
|
||||||
FILE *fp = FOPEN(fconv(catbuff, sizeof(catbuff), save), "wb");
|
|
||||||
|
|
||||||
if (fp)
|
if (fp)
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
hts_log_print(opt, LOG_WARNING,
|
|
||||||
"Previous file '%s' not found (erased by user ?), ignoring: %s%s",
|
|
||||||
save, back[p].url_adr, back[p].url_fil);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
hts_log_print(opt, LOG_WARNING,
|
hts_log_print(opt, LOG_WARNING,
|
||||||
"Previous file '%s' not found (erased by user ?), recatching: %s%s",
|
"Previous file '%s' not found (erased by "
|
||||||
|
"user ?), ignoring: %s%s",
|
||||||
save, back[p].url_adr, back[p].url_fil);
|
save, back[p].url_adr, back[p].url_fil);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
hts_log_print(opt, LOG_WARNING,
|
||||||
|
"Previous file '%s' not found (erased by user "
|
||||||
|
"?), recatching: %s%s",
|
||||||
|
save, back[p].url_adr, back[p].url_fil);
|
||||||
}
|
}
|
||||||
} // fsize() <= 0
|
}
|
||||||
#if HTS_FAST_CACHE==0
|
} // fsize() <= 0
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
} else {
|
} else {
|
||||||
#if HTS_FAST_CACHE
|
|
||||||
hash_pos_return = 0;
|
hash_pos_return = 0;
|
||||||
#else
|
|
||||||
a = NULL;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Existe pas en cache, ou bien pas de cache présent
|
if (hash_pos_return) { // in cache, with data
|
||||||
#if HTS_FAST_CACHE
|
|
||||||
if (hash_pos_return) { // OK existe en cache (et données aussi)!
|
|
||||||
#else
|
|
||||||
if (a != NULL) { // OK existe en cache (et données aussi)!
|
|
||||||
#endif
|
|
||||||
const int cache_is_prioritary = cache->type == 1
|
const int cache_is_prioritary = cache->type == 1
|
||||||
|| opt->state.stop != 0;
|
|| opt->state.stop != 0;
|
||||||
if (cache_is_prioritary) { // cache prioritaire (pas de test if-modified..)
|
if (cache_is_prioritary) { // cache prioritaire (pas de test if-modified..)
|
||||||
@@ -1898,9 +1955,10 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Not in cache ; maybe in temporary cache ? Warning: non-movable "url_sav" */
|
/* Not in cache ; maybe in temporary cache ? Warning: non-movable
|
||||||
|
"url_sav" */
|
||||||
else if (back_unserialize_ref(opt, adr, fil, &itemback) == 0) {
|
else if (back_unserialize_ref(opt, adr, fil, &itemback) == 0) {
|
||||||
const off_t file_size = fsize_utf8(itemback->url_sav);
|
const LLint file_size = fsize_utf8(itemback->url_sav);
|
||||||
|
|
||||||
/* Found file on disk */
|
/* Found file on disk */
|
||||||
if (file_size > 0) {
|
if (file_size > 0) {
|
||||||
@@ -1935,7 +1993,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
}
|
}
|
||||||
/* Not in cache or temporary cache ; found on disk ? (hack) */
|
/* Not in cache or temporary cache ; found on disk ? (hack) */
|
||||||
else if (fexist_utf8(save)) {
|
else if (fexist_utf8(save)) {
|
||||||
const off_t sz = fsize_utf8(save);
|
const LLint sz = fsize_utf8(save);
|
||||||
|
|
||||||
// Bon, là il est possible que le fichier ait été partiellement transféré
|
// Bon, là il est possible que le fichier ait été partiellement transféré
|
||||||
// (s'il l'avait été en totalité il aurait été inscrit dans le cache ET existerait sur disque)
|
// (s'il l'avait été en totalité il aurait été inscrit dans le cache ET existerait sur disque)
|
||||||
@@ -2059,6 +2117,17 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
"error: forbidden test with ftp link for back_add");
|
"error: forbidden test with ftp link for back_add");
|
||||||
return -1; // erreur pas de test permis
|
return -1; // erreur pas de test permis
|
||||||
}
|
}
|
||||||
|
// the ftp client dials the origin itself: over socks that would bypass
|
||||||
|
// the proxy, so fail the link rather than leak the connection (#563)
|
||||||
|
if (back[p].r.req.proxy.active &&
|
||||||
|
hts_proxy_is_socks(back[p].r.req.proxy.name)) {
|
||||||
|
back[p].r.statuscode = STATUSCODE_NON_FATAL;
|
||||||
|
strcpybuff(back[p].r.msg,
|
||||||
|
"ftp:// is not supported over a SOCKS proxy");
|
||||||
|
back[p].status = STATUS_READY;
|
||||||
|
back_set_finished(sback, p);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
if (!(back[p].r.req.proxy.active && opt->ftp_proxy)) { // connexion directe, gérée en thread
|
if (!(back[p].r.req.proxy.active && opt->ftp_proxy)) { // connexion directe, gérée en thread
|
||||||
FTPDownloadStruct *str =
|
FTPDownloadStruct *str =
|
||||||
(FTPDownloadStruct *) malloc(sizeof(FTPDownloadStruct));
|
(FTPDownloadStruct *) malloc(sizeof(FTPDownloadStruct));
|
||||||
@@ -2083,13 +2152,9 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
|
|
||||||
if (!back_trylive(opt, cache, sback, p)) {
|
if (!back_trylive(opt, cache, sback, p)) {
|
||||||
#if HTS_XGETHOST
|
#if HTS_XGETHOST
|
||||||
#if HDEBUG
|
back[p].status = STATUS_WAIT_DNS; // host name resolution attempt
|
||||||
printf("back_solve..\n");
|
soc = INVALID_SOCKET; // not opened yet
|
||||||
#endif
|
if (host_wait(opt, &back[p])) { // ready (file, or cached dns)
|
||||||
back[p].status = STATUS_WAIT_DNS; // tentative de résolution du nom de host
|
|
||||||
soc = INVALID_SOCKET; // pas encore ouverte
|
|
||||||
back_solve(opt, &back[p]); // préparer
|
|
||||||
if (host_wait(opt, &back[p])) { // prêt, par ex fichier ou dispo dans dns
|
|
||||||
#if HDEBUG
|
#if HDEBUG
|
||||||
printf("ok, dns cache ready..\n");
|
printf("ok, dns cache ready..\n");
|
||||||
#endif
|
#endif
|
||||||
@@ -2232,37 +2297,9 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if HTS_XGETHOST
|
#if HTS_XGETHOST
|
||||||
// attendre que le host (ou celui du proxy) ait été résolu
|
// Resolution is synchronous inside the connect path; no pre-resolve step, so
|
||||||
// si c'est un fichier, la résolution est immédiate
|
// the host is always immediately ready.
|
||||||
// idem pour ftp://
|
int host_wait(httrackp *opt, lien_back *back) { return 1; }
|
||||||
void back_solve(httrackp * opt, lien_back * back) {
|
|
||||||
assertf(opt != NULL);
|
|
||||||
assertf(back != NULL);
|
|
||||||
if ((!strfield(back->url_adr, "file://"))
|
|
||||||
&& !strfield(back->url_adr, "ftp://")
|
|
||||||
) {
|
|
||||||
const char *a;
|
|
||||||
|
|
||||||
if (!(back->r.req.proxy.active))
|
|
||||||
a = back->url_adr;
|
|
||||||
else
|
|
||||||
a = back->r.req.proxy.name;
|
|
||||||
assertf(a != NULL);
|
|
||||||
a = jump_protocol_const(a);
|
|
||||||
if (check_hostname_dns(a)) {
|
|
||||||
hts_log_print(opt, LOG_DEBUG, "resolved: %s", a);
|
|
||||||
} else {
|
|
||||||
hts_log_print(opt, LOG_DEBUG, "failed to resolve: %s", a);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// détermine si le host a pu être résolu
|
|
||||||
int host_wait(httrackp * opt, lien_back * back) {
|
|
||||||
// Always synchronous. No more background DNS resolution
|
|
||||||
// (does not really improve performances)
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// élimine les fichiers non html en backing (anticipation)
|
// élimine les fichiers non html en backing (anticipation)
|
||||||
@@ -2449,9 +2486,15 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
back_clean(opt, cache, sback);
|
back_clean(opt, cache, sback);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Time limit exceeded past grace: abort in-flight transfers so no wait loop
|
/* Time/size limit exceeded past grace: abort in-flight transfers so no wait
|
||||||
starves (#481). FTP slots stay, their thread owns the socket. */
|
loop starves (#481, #77). FTP slots stay, their thread owns the socket. */
|
||||||
if (!back_checkmirror(opt)) {
|
if (!back_checkmirror(opt)) {
|
||||||
|
const hts_mirror_limit limit = back_mirror_limit(opt);
|
||||||
|
const char *const reason =
|
||||||
|
(limit == HTS_MIRROR_LIMIT_SIZE) ? "size limit" : "time limit";
|
||||||
|
const char *const slotmsg = (limit == HTS_MIRROR_LIMIT_SIZE)
|
||||||
|
? "Mirror Size Limit"
|
||||||
|
: "Mirror Time Out";
|
||||||
int aborted = 0;
|
int aborted = 0;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
@@ -2465,15 +2508,15 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
if (back[i].r.is_write && IS_DELAYED_EXT(back[i].url_sav))
|
if (back[i].r.is_write && IS_DELAYED_EXT(back[i].url_sav))
|
||||||
back_delayed_discard(opt, &back[i]);
|
back_delayed_discard(opt, &back[i]);
|
||||||
back[i].r.statuscode = STATUSCODE_TIMEOUT;
|
back[i].r.statuscode = STATUSCODE_TIMEOUT;
|
||||||
strcpybuff(back[i].r.msg, "Mirror Time Out");
|
strcpybuff(back[i].r.msg, slotmsg);
|
||||||
back[i].status = STATUS_READY;
|
back[i].status = STATUS_READY;
|
||||||
back_set_finished(sback, i);
|
back_set_finished(sback, i);
|
||||||
aborted++;
|
aborted++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (aborted > 0)
|
if (aborted > 0)
|
||||||
hts_log_print(opt, LOG_WARNING,
|
hts_log_print(opt, LOG_WARNING, "%s reached, %d transfer(s) aborted",
|
||||||
"time limit reached, %d transfer(s) aborted", aborted);
|
reason, aborted);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2620,7 +2663,9 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
for (i_mod = 0; i_mod < (unsigned int) back_max; i_mod++) {
|
for (i_mod = 0; i_mod < (unsigned int) back_max; i_mod++) {
|
||||||
unsigned int i = (i_mod + mod_random) % (back_max);
|
unsigned int i = (i_mod + mod_random) % (back_max);
|
||||||
|
|
||||||
if (back[i].status > 0) {
|
// winsock flags a failed connect in the exception set only: leave a
|
||||||
|
// connecting slot to the connect handler, which can still fall back
|
||||||
|
if (back[i].status > 0 && back[i].status != STATUS_CONNECTING) {
|
||||||
if (!back[i].r.is_file) { // not file..
|
if (!back[i].r.is_file) { // not file..
|
||||||
if (back[i].r.soc != INVALID_SOCKET) { // hey, you never know..
|
if (back[i].r.soc != INVALID_SOCKET) { // hey, you never know..
|
||||||
int err = FD_ISSET(back[i].r.soc, &fds_e);
|
int err = FD_ISSET(back[i].r.soc, &fds_e);
|
||||||
@@ -2634,10 +2679,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
}
|
}
|
||||||
back[i].r.soc = INVALID_SOCKET;
|
back[i].r.soc = INVALID_SOCKET;
|
||||||
back[i].r.statuscode = STATUSCODE_CONNERROR;
|
back[i].r.statuscode = STATUSCODE_CONNERROR;
|
||||||
if (back[i].status == STATUS_CONNECTING)
|
strcpybuff(back[i].r.msg, "Receive Error");
|
||||||
strcpybuff(back[i].r.msg, "Connect Error");
|
|
||||||
else
|
|
||||||
strcpybuff(back[i].r.msg, "Receive Error");
|
|
||||||
if (back[i].status == STATUS_ALIVE) { /* Keep-alive socket */
|
if (back[i].status == STATUS_ALIVE) { /* Keep-alive socket */
|
||||||
back_delete(opt, cache, sback, i);
|
back_delete(opt, cache, sback, i);
|
||||||
} else {
|
} else {
|
||||||
@@ -2670,10 +2712,11 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
gestion_timeout = 1;
|
gestion_timeout = 1;
|
||||||
|
|
||||||
// connecté?
|
// connecté?
|
||||||
dispo = FD_ISSET(back[i].r.soc, &fds_c);
|
dispo = back[i].r.soc != INVALID_SOCKET &&
|
||||||
|
(FD_ISSET(back[i].r.soc, &fds_c) ||
|
||||||
|
FD_ISSET(back[i].r.soc, &fds_e));
|
||||||
if (dispo) { // socket ready: connect() finished (ok or failed)
|
if (dispo) { // socket ready: connect() finished (ok or failed)
|
||||||
// a refused/failed connect is reported writable too; probe SO_ERROR
|
// probe SO_ERROR and, on failure, fall back to the next address
|
||||||
// and, on failure, fall back to the next address (or fail the slot)
|
|
||||||
if (connect_socket_error(back[i].r.soc) != 0) {
|
if (connect_socket_error(back[i].r.soc) != 0) {
|
||||||
if (!back_connect_next(opt, sback, i)) {
|
if (!back_connect_next(opt, sback, i)) {
|
||||||
deletehttp(&back[i].r);
|
deletehttp(&back[i].r);
|
||||||
@@ -2687,13 +2730,40 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
}
|
}
|
||||||
busy_state = 1;
|
busy_state = 1;
|
||||||
|
|
||||||
|
// socks5: tunnel to the origin before anything is written, for http
|
||||||
|
// as well as https. Skip on a reused keep-alive socket (already
|
||||||
|
// tunneled) and on the post-TLS re-entry (ssl_con set) (#563).
|
||||||
|
if (back[i].r.req.proxy.active &&
|
||||||
|
hts_proxy_is_socks(back[i].r.req.proxy.name) &&
|
||||||
|
!back[i].r.keep_alive
|
||||||
|
#if HTS_USEOPENSSL
|
||||||
|
&& back[i].r.ssl_con == NULL
|
||||||
|
#endif
|
||||||
|
) {
|
||||||
|
const int timeout = back[i].timeout > 0 ? back[i].timeout : 30;
|
||||||
|
|
||||||
|
if (!socks5_handshake(opt, &back[i].r, back[i].url_adr, timeout)) {
|
||||||
|
if (!strnotempty(back[i].r.msg))
|
||||||
|
strcpybuff(back[i].r.msg, "SOCKS5 handshake failed");
|
||||||
|
deletehttp(&back[i].r);
|
||||||
|
back[i].r.soc = INVALID_SOCKET;
|
||||||
|
back[i].r.statuscode = STATUSCODE_NON_FATAL;
|
||||||
|
back[i].status = STATUS_READY;
|
||||||
|
back_set_finished(sback, i);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#if HTS_USEOPENSSL
|
#if HTS_USEOPENSSL
|
||||||
/* SSL mode */
|
/* SSL mode */
|
||||||
if (back[i].r.ssl) {
|
if (back[i].r.ssl) {
|
||||||
int tunnel_ok = 1;
|
int tunnel_ok = 1;
|
||||||
|
|
||||||
// https via proxy: CONNECT-tunnel before TLS (#85)
|
// https via an http proxy: CONNECT-tunnel before TLS (#85); socks
|
||||||
if (back[i].r.req.proxy.active && back[i].r.ssl_con == NULL) {
|
// already carries the origin connection
|
||||||
|
if (back[i].r.req.proxy.active &&
|
||||||
|
!hts_proxy_is_socks(back[i].r.req.proxy.name) &&
|
||||||
|
back[i].r.ssl_con == NULL) {
|
||||||
const int timeout = back[i].timeout > 0 ? back[i].timeout : 30;
|
const int timeout = back[i].timeout > 0 ? back[i].timeout : 30;
|
||||||
|
|
||||||
tunnel_ok =
|
tunnel_ok =
|
||||||
@@ -2958,12 +3028,15 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
int last_errno = 0;
|
int last_errno = 0;
|
||||||
|
|
||||||
back[i].r.is_write = 1; // écrire
|
back[i].r.is_write = 1; // écrire
|
||||||
|
/* a .gz/.br/.zst saved under its own coding stays
|
||||||
|
packed on disk */
|
||||||
if (back[i].r.compressed &&
|
if (back[i].r.compressed &&
|
||||||
/* .gz are *NOT* depacked!! */
|
!hts_codec_is_archive_ext(
|
||||||
strfield(get_ext(catbuff, sizeof(catbuff), back[i].url_sav), "gz") == 0
|
hts_codec_parse(back[i].r.contentencoding),
|
||||||
&& strfield(get_ext(catbuff, sizeof(catbuff), back[i].url_sav), "tgz") == 0
|
get_ext(catbuff, sizeof(catbuff),
|
||||||
) {
|
back[i].url_sav))) {
|
||||||
if (create_back_tmpfile(opt, &back[i]) == 0) {
|
if (create_back_tmpfile(opt, &back[i], "z") ==
|
||||||
|
0) {
|
||||||
assertf(back[i].tmpfile != NULL);
|
assertf(back[i].tmpfile != NULL);
|
||||||
/* note: tmpfile is utf-8 */
|
/* note: tmpfile is utf-8 */
|
||||||
if ((back[i].r.out =
|
if ((back[i].r.out =
|
||||||
@@ -2976,6 +3049,20 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
back[i].url_sav, 1, 1,
|
back[i].url_sav, 1, 1,
|
||||||
back[i].r.notmodified);
|
back[i].r.notmodified);
|
||||||
back[i].r.compressed = 0;
|
back[i].r.compressed = 0;
|
||||||
|
/* Re-fetch over an existing file (#77 follow-up):
|
||||||
|
move the good copy aside before truncating it
|
||||||
|
so an aborted transfer can restore it. url_sav
|
||||||
|
is still written normally (file list intact).
|
||||||
|
*/
|
||||||
|
back[i].tmpfile = NULL;
|
||||||
|
if (fexist_utf8(back[i].url_sav)) {
|
||||||
|
if (create_back_tmpfile(opt, &back[i], "bak") !=
|
||||||
|
0 ||
|
||||||
|
RENAME(back[i].url_sav, back[i].tmpfile) !=
|
||||||
|
0) {
|
||||||
|
back[i].tmpfile = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
if ((back[i].r.out =
|
if ((back[i].r.out =
|
||||||
filecreate(&opt->state.strc,
|
filecreate(&opt->state.strc,
|
||||||
back[i].url_sav)) == NULL) {
|
back[i].url_sav)) == NULL) {
|
||||||
@@ -3514,6 +3601,11 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The server really sent 304 here; the *-hacks below force
|
||||||
|
// NOT_MODIFIED only after confirming the file is complete.
|
||||||
|
const hts_boolean server_sent_304 =
|
||||||
|
(back[i].r.statuscode == HTTP_NOT_MODIFIED);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Solve "false" 416 problems
|
Solve "false" 416 problems
|
||||||
*/
|
*/
|
||||||
@@ -3542,22 +3634,20 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
if (back[i].r.statuscode == 406) { // 'Not Acceptable'
|
if (back[i].r.statuscode == 406) { // 'Not Acceptable'
|
||||||
back[i].r.statuscode = HTTP_OK;
|
back[i].r.statuscode = HTTP_OK;
|
||||||
}
|
}
|
||||||
// 'do not erase already downloaded file'
|
// On update, keep the good copy on error (mask as 304); skip
|
||||||
// on an updated file
|
// resume paths so a stale-partial 416 still re-fetches.
|
||||||
// with an error : consider a 304 error
|
if (HTTP_IS_ERROR(back[i].r.statuscode) &&
|
||||||
if (!opt->delete_old) {
|
back[i].is_update && !back[i].testmode &&
|
||||||
if (HTTP_IS_ERROR(back[i].r.statuscode) && back[i].is_update
|
back[i].range_req_size == 0 && back[i].url_sav[0] &&
|
||||||
&& !back[i].testmode) {
|
fexist_utf8(back[i].url_sav)) {
|
||||||
if (back[i].url_sav[0] && fexist_utf8(back[i].url_sav)) {
|
hts_log_print(opt, LOG_DEBUG,
|
||||||
hts_log_print(opt, LOG_DEBUG,
|
"Error %d (%s) ignored on update, keeping "
|
||||||
"Error ignored %d (%s) because of 'no purge' option for %s%s",
|
"existing copy: %s%s",
|
||||||
back[i].r.statuscode, back[i].r.msg,
|
back[i].r.statuscode, back[i].r.msg,
|
||||||
back[i].url_adr, back[i].url_fil);
|
back[i].url_adr, back[i].url_fil);
|
||||||
back[i].r.statuscode = HTTP_NOT_MODIFIED;
|
back[i].r.statuscode = HTTP_NOT_MODIFIED;
|
||||||
deletehttp(&back[i].r);
|
deletehttp(&back[i].r);
|
||||||
back[i].r.soc = INVALID_SOCKET;
|
back[i].r.soc = INVALID_SOCKET;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// Various hacks to limit re-transfers when updating a mirror
|
// Various hacks to limit re-transfers when updating a mirror
|
||||||
// Force update if same size detected
|
// Force update if same size detected
|
||||||
@@ -3610,7 +3700,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
if (back[i].r.statuscode == HTTP_OK && !back[i].testmode) { // 'OK'
|
if (back[i].r.statuscode == HTTP_OK && !back[i].testmode) { // 'OK'
|
||||||
if (!is_hypertext_mime(opt, back[i].r.contenttype, back[i].url_fil)) { // not HTML
|
if (!is_hypertext_mime(opt, back[i].r.contenttype, back[i].url_fil)) { // not HTML
|
||||||
if (strnotempty(back[i].url_sav)) { // target found
|
if (strnotempty(back[i].url_sav)) { // target found
|
||||||
int size = fsize_utf8(back[i].url_sav); // target size
|
LLint size = fsize_utf8(back[i].url_sav);
|
||||||
|
|
||||||
if (size >= 0) {
|
if (size >= 0) {
|
||||||
if (back[i].r.totalsize == size) { // same size!
|
if (back[i].r.totalsize == size) { // same size!
|
||||||
@@ -3705,6 +3795,21 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Out-of-protocol 304 to a Range resume: the file is still
|
||||||
|
// partial, so drop it and refetch instead of trusting it.
|
||||||
|
if (server_sent_304 && back[i].range_req_size > 0) {
|
||||||
|
url_savename_refname_remove(opt, back[i].url_adr,
|
||||||
|
back[i].url_fil);
|
||||||
|
UNLINK(back[i].url_sav);
|
||||||
|
deletehttp(&back[i].r);
|
||||||
|
back[i].r.soc = INVALID_SOCKET;
|
||||||
|
back[i].r.statuscode = STATUSCODE_NON_FATAL;
|
||||||
|
strcpybuff(back[i].r.msg,
|
||||||
|
"Bogus 304 on resume, restarting");
|
||||||
|
back[i].status = STATUS_READY;
|
||||||
|
back_set_finished(sback, i);
|
||||||
|
}
|
||||||
|
|
||||||
/* sinon, continuer */
|
/* sinon, continuer */
|
||||||
/* if (back[i].r.soc!=INVALID_SOCKET) { // ok récupérer body? */
|
/* if (back[i].r.soc!=INVALID_SOCKET) { // ok récupérer body? */
|
||||||
// head: terminé
|
// head: terminé
|
||||||
@@ -3814,7 +3919,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
// traiter 206 (partial content)
|
// traiter 206 (partial content)
|
||||||
// xxc SI CHUNK VERIFIER QUE CA MARCHE??
|
// xxc SI CHUNK VERIFIER QUE CA MARCHE??
|
||||||
if (back[i].r.statuscode == 206) { // on nous envoie un morceau (la fin) coz une partie sur disque!
|
if (back[i].r.statuscode == 206) { // on nous envoie un morceau (la fin) coz une partie sur disque!
|
||||||
off_t sz = fsize_utf8(back[i].url_sav);
|
LLint sz = fsize_utf8(back[i].url_sav);
|
||||||
/* RFC 7233: resume at the server's Content-Range start,
|
/* RFC 7233: resume at the server's Content-Range start,
|
||||||
not the offset we requested; a server may resume
|
not the offset we requested; a server may resume
|
||||||
earlier and appending the overlap duplicates bytes
|
earlier and appending the overlap duplicates bytes
|
||||||
@@ -3823,7 +3928,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
const hts_boolean range_ok =
|
const hts_boolean range_ok =
|
||||||
back[i].r.crange > 0 && resume >= 0 &&
|
back[i].r.crange > 0 && resume >= 0 &&
|
||||||
resume <= (LLint) sz &&
|
resume <= (LLint) sz &&
|
||||||
back[i].r.crange_end + 1 == back[i].r.crange &&
|
back[i].r.crange_end == back[i].r.crange - 1 &&
|
||||||
(back[i].r.totalsize < 0 ||
|
(back[i].r.totalsize < 0 ||
|
||||||
back[i].r.totalsize ==
|
back[i].r.totalsize ==
|
||||||
back[i].r.crange_end - resume + 1);
|
back[i].r.crange_end - resume + 1);
|
||||||
@@ -3852,8 +3957,9 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
// drop bytes past the resume point; a silent
|
// drop bytes past the resume point; a silent
|
||||||
// failure could leave a stale tail, so on error
|
// failure could leave a stale tail, so on error
|
||||||
// drop the partial and refetch the whole file
|
// drop the partial and refetch the whole file
|
||||||
if (HTS_FTRUNCATE(back[i].r.out,
|
/* not (off_t): 32-bit on MSVC, wrapping a resume
|
||||||
(off_t) resume) != 0) {
|
past 2GB */
|
||||||
|
if (HTS_FTRUNCATE(back[i].r.out, resume) != 0) {
|
||||||
fclose(back[i].r.out);
|
fclose(back[i].r.out);
|
||||||
back[i].r.out = NULL;
|
back[i].r.out = NULL;
|
||||||
url_savename_refname_remove(
|
url_savename_refname_remove(
|
||||||
@@ -3865,7 +3971,9 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
"Can not truncate partial file, "
|
"Can not truncate partial file, "
|
||||||
"restarting");
|
"restarting");
|
||||||
} else {
|
} else {
|
||||||
fseeko(back[i].r.out, (off_t) resume, SEEK_SET);
|
/* not (off_t): 32-bit on MSVC, truncating a
|
||||||
|
resume past 2GB */
|
||||||
|
fseeko(back[i].r.out, resume, SEEK_SET);
|
||||||
/* create a temporary reference file in case of
|
/* create a temporary reference file in case of
|
||||||
* broken mirror */
|
* broken mirror */
|
||||||
if (back_serialize_ref(opt, &back[i]) != 0) {
|
if (back_serialize_ref(opt, &back[i]) != 0) {
|
||||||
@@ -3892,11 +4000,20 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
|||||||
if (fp) {
|
if (fp) {
|
||||||
LLint alloc_mem = resume + 1;
|
LLint alloc_mem = resume + 1;
|
||||||
|
|
||||||
if (back[i].r.totalsize >= 0)
|
// Bound the in-memory buffer to a 32-bit size (real
|
||||||
|
// in-RAM resources are far smaller); a hostile
|
||||||
|
// Content-Length that would overflow the add or the
|
||||||
|
// (size_t) cast is dropped and refetched instead.
|
||||||
|
if (back[i].r.totalsize > INT32_MAX - alloc_mem) {
|
||||||
|
url_savename_refname_remove(opt, back[i].url_adr,
|
||||||
|
back[i].url_fil);
|
||||||
|
UNLINK(back[i].url_sav);
|
||||||
|
alloc_mem = -1;
|
||||||
|
} else if (back[i].r.totalsize >= 0)
|
||||||
alloc_mem += back[i].r.totalsize; // AJOUTER RESTANT!
|
alloc_mem += back[i].r.totalsize; // AJOUTER RESTANT!
|
||||||
if (deleteaddr(&back[i].r)
|
if (alloc_mem >= 0 && deleteaddr(&back[i].r) &&
|
||||||
&& (back[i].r.adr =
|
(back[i].r.adr =
|
||||||
(char *) malloct((size_t) alloc_mem))) {
|
(char *) malloct((size_t) alloc_mem))) {
|
||||||
back[i].r.size = resume;
|
back[i].r.size = resume;
|
||||||
if (back[i].r.totalsize >= 0)
|
if (back[i].r.totalsize >= 0)
|
||||||
back[i].r.totalsize += resume; // -> full size
|
back[i].r.totalsize += resume; // -> full size
|
||||||
@@ -4178,38 +4295,46 @@ static int back_maxtime_grace(const int maxtime) {
|
|||||||
return maximum(5, minimum(30, maxtime / 10));
|
return maximum(5, minimum(30, maxtime / 10));
|
||||||
}
|
}
|
||||||
|
|
||||||
int back_checkmirror(httrackp * opt) {
|
/* Bytes the smooth stop may overrun before in-flight transfers are aborted.
|
||||||
// Check max size
|
No floor (unlike the time grace): a size overrun should abort promptly. */
|
||||||
if ((opt->maxsite > 0) && (HTS_STAT.stat_bytes >= opt->maxsite)) {
|
static LLint back_maxsize_grace(const LLint maxsite) { return maxsite / 10; }
|
||||||
if (!opt->state.stop) { /* not yet stopped */
|
|
||||||
hts_log_print(opt, LOG_ERROR,
|
/* Which cap has overrun its grace and must hard-stop the mirror (#77, #481).
|
||||||
"More than " LLintP
|
-M measures received volume (HTS_TOTAL_RECV), not saved 200-only stat_bytes
|
||||||
" bytes have been transferred.. giving up",
|
which undercounts redirect/error-heavy crawls (#520). */
|
||||||
(LLint) opt->maxsite);
|
static hts_mirror_limit back_mirror_limit(httrackp *opt) {
|
||||||
/* cancel mirror smoothly */
|
if (opt->maxsite > 0 && HTS_STAT.HTS_TOTAL_RECV >= opt->maxsite &&
|
||||||
hts_request_stop(opt, 0);
|
HTS_STAT.HTS_TOTAL_RECV - opt->maxsite >=
|
||||||
}
|
back_maxsize_grace(opt->maxsite))
|
||||||
return 1; /* don'k break mirror too sharply for size limits, but stop requested */
|
return HTS_MIRROR_LIMIT_SIZE;
|
||||||
/*return 0;
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
// Check max time
|
|
||||||
if (opt->maxtime > 0) {
|
if (opt->maxtime > 0) {
|
||||||
const TStamp elapsed = time_local() - HTS_STAT.stat_timestart;
|
const TStamp elapsed = time_local() - HTS_STAT.stat_timestart;
|
||||||
|
|
||||||
if (elapsed >= opt->maxtime) {
|
if (elapsed >= opt->maxtime &&
|
||||||
if (!opt->state.stop) { /* not yet stopped */
|
elapsed - opt->maxtime >= back_maxtime_grace(opt->maxtime))
|
||||||
hts_log_print(opt, LOG_ERROR, "More than %d seconds passed.. giving up",
|
return HTS_MIRROR_LIMIT_TIME;
|
||||||
opt->maxtime);
|
|
||||||
/* cancel mirror smoothly */
|
|
||||||
hts_request_stop(opt, 0);
|
|
||||||
}
|
|
||||||
/* smooth stop starved past the grace period: stop waiting (#481) */
|
|
||||||
if (elapsed - opt->maxtime >= back_maxtime_grace(opt->maxtime))
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return 1; /* Ok, go on */
|
return HTS_MIRROR_LIMIT_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
int back_checkmirror(httrackp *opt) {
|
||||||
|
/* request a smooth stop the first time each cap is reached */
|
||||||
|
if (opt->maxsite > 0 && HTS_STAT.HTS_TOTAL_RECV >= opt->maxsite &&
|
||||||
|
!opt->state.stop) {
|
||||||
|
hts_log_print(opt, LOG_ERROR,
|
||||||
|
"More than " LLintP
|
||||||
|
" bytes have been transferred.. giving up",
|
||||||
|
(LLint) opt->maxsite);
|
||||||
|
hts_request_stop(opt, 0);
|
||||||
|
}
|
||||||
|
if (opt->maxtime > 0 && !opt->state.stop &&
|
||||||
|
(time_local() - HTS_STAT.stat_timestart) >= opt->maxtime) {
|
||||||
|
hts_log_print(opt, LOG_ERROR, "More than %d seconds passed.. giving up",
|
||||||
|
opt->maxtime);
|
||||||
|
hts_request_stop(opt, 0);
|
||||||
|
}
|
||||||
|
/* hard stop once a cap overruns its grace (callers must stop waiting) */
|
||||||
|
return back_mirror_limit(opt) == HTS_MIRROR_LIMIT_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// octets transférés + add
|
// octets transférés + add
|
||||||
|
|||||||
@@ -138,12 +138,11 @@ LLint back_transferred(LLint add, struct_back * sback);
|
|||||||
|
|
||||||
// hostback
|
// hostback
|
||||||
#if HTS_XGETHOST
|
#if HTS_XGETHOST
|
||||||
void back_solve(httrackp * opt, lien_back * sback);
|
|
||||||
int host_wait(httrackp * opt, lien_back * sback);
|
int host_wait(httrackp * opt, lien_back * sback);
|
||||||
#endif
|
#endif
|
||||||
int back_checksize(httrackp * opt, lien_back * eback, int check_only_totalsize);
|
int back_checksize(httrackp * opt, lien_back * eback, int check_only_totalsize);
|
||||||
/* Enforce -M/-E quotas: requests a smooth stop when reached; returns 0 once
|
/* Enforce -M/-E quotas: smooth-stops when reached; returns 0 once the -M cap
|
||||||
the -E deadline overran its grace period (callers must stop waiting). */
|
or -E deadline overruns its grace period (callers must stop waiting). */
|
||||||
int back_checkmirror(httrackp * opt);
|
int back_checkmirror(httrackp * opt);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user