Merged revisions 878 via svnmerge from

http://proliant/svn/httrack/trunk ........ r878 | roche | 2013-09-24 07:51:21 +0200 (mar., 24 sept. 2013) | 3 lines Do not depend anymore on automake1.9, but automake (see http://lists.debian.org/debian-devel/2013/05/msg01459.html) ........
3.47.27
2026-05-17 16:36:07 +03:00 · 2013-09-24 05:53:16 +00:00 · 2013-09-15 09:09:28 +00:00 · 2013-09-15 08:33:55 +00:00 · 2013-09-15 08:33:31 +00:00 · 2013-09-14 09:38:10 +00:00
104 changed files with 1033 additions and 1013 deletions
--- a/0
+++ b/0
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,8 +54,7 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

 Welcome to HTTrack Website Copier!

--- a/20
+++ b/20
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for httrack 3.47.19.
+# Generated by GNU Autoconf 2.69 for httrack 3.47.27.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.47.19'
-PACKAGE_STRING='httrack 3.47.19'
+PACKAGE_VERSION='3.47.27'
+PACKAGE_STRING='httrack 3.47.27'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'

@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures httrack 3.47.19 to adapt to many kinds of systems.
+\`configure' configures httrack 3.47.27 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1407,7 +1407,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.47.19:";;
+     short | recursive ) echo "Configuration of httrack 3.47.27:";;
   esac
  cat <<\_ACEOF

@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-httrack configure 3.47.19
+httrack configure 3.47.27
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2248,7 +2248,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by httrack $as_me 3.47.19, which was
+It was created by httrack $as_me 3.47.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -3067,7 +3067,7 @@ fi

 # Define the identity of the package.
 PACKAGE='httrack'
- VERSION='3.47.19'
+ VERSION='3.47.27'


 cat >>confdefs.h <<_ACEOF
@@ -17087,7 +17087,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by httrack $as_me 3.47.19, which was
+This file was extended by httrack $as_me 3.47.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -17154,7 +17154,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-httrack config.status 3.47.19
+httrack config.status 3.47.27
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([httrack], [3.47.19], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.47.27], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
@@ -11,7 +11,7 @@ AC_PREREQ(2.50)
 AC_PROG_CC
 AC_PROG_CXX
 AC_STDC_HEADERS
-AM_PROG_LIBTOOL
+LT_INIT
 AC_PROG_LN_S

 # Export LD_LIBRARY_PATH name or equivalent.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,52 @@
+httrack (3.47.27-1) unstable; urgency=low
+
+  * Updated to 3.47.27 (3.47-27)
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 15 Sep 2013 10:59:50 +0200
+
+httrack (3.47.26-1) unstable; urgency=low
+
+  * Updated to 3.47.26 (3.47-26)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 06 Sep 2013 21:51:28 +0200
+
+httrack (3.47.25-1) unstable; urgency=low
+
+  * Updated to 3.47.25 (3.47-25)
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 01 Sep 2013 16:47:55 +0200
+
+httrack (3.47.24-1) unstable; urgency=low
+
+  * Updated to 3.47.24 (3.47-24)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 23 Aug 2013 09:45:34 +0200
+
+httrack (3.47.23-1) unstable; urgency=low
+
+  * Updated to 3.47.23 (3.47-23)
+
+ -- Xavier Roche <xavier@debian.org>  Sat, 17 Aug 2013 12:15:37 +0200
+
+httrack (3.47.22-1) unstable; urgency=low
+
+  * Updated to 3.47.22 (3.47-22)
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 11 Aug 2013 21:50:49 +0200
+
+httrack (3.47.21-1) unstable; urgency=low
+
+  * Updated to 3.47.21 (3.47-21)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 05 Jul 2013 20:12:25 +0200
+
+httrack (3.47.20-1) unstable; urgency=low
+
+  * Updated to 3.47.20 (3.47-20)
+    Mostly typos, and lintian fixes
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 28 Jun 2013 19:46:33 +0200
+
 httrack (3.47.19-3) unstable; urgency=low

  * Updated to 3.47.19 (3.47-19)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 8.0.0), zlib1g-dev, libssl-dev, autotools-dev, autoconf, automake1.9, libtool
+Build-Depends: debhelper (>= 8.0.0), zlib1g-dev, libssl-dev, autotools-dev, autoconf, automake, libtool
 Homepage: http://www.httrack.com

 Package: httrack
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,10 @@ Upstream author: Xavier Roche <roche@httrack.com>

 Copyright: 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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.

 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL file.
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
-extend-diff-ignore="(^|/)(config\.sub|config\.guess|test-driver|Makefile)$"
+extend-diff-ignore="(^|/)(config\.sub|config\.guess|test-driver|Makefile|.*\.in|aclocal\.m4|configure)$"
--- a/history.txt
+++ b/history.txt
@@ -4,7 +4,7 @@ HTTrack Website Copier release history:

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

-3.47-19
+3.47-24
 + New: support for IDNA / RFC 3492 (punycode) handling
 + New: openssl is no longer dynamically probed at stratup, but dynamically linked
 + Fixed: random closing of files/sockets, leading to "zip_zipWriteInFileInZip_failed" assertion, "bogus state" messages, or random garbage in downloaded files
@@ -34,6 +34,20 @@ This file lists all changes and fixes that have been made for HTTrack.
 + Fixed: more windows-specific fixes regarding 260-character path limit
 + Fixed: escaping issue in top index
 + Fixed: Linux build cleanup (gentoo patches merge, lintian fixes et al.)
+ Fixed: Fixed div-by-zero when specifying more than 1000 connections per seconds (probably not very common)
+ Fixed: Mishandling of '+' in URLs introduced in 3.47-15 (sarclaudio)
+ Fixed: "Wildcard domains in cookies do not match" (alexei dot co at gmail dot com )
+ Fixed: buggy referer while parsing: the referer of all links in the page is the current page being parsed, NOT the parent page. (alexei dot com at gmail dot com)
+ Fixed: Russian translation fixes by Oleg Komarov (komoleg at mail dot ru)
+ New: Added .torrent => application/x-bittorrent built-in MIME type (alexei dot co at gmail dot com)
+ Fixed: unable to download an URL whose filename embeds special characters such as # (lugusto)
+ New: Croatian translation by Dominko Aždajić (domazd at mail dot ru)
+ Fixed: url-escaping regression introduced in the previous subrelease
+ Fixed: content-disposition NOT taken in account (Stephan Matthiesen)
+ Fixed: buggy DNS cache leading to random crashes
+ Fixed: fixed logging not displaying robots.txt rules limits by default
+ Fixed: license year and GPL link, libtool fixes (cicku)
+ Fixed: Keywords field in desktop files (Sebastian Pipping)

 3.46-1
 * New: Unicode filenames handling
--- a/html/fcguide.html
+++ b/html/fcguide.html
@@ -375,7 +375,7 @@ example: httrack --continue
 continues a mirror in the current folder

 HTTrack version 3.03BETAo4 (compiled Jul  1 2001)
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors
 [compiled: Linux linux 2.2.18 #9 SMP Sat Dec 30 09:51:39 CET 2000 i586 unknown]

 </pre>
--- a/html/httrack.man.html
+++ b/html/httrack.man.html
@@ -73,12 +73,12 @@ url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
 <b>&minus;%mN,
 &minus;&minus;max&minus;mms&minus;time[=N]</b> ] [
 <b>&minus;cN, &minus;&minus;sockets[=N]</b> ] [
-<b>&minus;TN, &minus;&minus;timeout</b> ] [ <b>&minus;RN,
-&minus;&minus;retries[=N]</b> ] [ <b>&minus;JN,
-&minus;&minus;min&minus;rate[=N]</b> ] [ <b>&minus;HN,
-&minus;&minus;host&minus;control[=N]</b> ] [ <b>&minus;%P,
-&minus;&minus;extended&minus;parsing[=N]</b> ] [
-<b>&minus;n, &minus;&minus;near</b> ] [ <b>&minus;t,
+<b>&minus;TN, &minus;&minus;timeout[=N]</b> ] [
+<b>&minus;RN, &minus;&minus;retries[=N]</b> ] [
+<b>&minus;JN, &minus;&minus;min&minus;rate[=N]</b> ] [
+<b>&minus;HN, &minus;&minus;host&minus;control[=N]</b> ] [
+<b>&minus;%P, &minus;&minus;extended&minus;parsing[=N]</b> ]
+[ <b>&minus;n, &minus;&minus;near</b> ] [ <b>&minus;t,
 &minus;&minus;test</b> ] [ <b>&minus;%L,
 &minus;&minus;list</b> ] [ <b>&minus;%S,
 &minus;&minus;urllist</b> ] [ <b>&minus;NN,
@@ -518,7 +518,7 @@ control:</b></p>


 <p>timeout, number of seconds after a non&minus;responding
-link is shutdown (&minus;&minus;timeout)</p></td></tr>
+link is shutdown (&minus;&minus;timeout[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -2311,13 +2311,13 @@ other information you deem necessary.</p>


 <p style="margin-left:11%; margin-top: 1em">Copyright (C)
-Xavier Roche and other contributors</p>
+1998-2013 Xavier Roche and other contributors</p>

 <p style="margin-left:11%; margin-top: 1em">This program is
-free software; you can redistribute it and/or modify it
+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 any later version.</p>
+published by the Free Software Foundation, either version 3
+of the License, or (at your option) any later version.</p>

 <p style="margin-left:11%; margin-top: 1em">This program is
 distributed in the hope that it will be useful, but WITHOUT
@@ -2327,9 +2327,8 @@ GNU General Public License for more details.</p>

 <p style="margin-left:11%; margin-top: 1em">You should have
 received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.</p>
+this program. If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</p>

 <h2>AVAILABILITY
 <a name="AVAILABILITY"></a>
--- a/html/server/div/WebHTTrack-Websites.desktop
+++ b/html/server/div/WebHTTrack-Websites.desktop
@@ -5,5 +5,6 @@ Categories=Network;
 Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
+Keywords=browse mirrored;
 Exec=webhttrack browse
 Icon=httrack
--- a/html/server/div/WebHTTrack.desktop
+++ b/html/server/div/WebHTTrack.desktop
@@ -5,5 +5,6 @@ Categories=Network;
 Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
+Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation;
 Exec=webhttrack
 Icon=httrack
--- a/lang.def
+++ b/lang.def
@@ -54,6 +54,8 @@ Bulgarian
 LANGUAGE_27
 Finnish
 LANGUAGE_28
+Croatian
+LANGUAGE_29
 LANGUAGE_NAME
 LANGUAGE_NAME
 LANGUAGE_FILE
--- a/lang/Russian.txt
+++ b/lang/Russian.txt
@@ -11,7 +11,7 @@ windows-1251
 LANGUAGE_WINDOWSID
 Russian
 OK
-LANGUAGE_WINDOWSID
+OK
 Cancel
 Îòìåíà
 Exit
@@ -89,7 +89,7 @@ cgi\r\n
 cgi-bin\r\nWill find links with folder name matching whole 'cgi-bin' string (but not cgi-bin-2, for example)
 cgi-bin\r\nÎòëîâèò àäðåñà, ñîäåðæàùèå êàòàëîã 'cgi-bin' (íî íå cgi-bin-2, íàïðèìåð)
 someweb.com\r\nWill find links with matching sub-string such as www.someweb.com, private.someweb.com etc.
-someweb.com\r\nÎòëîâèò òàêèå ëèíêè, êàê www.someweb.com, private.someweb.com è ò.ï..
+someweb.com\r\nÎòëîâèò òàêèå ëèíêè, êàê www.someweb.com, private.someweb.com è ò.ï.
 someweb\r\nWill find links with matching folder sub-string such as www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.
 someweb\r\nÎòëîâèò àäðåñà òèïà www.someweb.com, www.someweb.edu, private.someweb.otherweb.com è ò.ä.\r\n
 www.someweb.com\r\nWill find links matching whole 'www.someweb.com' sub-string (but not links such as private.someweb.com/..)
@@ -155,7 +155,7 @@ Unable to initialize the OLE system
 WinHTTrack could not find any interrupted download file cache in the specified folder!
 Â óêàçàííîì êàòàëîãå WinHTTrack íå ìîæåò íàéòè íè îäíîãî êýøà ïðåðâàííîé çàêà÷êè!
 Could not connect to provider
-Íå âîçìîæíî ñîåäèíèòüñÿ ñ ïðîâàéäåðîì
+Íåâîçìîæíî ñîåäèíèòüñÿ ñ ïðîâàéäåðîì
 receive
 ïîëó÷åíèå
 request
@@ -169,7 +169,7 @@ ready
 error
 îøèáêà
 Receiving files..
-Ïîëó÷àåì ôàéëû
+Ïîëó÷àåì ôàéëû..
 Parsing HTML file..
 Ðàçáîð HTML ôàéëà...
 Purging files..
@@ -179,13 +179,13 @@ Loading cache in progress..
 Parsing HTML file (testing links)..
 Àíàëèçèðóåì HTML ôàéë (ïðîâåðÿåì ëèíêè)...
 Pause - Toggle [Mirror]/[Pause download] to resume operation
-Îñòàíîâëåíî (äëÿ ïðîäîëæåíèÿ âûáåðåòå [Çåðêàëî]/[Ïðèîñòàíîâèòü çàêà÷êó] )
+Îñòàíîâëåíî (äëÿ ïðîäîëæåíèÿ âûáåðèòå [Çåðêàëî]/[Ïðèîñòàíîâèòü çàêà÷êó])
 Finishing pending transfers - Select [Cancel] to stop now!
 Çàâåðøàþòñÿ îòëîæåííûå çàêà÷êè - ÷òîáû ïðåðâàòü, íàæìèòå Cancel!
 scanning
 ñêàíèðóåì
 Waiting for scheduled time..
-Îæèäàåì çàäàííîå âðåìÿ íà÷àëà
+Îæèäàåì çàäàííîå âðåìÿ íà÷àëà..
 Connecting to provider
 Ñîåäèíÿåìñÿ ñ ïðîâàéäåðîì
 [%d seconds] to go before start of operation
@@ -197,43 +197,43 @@ Site mirroring finished!
 A problem occured during the mirroring operation\n
 Â ïðîöåññå çàêà÷êè ïðîèçîøëà îøèáêà\n
 \nDuring:\n
-Â òå÷åíèè:\n
+Â òå÷åíèå:\n
 \nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
 Â ñëó÷àå íåîáõîäèìîñòè, ñìîòðè ëîã ôàéë.\n\nÄëÿ âûõîäà èç WinHTTrack íàæìèòå êíîïêó OK.\n\nÑïàñèáî çà èñïîëüçîâàíèå WinHTTrack!
 Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
 Ñîçäàíèå çåðêàëà çàâåðøåíî.\nÄëÿ âûõîäà èç ïðîãðàììû íàæìèòå êíîïêó OK.\nÄëÿ ïðîâåðêè óñïåøíîñòè çàêà÷êè ïîñìîòðèòå ëîã ôàéë(û).\n\nÑïàñèáî çà èñïîëüçîâàíèå WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * ÇÀÊÀ×ÊÀ ÏÐÅÐÂÀÍÀ! * *\r\nÂðåìåííûé êýø, ñîçäàííûé âî âðåìÿ òåêóùåé ñåññèé, ñîäåðæèò äàííûå, çàãðóæåííûå òîëüêî âî âðåìÿ äàííîé ñåññèè è ïîòðåáóåòñÿ òîëüêî â ñëó÷àå âîçîáíîâëåíèÿ çàêà÷êè.\r\nÎäíàêî, ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ. Åñëè âû íå õîòèòå ïîòåðÿòü ýòè äàííûå, âàì íóæíî óäàëèòü òåêóùèé êýø è âîçîáíîâèòü ïðåäûäóùèé.\r\n(Ýòî ìîæíî ëåãêî ñäåëàòü ïðÿìî çäåñü, óäàëèâ ôàéëû hts-cache/new.]\r\n\r\nÑ÷èòàåò-ëè âû, ÷òî ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ, è õîòèòå ëè âû âîññòàíîâèòü åãî?
+* * ÇÀÊÀ×ÊÀ ÏÐÅÐÂÀÍÀ! * *\r\nÂðåìåííûé êýø, ñîçäàííûé âî âðåìÿ òåêóùåé ñåññèé, ñîäåðæèò äàííûå, çàãðóæåííûå òîëüêî âî âðåìÿ äàííîé ñåññèè è ïîòðåáóåòñÿ òîëüêî â ñëó÷àå âîçîáíîâëåíèÿ çàêà÷êè.\r\nÎäíàêî, ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ. Åñëè âû íå õîòèòå ïîòåðÿòü ýòè äàííûå, âàì íóæíî óäàëèòü òåêóùèé êýø è âîçîáíîâèòü ïðåäûäóùèé.\r\n(Ýòî ìîæíî ëåãêî ñäåëàòü ïðÿìî çäåñü, óäàëèâ ôàéëû hts-cache/new.]\r\n\r\nÑ÷èòàåòå ëè âû, ÷òî ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ, è õîòèòå ëè âû âîññòàíîâèòü åãî?
 * * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * ÎØÈÁÊÀ! * *\r\nÒåêóùåå çåðêàëî - ïóñòî. Åñëè ýòî áûëî îáíîâëåíèå, ïðåäûäóùàÿ âåðñèÿ çåðêàëà âîññòàíîâëåíà.\r\nÏðè÷èíà: ïåðâàÿ ñòðàíèöà(û) èëè íå íàéäåíà, èëè áûëè ïðîáëåìû ñ ñîåäèíåíèåì.\r\n=> Óáåäèòåñü, ÷òî âåáñàéò âñå-åùå ñóùåñòâóåò, è/èëè ïðîâåðüòå  óñòàíîâêè ïðîêñè-ñåðâåðà! <=
+* * ÎØÈÁÊÀ! * *\r\nÒåêóùåå çåðêàëî - ïóñòî. Åñëè ýòî áûëî îáíîâëåíèå, ïðåäûäóùàÿ âåðñèÿ çåðêàëà âîññòàíîâëåíà.\r\nÏðè÷èíà: ïåðâàÿ ñòðàíèöà(û) èëè íå íàéäåíà, èëè áûëè ïðîáëåìû ñ ñîåäèíåíèåì.\r\n=> Óáåäèòåñü, ÷òî âåáñàéò âñå åùå ñóùåñòâóåò, è/èëè ïðîâåðüòå óñòàíîâêè ïðîêñè-ñåðâåðà! <=
 \n\nTip: Click [View log file] to see warning or error messages
-\nÏîäñêàçêà:Äëÿ ïðîñìîòðà ñîîáùåíèé îá îøèáêàõ è ïðåäóïðåæäåíèé íàæìèòå [Ïðîñìîòð ëîã ôàéëà]
+\nÏîäñêàçêà: Äëÿ ïðîñìîòðà ñîîáùåíèé îá îøèáêàõ è ïðåäóïðåæäåíèé íàæìèòå [Ïðîñìîòð ëîã ôàéëà]
 Error deleting a hts-cache/new.* file, please do it manually
-Îøèáêà óäàëåíèÿ ôàéëà hts-cache/new.* , ïîæàëóéñòà, óäàëèòå åãî ðó÷êàìè.\r\n
+Îøèáêà óäàëåíèÿ ôàéëà hts-cache/new.* , ïîæàëóéñòà, óäàëèòå åãî âðó÷íóþ.\r\n
 Do you really want to quit WinHTTrack Website Copier?
 Âû äåéñòâèòåëüíî õîòèòå âûéòè èç WinHTTrack?
 - Mirroring Mode -\n\nEnter address(es) in URL box
- Ìîäà çåðêàëèçàöèè -\n\nÂâåäèòå àäðåñ(à) â ïîëå URL.
+- Ðåæèì çåðêàëèðîâàíèÿ -\n\nÂâåäèòå àäðåñ(à) â ïîëå URL.
 - Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
- Èíòåðàêòèâíàÿ ìîäà - Ìàñòåð ñîçäàíèÿ çåðêàëà (áóäóò çàäàíû âîïðîñû) -\n\nÂâåäèòå àäðåñ(à) â ïîëå URL.
+- Èíòåðàêòèâíûé ðåæèì - Ìàñòåð ñîçäàíèÿ çåðêàëà (áóäóò çàäàíû âîïðîñû) -\n\nÂâåäèòå àäðåñ(à) â ïîëå URL.
 - File Download Mode -\n\nEnter file address(es) in URL box
- Ìîäà çàêà÷êè îòäåëüíûõ ôàéëîâ -\n\nÂâåäèòå àäðåñ(à) ôàéëîâ â ïîëå URL.
+- Ðåæèì çàêà÷êè îòäåëüíûõ ôàéëîâ -\n\nÂâåäèòå àäðåñ(à) ôàéëîâ â ïîëå URL.
 - Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
- Ìîäà òåñòèðîâàíèÿ ëèíêîâ -\n\nÂâåäèòå àäðåñ(à) ñòðàíèö, ñîäåðæàùèõ URL'û, êîòîðûå âû õîòèòå ïðîòåñòèðîâàòü.
+- Ðåæèì òåñòèðîâàíèÿ ëèíêîâ -\n\nÂâåäèòå àäðåñ(à) ñòðàíèö, ñîäåðæàùèõ URL'û, êîòîðûå âû õîòèòå ïðîòåñòèðîâàòü.
 - Update Mode -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
- Ìîäà îáíîâëåíèÿ -\n\nÏðîâåðüòå àäðåñ(à) â ïîëå URL, çàòåì íàæìèòå êíîïêó 'ÄÀËÅÅ' è ïðîâåðüòå ïàðàìåòðû.
+- Ðåæèì îáíîâëåíèÿ -\n\nÏðîâåðüòå àäðåñ(à) â ïîëå URL, çàòåì íàæìèòå êíîïêó 'ÄÀËÅÅ' è ïðîâåðüòå ïàðàìåòðû.
 - Resume Mode (Interrupted Operation) -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
- Ìîäà ïðîäîëæåíèÿ ðàíåå ïðåðâàííîãî ñîçäàíèÿ çåðêàëà -\n\nÏðîâåðüòå àäðåñ(à) â ïîëå URL, çàòåì íàæìèòå êíîïêó 'ÄÀËÅÅ' è ïðîâåðüòå ïàðàìåòðû.
+- Ðåæèì ïðîäîëæåíèÿ ðàíåå ïðåðâàííîãî ñîçäàíèÿ çåðêàëà -\n\nÏðîâåðüòå àäðåñ(à) â ïîëå URL, çàòåì íàæìèòå êíîïêó 'ÄÀËÅÅ' è ïðîâåðüòå ïàðàìåòðû.
 Log files Path
 Ïóòü ê ëîã ôàéëàì
 Path
 Ïóòü
 - Links List Mode -\n\nUse URL box to enter address(es) of page(s) containing links to mirror
-Ìîäà ñîçäàíèÿ çåðêàë èç ñïèñêà-\n\nÂ ïîëå URL çàïîëíèòå àäðåñà ñòðàíèö, ñîäåðæàùèõ URL'û, êîòîðûå âû õîòèòå çåðêàëèçîâàòü.
+Ðåæèì ñîçäàíèÿ çåðêàë èç ñïèñêà-\n\nÂ ïîëå URL ââåäèòå àäðåñ(à) ñòðàíèö(û) ñ ëèíêàìè äëÿ ñîçäàíèÿ çåðêàëà.
 New project / Import?
 Íîâûé ïðîåêò / èìïîðòèðîâàòü?
 Choose criterion
-Âûáåðåòå äåéñòâèå
+Âûáåðèòå äåéñòâèå
 Maximum link scanning depth
 Ìàêñ.ãëóáèíà ñêàíèðîâàíèÿ
 Enter address(es) here
@@ -251,11 +251,11 @@ Use standard HTTP proxy as FTP proxy
 Path
 Ïóòü
 Select Path
-Âûáåðåòå ïóòü
+Âûáåðèòå ïóòü
 Path
 Ïóòü
 Select Path
-Âûáåðåòå ïóòü
+Âûáåðèòå ïóòü
 Quit WinHTTrack Website Copier
 Âûéòè èç WinHTTrack Website Copier
 About WinHTTrack
@@ -303,7 +303,7 @@ Define..
 Set options..
 Çàäàòü ïàðàìåòðû...
 Preferences and mirror options:
-Íàñòðîéêè ïàðàìåòðîâ çàêà÷êè::
+Íàñòðîéêè ïàðàìåòðîâ çàêà÷êè:
 Project name
 Íàçâàíèå ïðîåêòà
 Add a URL...
@@ -369,7 +369,7 @@ Do not update zero size or user-erased files
 Create a Start Page
 Ñîçäàòü íà÷àëüíóþ ñòðàíèöó
 Create a word database of all html pages
-óÏÚÄÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÓÌÏ×, ÓÏÄÅÒÖÁÝÉÈÓÑ × html-ÓÔÒÁÎÉÃÁÈ
+Ñîçäàòü áàçó äàííûõ ñëîâ, ñîäåðæàùèõñÿ â html-ñòðàíèöàõ
 Create error logging and report files
 Ñîçäàòü ëîã ôàéëû ñ èíôîðìàöèåé î ðàáîòå è îøèáêàõ
 Generate DOS 8-3 filenames ONLY
@@ -379,41 +379,41 @@ Generate ISO9660 filenames ONLY for CDROM medias
 Do not create HTML error pages
 Íå çàïèñûâàòü ôàéëû html-îøèáîê
 Select file types to be saved to disk
-Âûáåðåòå òèïû ôàéëîâ, ñîõðàíÿåìûõ íà äèñêå
+Âûáåðèòå òèïû ôàéëîâ, ñîõðàíÿåìûõ íà äèñêå
 Select parsing direction
-Âûáåðåòå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
+Âûáåðèòå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
 Select global parsing direction
-Âûáåðåòå ãëîáàëüíîå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
+Âûáåðèòå ãëîáàëüíîå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
 Setup URL rewriting rules for internal links (downloaded ones) and external links (not downloaded ones)
 Óñòàíîâèòü ïðàâèëà ïåðåèìåíîâàíèÿ ëèíêîâ êàê äëÿ âíóòðåííèõ (çàêà÷èâàåìûõ) òàê è äëÿ âíåøíèõ (íå çàãðóæàåìûõ) àäðåñîâ
 Max simultaneous connections
-Maêñèìàëüíîå ÷èñëî ñîåäèíåíèé
+Ìàêñèìàëüíîå ÷èñëî ñîåäèíåíèé
 File timeout
-Maêñèìàëüíîå âðåìÿ íå àêòèâíîñòè çàêà÷êè
+Ìàêñèìàëüíîå âðåìÿ íå àêòèâíîñòè çàêà÷êè
 Cancel all links from host if timeout occurs
 Â ñëó÷àå ïðåâûøåíèÿ âðåìåíè îæèäàíèÿ îòìåíèòü âñå ëèíêè ñ äàííîãî õîñòà
 Minimum admissible transfer rate
-Mèíèìàëüíî äîïóñòèìàÿ ñêîðîñòü çàêà÷êè
+Ìèíèìàëüíî äîïóñòèìàÿ ñêîðîñòü çàêà÷êè
 Cancel all links from host if too slow
 Â ñëó÷àå, åñëè õîñò ñëèøêîì ìåäëåííûé, îòìåíèòü âñå ëèíêè ñ äàííîãî õîñòà
 Maximum number of retries on non-fatal errors
-Maêñèìàëüíîå ÷èñëî ïîâòîðíûõ ïîïûòîê, â ñëó÷àå íå ôàòàëüíûõ îøèáîê.
+Ìàêñèìàëüíîå ÷èñëî ïîâòîðíûõ ïîïûòîê, â ñëó÷àå íå ôàòàëüíûõ îøèáîê.
 Maximum size for any single HTML file
-Maêñèìàëüíûé ðàçìåð ëþáîãî html-ôàéëà
+Ìàêñèìàëüíûé ðàçìåð ëþáîãî html-ôàéëà
 Maximum size for any single non-HTML file
-Maêñèìàëüíûé ðàçìåð ëþáîãî íå HTML-ôàéëà
+Ìàêñèìàëüíûé ðàçìåð ëþáîãî íå HTML-ôàéëà
 Maximum amount of bytes to retrieve from the Web
-Maêñèìàëüíîå êîëè÷åñòâî áàéò, äîïóñòèìûõ äëÿ çàêà÷êè
+Ìàêñèìàëüíîå êîëè÷åñòâî áàéò, äîïóñòèìûõ äëÿ çàêà÷êè
 Make a pause after downloading this amount of bytes
 Ïîñëå çàãðóçêè óêàçàííîãî ÷èñëà áàéòîâ, ñäåëàòü ïàóçó
 Maximum duration time for the mirroring operation
-Maêñ. ïðîäîëæèòåëüíîñòü çåðêàëèçàöèè
+Ìàêñ. ïðîäîëæèòåëüíîñòü çåðêàëèçàöèè
 Maximum transfer rate
 Ìàêñ. ñêîðîñòü çàêà÷êè
 Maximum connections/seconds (avoid server overload)
 Ìàêñ. êîëè÷åñòâî ñîåäèíåíèé â ñåêóíäó (íå ïåðåãðóæàòü ñåðâåð)
 Maximum number of links that can be tested (not saved!)
-íÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ÔÅÓÔÉÒÕÅÍÙÈ ÌÉÎËÏ× (ÔÅÓÔÉÒÕÅÍÙÈ, Á ÎÅ ÓÏÈÒÁÎÑÅÍÙÈ!)
+Ìàêñèìàëüíîå ÷èñëî òåñòèðóåìûõ ëèíêîâ (òåñòèðóåìûõ, à íå ñîõðàíÿåìûõ!)
 Browser identity
 Èäåíòèôèêàöèÿ áðîóçåðà (ñòðîêà User-Agent)
 Comment to be placed in each HTML file
@@ -477,7 +477,7 @@ Do not re-download locally erased files
 Make an index
 Ñîçäàòü èíäåêñ
 Make a word database
-óÏÚÄÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÓÌÏ×
+Ñîçäàòü áàçó äàííûõ ñëîâ
 Log files
 Log ôàéëû
 DOS names (8+3)
@@ -489,13 +489,13 @@ No error pages
 Primary Scan Rule
 Îñíîâíîé ôèëüòð
 Travel mode
-Ìîäà ñêàíèðîâàíèÿ
+Ðåæèì ñêàíèðîâàíèÿ
 Global travel mode
-Ãëîáàëüíàÿ ìîäà ñêàíèðîâàíèÿ
+Ðåæèì ãëîáàëüíîãî ñêàíèðîâàíèÿ
 These options should be modified only exceptionally
 Êàê ïðàâèëî, ýòè íàñòðîéêè èçìåíÿòü íå ñëåäóåò
 Activate Debugging Mode (winhttrack.log)
-Âêëþ÷èòü ìîäó îòëàäêè (winhttrack.log)
+Âêëþ÷èòü ðåæèì îòëàäêè (winhttrack.log)
 Rewrite links: internal / external
 Ïåðåèìåíîâàòü ëèíêè: âíóòðåííèå/âíåøíèå
 Flow control
@@ -511,7 +511,7 @@ N#
 Abandon host if error
 Ïðåêðàòèòü çàêà÷êó ñ õîñòà, â ñëó÷àå îøèáêè
 Minimum transfer rate (B/s)
-Mèíèìàëüíàÿ ñêîðîñòü çàêà÷êè (B/s)
+Ìèíèìàëüíàÿ ñêîðîñòü çàêà÷êè (B/s)
 Abandon host if too slow
 Ïðåêðàòèòü çàêà÷êó ñ õîñòà, åñëè îíà ñëèøêîì ìåäëåííàÿ
 Configure
@@ -557,15 +557,15 @@ Store ALL files in cache
 Tolerant requests (for servers)
 Òîëåðàíòíûå çàïðîñû (ê ñåðâåðàì)
 Update hack (limit re-transfers)
-Update hack (îãðàíè÷åíèå  ïîâòîðíûõ çàêà÷åê)
+Update hack (îãðàíè÷åíèå ïîâòîðíûõ çàêà÷åê)
 URL hacks (join similar URLs)
-Õàê URL  (îáúåäåíèòü àíàëîãè÷íûå URLs)
+Õàê URL (îáúåäåíèòü àíàëîãè÷íûå URLs)
 Force old HTTP/1.0 requests (no 1.1)
 Èñïîëüçîâàòü ñòàðûé ïðîòîêîë HTTP/1.0 (íå 1.1)
 Max connections / seconds
 Ìàêñ. ÷èñëî ñîåäèíåíèé/ñåê.
 Maximum number of links
-íÁËÓÉÍÁÌØÎÏÅ ÞÍÓÌÏ ÌÉÎËÏ×
+Ìàêñèìàëüíîå ÷èñëî ëèíêîâ
 Pause after downloading..
 Ïàóçà ïîñëå çàãðóçêè...
 Hide passwords
@@ -613,7 +613,7 @@ No saved password for this connection!
 Can not get remote connection settings
 Íå ìîãó ïîëó÷èòü óñòàíîâêè óäàëåííîãî ñîåäèíåíèÿ
 Select a connection provider
-Âûáåðåòå ïðîâàéäåðà, ê êîòîðîìó óñòàíîâèòü ñîåäèíåíèå
+Âûáåðèòå ïðîâàéäåðà, ê êîòîðîìó óñòàíîâèòü ñîåäèíåíèå
 Start
 Íà÷àòü
 Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
@@ -645,9 +645,9 @@ Wizard query
 Your answer:
 Âàø îòâåò:
 Link detected..
-Íàéäåí ëèíê
+Íàéäåí ëèíê..
 Choose a rule
-Âûáåðåòå ïðàâèëî
+Âûáåðèòå ïðàâèëî
 Ignore this link
 Èãíîðèðîâàòü ýòîò ëèíê
 Ignore directory
@@ -773,7 +773,7 @@ Enter project name here
 Enter saving path here
 Óêàæèòå êàòàëîã äëÿ ñîõðàíåíèÿ ïðîåêòà
 Select existing project to update
-Äëÿ îáíîâëåíèÿ ïðîåêòà, âûáåðåòå åãî èç ñïèñêà
+Äëÿ îáíîâëåíèÿ ïðîåêòà, âûáåðèòå åãî èç ñïèñêà
 Click here to select path
 Âûáðàòü êàòàëîã ïðîåêòà
 Select or create a new category name, to sort your mirrors in categories
@@ -793,7 +793,7 @@ Project category:
 C:\\My Web Sites
 C:\\Ìîè Web Ñàéòû
 Type a new project name, \r\nor select existing project to update/resume
-Çàäàéòå íàçâàíèå íîâîãî ïðîåêòà, \r\nèëè âûáåðåòå ñóùåñòâóþùèé ïðîåêò äëÿ åãî àêòóàëèçàöèè/ïðîäîëæåíèÿ
+Çàäàéòå íàçâàíèå íîâîãî ïðîåêòà, \r\nèëè âûáåðèòå ñóùåñòâóþùèé ïðîåêò äëÿ åãî àêòóàëèçàöèè/ïðîäîëæåíèÿ
 New project
 Íîâûé ïðîåêò
 Insert URL
@@ -835,7 +835,7 @@ Cancel
 Unable to find Help files!
 Íå íàéäåíû ôàéëû ïîìîùè!
 Unable to save parameters!
-Íå âîçìîæíî ñîõðàíèòü ïàðàìåòðû!
+Íåâîçìîæíî ñîõðàíèòü ïàðàìåòðû!
 Please drag only one folder at a time
 Ïîæàëóéñòà, ïåðåòàñêèâàéòå òîëüêî îäíó ïàïêó
 Please drag only folders, not files
@@ -851,13 +851,13 @@ Do you really want to use a user-defined structure?
 Too manu URLs, cannot handle so many links!!
 Ñëèøêîì ìíîãî URL'îâ, íå ìîãó îáðàáîòàòü òàêîå êîëè÷åñòâî ëèíêîâ!
 Not enough memory, fatal internal error..
-Íå äîñòàòî÷íî ïàìÿòè, ôàòàëüíàÿ âíóòðåííÿÿ îøèáêà...
+Íåäîñòàòî÷íî ïàìÿòè, ôàòàëüíàÿ âíóòðåííÿÿ îøèáêà...
 Unknown operation!
 Íåèçâåñòíàÿ îïåðàöèÿ
 Add this URL?\r\n
 Äîáàâèòü ýòîò URL?\r\n
 Warning: main process is still not responding, cannot add URL(s)..
-Âíèìàíèå: ïðîãðàììà íå îòâå÷àåò íà çàïðîñû, íå âîçìîæíî äîáàâèòü URL'û...
+Âíèìàíèå: ïðîãðàììà íå îòâå÷àåò íà çàïðîñû, íåâîçìîæíî äîáàâèòü URL'û...
 Type/MIME associations
 Ñîîòâåòñâèå òèïó ôàéëîâ (Type/MIME)
 File types:
@@ -891,7 +891,7 @@ Just scan\nStore html files\nStore non html files\nStore all files (default)\nSt
 Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
 Îñòàâàòüñÿ â òîéæå äèðåêòîðèè\nÌîæíî äâèãàòüñÿ âíèç (ïî óìîë÷àíèþ)\nÌîæíî äâèãàòüñÿ ââåðõ\nÌîæíî äâèãàòüñÿ ââåðõ è âíèç
 Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
-Îñòàâàòüñÿ íà òîì æå àäðåñå (ïî óìîë÷àíèþt)\nÎñòàâàòüñÿ íà òîì æå äîìåíå\nÎñòàâàòüñÿ íà òîì äå äîìåíå âåðõíåãî óðîâíÿ\nÈäòè êóäà óãîäíî
+Îñòàâàòüñÿ íà òîì æå àäðåñå (ïî óìîë÷àíèþ)\nÎñòàâàòüñÿ íà òîì æå äîìåíå\nÎñòàâàòüñÿ íà òîì æå äîìåíå âåðõíåãî óðîâíÿ\nÈäòè êóäà óãîäíî
 Never\nIf unknown (except /)\nIf unknown
 Íèêîãäà\nÅñëè íåèçâåñòíî (êðîìå /)\nÅñëè íåèçâåñòíî
 no robots.txt rules\nrobots.txt except wizard\nfollow robots.txt rules
@@ -901,7 +901,7 @@ normal\nextended\ndebug
 Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
 Çàãðóçèòü ñàéò(û)\nÇàãðóçèòü ñàéò(û) +âîïðîñû\nÇàãðóçèòü îòäåëüíûå ôàéëû\nÇàãðóçèòü âñå ñàéòû ñî ñòðàíèöû (íåñêîëüêî çåðêàë)\nÒåñòèðîâàòü ëèíêè ñî ñòðàíèöû (òåñò çàêëàäîê)\n* Ïðîäîëæèòü ïðåðâàííóþ çàãðóçêó\n* Îáíîâèòü ñóùåñòâóþùóþ çàêà÷êó
 Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
-Îòíîñèòåëüíûé URI / Àáñîëþòíûé URL (ïî-óìîë÷àíèþ)\nÀáñîëþòíûé URL / Àáñîëþòíûé URL\nÀáñîëþòíûé URI / Àáñîëþòíûé URL\nÏåðâîíà÷àëüíûé URL / Ïåðâîíà÷àëüíûé URL
+Îòíîñèòåëüíûé URI / Àáñîëþòíûé URL (ïî óìîë÷àíèþ)\nÀáñîëþòíûé URL / Àáñîëþòíûé URL\nÀáñîëþòíûé URI / Àáñîëþòíûé URL\nÏåðâîíà÷àëüíûé URL / Ïåðâîíà÷àëüíûé URL
 Open Source offline browser
 Open Source îôôëàéí áðàóçåð
 Website Copier/Offline Browser. Copy remote websites to your computer. Free.
@@ -919,7 +919,7 @@ URLs
 Warning
 Ïðåäóïðåæäåíèå
 Your browser does not currently support javascript. For better results, please use a javascript-aware browser.
-Âàø áðàóçåð èëè íå ïîääåðæèâàåò javascript èëè  åãî ïîääåðæêà âûêëþ÷åíà. Äëÿ ïîëó÷åíèÿ íàèëó÷øåãî ðåçóëüòàòà àêòèâèçèðóéòå ïîääåðæêó javascript.
+Âàø áðàóçåð èëè íå ïîääåðæèâàåò javascript èëè åãî ïîääåðæêà âûêëþ÷åíà. Äëÿ ïîëó÷åíèÿ íàèëó÷øåãî ðåçóëüòàòà àêòèâèçèðóéòå ïîääåðæêó javascript.
 Thank you
 Ñïàñèáî
 You can now close this window
--- a/libtest/readme.txt
+++ b/libtest/readme.txt
@@ -16,12 +16,12 @@ Copyright notice:
 ----------------

 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -29,8 +29,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 ========================================================================
    MAKEFILE PROJECT : libtest Project Overview
--- a/license.txt
+++ b/license.txt
@@ -1,12 +1,12 @@
 HTTrack Website Copier License Agreement:

 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 In addition, as a special exception, Xavier Roche gives permission to
 link the code of this program with the openSSL library (or with
--- a/man/htsserver.1
+++ b/man/htsserver.1
@@ -35,12 +35,12 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -48,8 +48,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 .SH AVAILABILITY
 The  most  recent released version of (web)httrack can be found at:
 .B http://www.httrack.com
--- a/man/httrack.1
+++ b/man/httrack.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "May 2013" "httrack website copier"
+.TH httrack 1 "HTTrack version 3.47-26 (compiled Sep  6 2013)" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
@@ -46,7 +46,7 @@ httrack \- offline browser : copy websites to a local directory
 ] [ 
 .B \-cN, \-\-sockets[=N] 
 ] [ 
-.B \-TN, \-\-timeout 
+.B \-TN, \-\-timeout[=N] 
 ] [ 
 .B \-RN, \-\-retries[=N] 
 ] [ 
@@ -264,7 +264,7 @@ maximum mms stream download time in seconds (60=1 minute, 3600=1 hour) (\-\-max\
 .IP \-cN
 number of multiple connections (*c8) (\-\-sockets[=N])
 .IP \-TN
-timeout, number of seconds after a non\-responding link is shutdown (\-\-timeout)
+timeout, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
 .IP \-RN
 number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N])
 .IP \-JN
@@ -617,12 +617,12 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -630,8 +630,8 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 .SH AVAILABILITY
 The  most  recent released version of httrack can be found at:
 .B http://www.httrack.com
--- a/man/proxytrack.1
+++ b/man/proxytrack.1
@@ -25,12 +25,12 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -38,8 +38,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 .SH AVAILABILITY
 The  most  recent released version of (web)httrack can be found at:
 .B http://www.httrack.com
--- a/man/webhttrack.1
+++ b/man/webhttrack.1
@@ -36,12 +36,12 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -49,8 +49,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 .SH AVAILABILITY
 The  most  recent released version of (web)httrack can be found at:
 .B http://www.httrack.com
--- a/src/hts-indextmpl.h
+++ b/src/hts-indextmpl.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsalias.c
+++ b/src/htsalias.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsalias.h
+++ b/src/htsalias.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsback.c
+++ b/src/htsback.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -209,13 +208,13 @@ static int back_index_ready(httrackp * opt, struct_back * sback, char *adr,
            freet(itemback);
            itemback = NULL;
          }
-          hts_log_print(opt, LOG_INFO | LOG_ERRNO,
+          hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
                        "engine: warning: unserialize error for %s%s (%s)", adr,
                        fil, sav);
        }
        fclose(fp);
      } else {
-        hts_log_print(opt, LOG_INFO | LOG_ERRNO,
+        hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
                      "engine: warning: unserialize error for %s%s (%s), file disappeared",
                      adr, fil, sav);
      }
@@ -238,7 +237,7 @@ static int back_index_ready(httrackp * opt, struct_back * sback, char *adr,
          back_set_locked(sback, q);    /* locked */
          return q;
        } else {
-          hts_log_print(opt, LOG_INFO,
+          hts_log_print(opt, LOG_WARNING,
                        "engine: warning: unserialize error for %s%s (%s): no more space to wakeup frozen slots",
                        adr, fil, sav);
        }
@@ -307,7 +306,7 @@ int back_cleanup_background(httrackp * opt, cache_back * cache,
          }
          /* Security check */
          if (fexist_utf8(filename)) {
-            hts_log_print(opt, LOG_INFO,
+            hts_log_print(opt, LOG_WARNING,
                          "engine: warning: temporary file %s already exists",
                          filename);
          }
@@ -320,13 +319,13 @@ int back_cleanup_background(httrackp * opt, cache_back * cache,
              nclean++;
              back_clear_entry(&back[i]);       /* entry is now recycled */
            } else {
-              hts_log_print(opt, LOG_INFO | LOG_ERRNO,
+              hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
                            "engine: warning: serialize error for %s%s to %s: write error",
                            back[i].url_adr, back[i].url_fil, filename);
            }
            fclose(fp);
          } else {
-            hts_log_print(opt, LOG_INFO | LOG_ERRNO,
+            hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
                          "engine: warning: serialize error for %s%s to %s: open error (%s, %s)",
                          back[i].url_adr, back[i].url_fil, filename,
                          dir_exists(filename) ? "directory exists" :
@@ -337,7 +336,7 @@ int back_cleanup_background(httrackp * opt, cache_back * cache,
          if (filename != NULL)
            free(filename);
        } else {
-          hts_log_print(opt, LOG_INFO | LOG_ERRNO,
+          hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
                        "engine: warning: serialize error for %s%s to %s: memory full",
                        back[i].url_adr, back[i].url_fil, filename);
        }
@@ -1760,7 +1759,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
      }
      /* Not in cache ; maybe in temporary cache ? Warning: non-movable "url_sav" */
      else if (back_unserialize_ref(opt, adr, fil, &itemback) == 0) {
-        const long file_size = fsize_utf8(itemback->url_sav);
+        const off_t file_size = fsize_utf8(itemback->url_sav);

        /* Found file on disk */
        if (file_size > 0) {
@@ -1795,7 +1794,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
      }
      /* Not in cache or temporary cache ; found on disk ? (hack) */
      else if (fexist_utf8(save)) {
-        off_t sz = fsize_utf8(save);
+        const off_t sz = fsize_utf8(save);

        // 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)
@@ -2116,20 +2115,18 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
 #if USE_BEGINTHREAD
 // lancement multithread du robot
 typedef struct {
-  char iadr_p[HTS_URLMAXSIZE];
  httrackp *opt;
+  char iadr_p[HTS_URLMAXSIZE];
 } HostlookupStruct;
 void Hostlookup(void *pP) {
-  HostlookupStruct *str = (HostlookupStruct *) pP;
+  HostlookupStruct *const str = (HostlookupStruct *) pP;
+  httrackp *const opt = str->opt;
  char iadr[256];
-  t_dnscache *cache = _hts_cache(str->opt);     // adresse du cache
  t_hostent *hp;
-  int error_found = 0;
+  t_dnscache *cache;
+  t_fullhostent fullhostent_buffer;

  // recopier (après id:pass)
-#if DEBUGDNS
-  printf("resolv in background: %s\n", jump_identification(iadr_p));
-#endif
  strcpybuff(iadr, jump_identification(str->iadr_p));
  // couper éventuel :
  {
@@ -2138,54 +2135,40 @@ void Hostlookup(void *pP) {
    if ((a = jump_toport(iadr)))
      *a = '\0';                // get rid of it
  }
-  freet(pP);

-  hts_mutexlock(&dns_lock);
+  // resolve
+  hp = vxgethostbyname(iadr, &fullhostent_buffer);

-  while(cache->n) {
+  hts_mutexlock(&opt->state.lock);
+
+  hts_log_print(opt, LOG_DEBUG, "finished resolved: %s", iadr);
+
+  for(cache = _hts_cache(opt); cache != NULL; cache = cache->n) {
    if (strcmp(cache->iadr, iadr) == 0) {
-      error_found = 1;
+      break;
    }
-    cache = cache->n;           // calculer queue
-  }
-  if (strcmp(cache->iadr, iadr) == 0) {
-    error_found = 1;
  }

-  if (!error_found) {
-    // en gros copie de hts_gethostbyname sans le return
-    cache->n = (t_dnscache *) calloct(1, sizeof(t_dnscache));
-    if (cache->n != NULL) {
-      t_fullhostent fullhostent_buffer;
-
-      strcpybuff(cache->n->iadr, iadr);
-      cache->n->host_length = 0;        /* pour le moment rien */
-      cache->n->n = NULL;
-
-      /* resolve */
-#if DEBUGDNS
-      printf("gethostbyname() in progress for %s\n", iadr);
-#endif
-      cache->n->host_length = -1;
-      memset(cache->n->host_addr, 0, sizeof(cache->n->host_addr));
-      hp = vxgethostbyname(iadr, &fullhostent_buffer);
-      if (hp != NULL) {
-        memcpy(cache->n->host_addr, hp->h_addr, hp->h_length);
-        cache->n->host_length = hp->h_length;
-      }
+  if (cache != NULL && cache->host_length == 0) {
+    if (hp != NULL) {
+      memset(cache->host_addr, 0, sizeof(cache->host_addr));
+      memcpy(cache->host_addr, hp->h_addr, hp->h_length);
+      cache->host_length = hp->h_length;
+      hts_log_print(opt, LOG_DEBUG, "saved resolved host: %s", iadr);
+    } else {
+      cache->host_length = -1;
+      hts_log_print(opt, LOG_DEBUG, "saved negative resolved host: %s", iadr);
    }
  } else {
-#if DEBUGDNS
-    printf("aborting resolv for %s (found)\n", iadr);
-#endif
+    hts_log_print(opt, LOG_DEBUG, "could not save resolved host: %s", iadr);
  }

-  hts_mutexrelease(&dns_lock);
+  assertf(opt->state.dns_cache_nthreads > 0);
+  opt->state.dns_cache_nthreads--;

-#if DEBUGDNS
-  printf("quitting resolv for %s (result: %d)\n", iadr,
-         (cache->n != NULL) ? cache->n->host_length : (-999));
-#endif
+  hts_mutexrelease(&opt->state.lock);
+
+  freet(pP);
 }
 #endif

@@ -2193,6 +2176,8 @@ void Hostlookup(void *pP) {
 // si c'est un fichier, la résolution est immédiate
 // idem pour ftp://
 void back_solve(httrackp * opt, lien_back * back) {
+  assertf(opt != NULL);
+  assertf(back != NULL);
  if ((!strfield(back->url_adr, "file://"))
      && !strfield(back->url_adr, "ftp://")
 #if HTS_USEMMS
@@ -2207,38 +2192,17 @@ void back_solve(httrackp * opt, lien_back * back) {
    else
      a = back->r.req.proxy.name;
    a = jump_protocol(a);
-    if (!hts_dnstest(opt, a)) { // non encore testé!..
-      // inscire en thread
-#ifdef _WIN32
-      // Windows
-#if USE_BEGINTHREAD
+    if (hts_dnstest(opt, a, 1) == 2) { // non encore testé!..
+      hts_log_print(opt, LOG_DEBUG, "resolving in background: %s", a);
      {
        HostlookupStruct *str =
          (HostlookupStruct *) malloct(sizeof(HostlookupStruct));
-        if (str) {
+        if (str != NULL) {
          strcpybuff(str->iadr_p, a);
          str->opt = opt;
          hts_newthread(Hostlookup, str);
        }
      }
-#else
-      /*t_hostent* h= */
-      /*hts_gethostbyname(a); */// calcul
-#endif
-#else
-#if USE_BEGINTHREAD
-      char *p = calloct(strlen(a) + 2, 1);
-
-      if (p) {
-        strcpybuff(p, a);
-        hts_newthread(Hostlookup, p);
-      }
-#else
-      // Sous Unix, le gethostbyname() est bloquant..
-      /*t_hostent* h= */
-      /*hts_gethostbyname(a); */// calcul
-#endif
-#endif
    }
  }
 }
@@ -2253,9 +2217,9 @@ int host_wait(httrackp * opt, lien_back * back) {
    ) {
    //## if (back->url_adr[0]!=lOCAL_CHAR) {
    if (!(back->r.req.proxy.active)) {
-      return (hts_dnstest(opt, back->url_adr));
+      return (hts_dnstest(opt, back->url_adr, 0));
    } else {
-      return (hts_dnstest(opt, back->r.req.proxy.name));
+      return (hts_dnstest(opt, back->r.req.proxy.name, 0));
    }
  } else
    return 1;                   // prêt, fichier local
--- a/src/htsback.h
+++ b/src/htsback.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsbase.h
+++ b/src/htsbase.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsbasenet.h
+++ b/src/htsbasenet.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsbauth.c
+++ b/src/htsbauth.c
@@ -1,11 +1,11 @@
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -13,8 +13,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -126,6 +125,29 @@ int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path) {
  return 0;
 }

+// Matches wildcard cookie domains that start with a dot
+// chk_dom: the domain stored in the cookie (potentially wildcard).
+// domain: query domain
+int cookie_cmp_wildcard_domain(char *chk_dom, char *domain) {
+    int n = strlen(chk_dom);
+    int m = strlen(domain);
+    int l = n < m ? n : m;
+    int i;
+    for (i = l - 1; i >= 0; i--) {
+        if (chk_dom[n - i - 1] != domain[m - i - 1]) {
+            return 1;
+        }
+    }
+    if (m < n && chk_dom[0] == '.') {
+        return 0;
+    }
+    else if (m != n) {
+        return 1;
+    }
+    return 0;
+}
+
+
 // rechercher cookie à partir de la position s (par exemple s=cookie.data)
 // renvoie pointeur sur ligne, ou NULL si introuvable
 // path est aligné à droite et cook_name peut être vide (chercher alors tout cookie)
@@ -145,15 +167,15 @@ char *cookie_find(char *s, char *cook_name, char *domain, char *path) {
      //
      char *chk_dom = cookie_get(buffer, a, 0); // domaine concerné par le cookie

-      if ((int) strlen(chk_dom) <= (int) strlen(domain)) {
-        if (strcmp(chk_dom, domain + strlen(domain) - strlen(chk_dom)) == 0) {  // même domaine
+      if (((int) strlen(chk_dom) <= (int) strlen(domain) &&
+        strcmp(chk_dom, domain + strlen(domain) - strlen(chk_dom)) == 0) ||
+        !cookie_cmp_wildcard_domain(chk_dom, domain)) {  // même domaine
          //
-          char *chk_path = cookie_get(buffer, a, 2);    // chemin concerné par le cookie
+        char *chk_path = cookie_get(buffer, a, 2);    // chemin concerné par le cookie

-          if ((int) strlen(chk_path) <= (int) strlen(path)) {
-            if (strncmp(path, chk_path, strlen(chk_path)) == 0) {       // même chemin
-              return a;
-            }
+        if ((int) strlen(chk_path) <= (int) strlen(path)) {
+          if (strncmp(path, chk_path, strlen(chk_path)) == 0) {       // même chemin
+            return a;
          }
        }
      }
--- a/src/htsbauth.h
+++ b/src/htsbauth.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscache.c
+++ b/src/htscache.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscache.h
+++ b/src/htscache.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscatchurl.c
+++ b/src/htscatchurl.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -198,11 +197,12 @@ HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data) {
          char BIGSTK url_fil[HTS_URLMAXSIZE * 2];

          // méthode en majuscule
-          int i, r = 0;
+          size_t i;
+          int r = 0;

          url_adr[0] = url_fil[0] = '\0';
          //
-          for(i = 0; i < (int) strlen(method); i++) {
+          for(i = 0; method[i] != '\0'; i++) {
            if ((method[i] >= 'a') && (method[i] <= 'z'))
              method[i] -= ('a' - 'A');
          }
--- a/src/htscatchurl.h
+++ b/src/htscatchurl.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,9 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -24,11 +22,9 @@ Important notes:
 emails addresses, or collecting any other private information on persons.
 This would disgrace our work, and spoil the many hours we spent on it.

-
 Please visit our Website: http://www.httrack.com
 */

-
 /* ------------------------------------------------------------ */
 /* File: URL catch .h                                           */
 /* Author: Xavier Roche                                         */
@@ -37,7 +33,7 @@ Please visit our Website: http://www.httrack.com
 // Fichier intercepteur d'URL .h

 #ifndef HTS_CATCHURL_DEFH
-#define HTS_CATCHURL_DEFH 
+#define HTS_CATCHURL_DEFH

 #include "htsbasenet.h"

@@ -45,11 +41,12 @@ Please visit our Website: http://www.httrack.com
 #ifdef HTS_INTERNAL_BYTECODE

 // Fonctions
-void socinput(T_SOC soc,char* s,int max);
+void socinput(T_SOC soc, char *s, int max);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API T_SOC catch_url_init_std(int* port_prox,char* adr_prox);
-HTSEXT_API T_SOC catch_url_init(int* port,char* adr);
-HTSEXT_API int catch_url(T_SOC soc,char* url,char* method,char* data);
+HTSEXT_API T_SOC catch_url_init_std(int *port_prox, char *adr_prox);
+HTSEXT_API T_SOC catch_url_init(int *port, char *adr);
+HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data);
 #endif

 #define CATCH_RESPONSE \
@@ -74,10 +71,7 @@ HTSEXT_API int catch_url(T_SOC soc,char* url,char* method,char* data);
  "</BODY></HTML>"\
  "<!-- Generated by HTTrack Website Copier -->\r\n"\
  "\r\n"\
- 
-#endif

 #endif

-
-
+#endif
--- a/src/htscharset.c
+++ b/src/htscharset.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscharset.h
+++ b/src/htscharset.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsconfig.h
+++ b/src/htsconfig.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscore.c
+++ b/src/htscore.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -542,7 +541,7 @@ int httpmirror(char *url1, httrackp * opt) {
                     __LINE__);
              hts_log_print(opt, LOG_PANIC,
                            "Too many filters, giving up..(>%d)", filptr);
-              hts_log_print(opt, LOG_INFO,
+              hts_log_print(opt, LOG_NOTICE,
                            "To avoid that: use #F option for more filters (example: -#F5000)");
              XH_extuninit;
              return 0;
@@ -621,7 +620,7 @@ int httpmirror(char *url1, httrackp * opt) {
          }
        }
        // fclose(fp);
-        hts_log_print(opt, LOG_INFO, "%d links added from %s", n,
+        hts_log_print(opt, LOG_NOTICE, "%d links added from %s", n,
                      StringBuff(opt->filelist));

        // Free buffer
@@ -1714,7 +1713,7 @@ int httpmirror(char *url1, httrackp * opt) {
                      }
 #ifdef IGNORE_RESTRICTIVE_ROBOTS
                      else {
-                        hts_log_print(opt, LOG_INFO,
+                        hts_log_print(opt, LOG_NOTICE,
                                      "Note: %s robots.txt rules are too restrictive, ignoring /",
                                      urladr);
                      }
@@ -1728,7 +1727,7 @@ int httpmirror(char *url1, httrackp * opt) {
                hts_log_print(opt, LOG_INFO,
                              "Note: robots.txt forbidden links for %s are: %s",
                              urladr, infobuff);
-                hts_log_print(opt, LOG_INFO,
+                hts_log_print(opt, LOG_NOTICE,
                              "Note: due to %s remote robots.txt rules, links beginning with these path will be forbidden: %s (see in the options to disable this)",
                              urladr, infobuff);
              }
@@ -1978,7 +1977,7 @@ int httpmirror(char *url1, httrackp * opt) {
  if ((HTS_STAT.stat_files <= 0)
      && (HTS_STAT.HTS_TOTAL_RECV < 32768)      /* should be fine */
    ) {
-    hts_log_print(opt, LOG_INFO,
+    hts_log_print(opt, LOG_NOTICE,
                  "No data seems to have been transferred during this session! : restoring previous one!");
    XH_uninit;
    if ((fexist
@@ -2933,16 +2932,16 @@ void usercommand(httrackp * opt, int _exe, const char *_cmd, const char *file,
 }
 void usercommand_exe(const char *cmd, const char *file) {
  char BIGSTK temp[8192];
-  char c[2] = "";
-  int i;
+  size_t i;

  temp[0] = '\0';
  //
-  for(i = 0; i < (int) strlen(cmd); i++) {
+  for(i = 0; cmd[i] != '\0'; i++) {
    if ((cmd[i] == '$') && (cmd[i + 1] == '0')) {
      strcatbuff(temp, file);
      i++;
    } else {
+      char c[2];
      c[0] = cmd[i];
      c[1] = '\0';
      strcatbuff(temp, c);
@@ -3887,5 +3886,5 @@ void voidf(void) {
  (void) a;
 }

-// HTTrack Website Copier Copyright (C) Xavier Roche and other contributors
+// HTTrack Website Copier Copyright (C) 1998-2013 Xavier Roche and other contributors
 //
--- a/src/htscore.h
+++ b/src/htscore.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htscoremain.c
+++ b/src/htscoremain.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -1160,6 +1159,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
            //
          case 'Q':
            httrack_logmode = 0;
+            opt->debug = LOG_NOTICE;
            break;
          case 'v':
            httrack_logmode = 1;
@@ -1215,10 +1215,13 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
              com++;
            break;
          case 'm':
-            sscanf(com + 1, LLintP, &opt->maxfile_nonhtml);
-            while(isdigit((unsigned char) *(com + 1)))
-              com++;
-            if (*(com + 1) == ',') {
+            // -m,10000 variant
+            if (*(com + 1) != ',') {
+              sscanf(com + 1, LLintP, &opt->maxfile_nonhtml);
+              while(isdigit((unsigned char) *(com + 1)))
+                com++;
+            }
+            if (*(com + 1) == ',' && isdigit((unsigned char) *(com + 2))) {
              com++;
              sscanf(com + 1, LLintP, &opt->maxfile_html);
              while(isdigit((unsigned char) *(com + 1)))
@@ -1377,10 +1380,10 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
            break;
            //
          case 'z':
-            opt->debug = 1;
+            opt->debug = LOG_INFO;
            break;              // petit debug
          case 'Z':
-            opt->debug = 2;
+            opt->debug = LOG_DEBUG;
            break;              // GROS debug
            //
          case '&':
@@ -2854,10 +2857,10 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
            if (((strchr(argv[i], ' ') != NULL)
                 || (strchr(argv[i], '"') != NULL)
                 || (strchr(argv[i], '\\') != NULL)) && (argv[i][0] != '"')) {
-              int j;
+              size_t j;

              fprintf(fp, "\"");
-              for(j = 0; j < (int) strlen(argv[i]); j++) {
+              for(j = 0; argv[i][j] != '\0'; j++) {
                if (argv[i][j] == 34)
                  fprintf(fp, "\\\"");
                else if (argv[i][j] == '\\')
--- a/src/htscoremain.h
+++ b/src/htscoremain.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsdefines.h
+++ b/src/htsdefines.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsencoding.c
+++ b/src/htsencoding.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -204,8 +203,10 @@ int hts_unescapeEntities(const char *src, char *dest, const size_t max) {
  return hts_unescapeEntitiesWithCharset(src, dest, max, "UTF-8");
 }

-int hts_unescapeUrl(const char *src, char *dest, const size_t max) {
+int hts_unescapeUrlSpecial(const char *src, char *dest, const size_t max,
+                           const int flags) {
  size_t i, j, lastI, lastJ, k, utfBufferJ, utfBufferSize;
+  int seenQuery = 0;
  char utfBuffer[32];

  assert(src != dest);
@@ -218,7 +219,7 @@ int hts_unescapeUrl(const char *src, char *dest, const size_t max) {
    unsigned char cUtf = (unsigned char) c;

    /* Replacement for ' ' */
-    if (c == '+') {
+    if (c == '+' && seenQuery) {
      c = cUtf = ' ';
      k = 0;  /* cancel any sequence */
    }
@@ -238,7 +239,10 @@ int hts_unescapeUrl(const char *src, char *dest, const size_t max) {
        cUtf = (unsigned char) ec;

        /* Shortcut for ASCII (do not unescape non-printable) */
-        if ((unsigned char) ec < 0x80 && (unsigned char) ec >= 32) {
+        if (
+            (cUtf < 0x80 && cUtf >= 32)
+            && ( flags & UNESCAPE_URL_NO_ASCII ) == 0
+            ) {
          /* Rollback new write position and character */
          j = lastJ;
          c = ec;
@@ -250,6 +254,9 @@ int hts_unescapeUrl(const char *src, char *dest, const size_t max) {
    /* ASCII (and not in %xx) */
    else if (cUtf < 0x80 && i != lastI + 1) {
      k = 0;  /* cancel any sequence */
+      if (c == '?' && !seenQuery) {
+        seenQuery = 1;
+      }
    }
    
    /* UTF-8 sequence in progress (either a raw or a %xx character) */
@@ -312,3 +319,7 @@ int hts_unescapeUrl(const char *src, char *dest, const size_t max) {

  return 0;
 }
+
+int hts_unescapeUrl(const char *src, char *dest, const size_t max) {
+  return hts_unescapeUrlSpecial(src, dest, max, 0);
+}
--- a/src/htsencoding.h
+++ b/src/htsencoding.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -41,6 +40,14 @@ Please visit our Website: http://www.httrack.com
 #include <windows.h>
 #endif

+/**
+ * Flags for hts_unescapeUrlSpecial().
+ **/
+typedef enum unescapeFlags {
+  /** Do not decode ASCII. **/
+  UNESCAPE_URL_NO_ASCII = 1
+} unescapeFlags;
+
 /**
 * Unescape HTML entities (as per HTML 4.0 Specification)
 * and replace them in-place by their UTF-8 equivalents.
@@ -71,4 +78,16 @@ extern int hts_unescapeEntitiesWithCharset(const char *src,
 **/
 extern int hts_unescapeUrl(const char *src, char *dest, const size_t max);

+/**
+ * Unescape an URL-encoded string. The implicit charset is UTF-8.
+ * In case of UTF-8 decoding error inside URL-encoded characters,
+ * the characters are left undecoded.
+ * "flags" is a mask composed of UNESCAPE_URL_XXX constants.
+ * Note: source and destination MUST NOT be the same.
+ * Returns 0 upon success, -1 upon overflow or error.
+ **/
+extern int hts_unescapeUrlSpecial(const char *src,
+                                  char *dest, const size_t max,
+                                  int flags);
+
 #endif
--- a/src/htsfilters.c
+++ b/src/htsfilters.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsfilters.h
+++ b/src/htsfilters.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsftp.c
+++ b/src/htsftp.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsftp.h
+++ b/src/htsftp.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsglobal.h
+++ b/src/htsglobal.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -37,8 +36,8 @@ Please visit our Website: http://www.httrack.com
 #define HTTRACK_GLOBAL_DEFH

 // Version (also check external version information)
-#define HTTRACK_VERSION      "3.47-19"
-#define HTTRACK_VERSIONID    "3.47.19"
+#define HTTRACK_VERSION      "3.47-27"
+#define HTTRACK_VERSIONID    "3.47.27"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"

@@ -261,7 +260,7 @@ Please visit our Website: http://www.httrack.com
 #define HTS_CDLMAXSIZE 1024
 #endif

-/* Copyright (C) Xavier Roche and other contributors */
+/* Copyright (C) 1998-2013 Xavier Roche and other contributors */
 #define HTTRACK_AFF_AUTHORS "[XR&CO'2013]"
 #define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/"HTTRACK_AFF_VERSION" "HTTRACK_AFF_AUTHORS", %s -->"
 #define HTTRACK_WEB "http://www.httrack.com"
--- a/src/htshash.c
+++ b/src/htshash.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htshash.h
+++ b/src/htshash.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htshelp.c
+++ b/src/htshelp.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -148,7 +147,7 @@ void help_wizard(httrackp * opt) {
  printf("\n");
  printf("Welcome to HTTrack Website Copier (Offline Browser) " HTTRACK_VERSION
         "%s\n", hts_get_version_info(opt));
-  printf("Copyright (C) Xavier Roche and other contributors\n");
+  printf("Copyright (C) 1998-2013 Xavier Roche and other contributors\n");
 #ifdef _WIN32
  printf("Note: You are running the commandline version,\n");
  printf("run 'WinHTTrack.exe' to get the GUI version.\n");
@@ -461,9 +460,6 @@ void help(char *app, int more) {
  infomsg("General options:");
  infomsg
    ("  O  path for mirror/logfiles+cache (-O path_mirror[,path_cache_and_logfiles])");
-#ifndef _WIN32
-  infomsg(" %O  chroot path to, must be r00t (-%O root_path)");
-#endif
  infomsg("");
  infomsg("Action options:");
  infomsg("  w *mirror web sites");
@@ -632,7 +628,6 @@ void help(char *app, int more) {
  infomsg(" #T  generate transfer ops. log every minutes");
  infomsg(" #u  wait time");
  infomsg(" #Z  generate transfer rate statictics every minutes");
-  infomsg(" #!  execute a shell command (-#! \"echo hello\")");
  infomsg("");
  infomsg
    ("Dangerous options: (do NOT use unless you exactly know what you are doing)");
@@ -644,7 +639,6 @@ void help(char *app, int more) {
  infomsg("Command-line specific options:");
  infomsg
    ("  V execute system command after each files ($0 is the filename: -V \"rm \\$0\")");
-  infomsg(" %U run the engine with another id when called as root (-%U smith)");
  infomsg
    (" %W use an external library function as a wrapper (-%W myfoo.so[,myparameters])");
  /* infomsg(" %O do a chroot before setuid"); */
@@ -766,7 +760,7 @@ void help(char *app, int more) {
  sprintf(info, "HTTrack version " HTTRACK_VERSION "%s (compiled " __DATE__ ")",
          hts_is_available());
  infomsg(info);
-  infomsg("Copyright (C) Xavier Roche and other contributors");
+  infomsg("Copyright (C) 1998-2013 Xavier Roche and other contributors");
 #ifdef HTS_PLATFORM_NAME
  infomsg("[compiled: " HTS_PLATFORM_NAME "]");
 #endif
--- a/src/htshelp.h
+++ b/src/htshelp.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsindex.c
+++ b/src/htsindex.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsindex.h
+++ b/src/htsindex.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsinthash.c
+++ b/src/htsinthash.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsinthash.h
+++ b/src/htsinthash.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsjava.c
+++ b/src/htsjava.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -485,7 +484,7 @@ static int tris(httrackp * opt, char *buffer) {
 static char *printname(char rname[1024], char name[1024]) {
  char *p;
  char *p1;
-  int j;
+  size_t j;

  rname[0] = '\0';
  //
@@ -497,7 +496,7 @@ static char *printname(char rname[1024], char name[1024]) {
  p += 2;
  //rname=(char*)calloct(strlen(name)+8,sizeof(char));
  p1 = rname;
-  for(j = 0; j < (int) strlen(name); j++, p++) {
+  for(j = 0; name[j] != '\0'; j++, p++) {
    if (*p == '/')
      *p1 = '.';
    if (*p == ';') {
--- a/src/htsjava.h
+++ b/src/htsjava.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htslib.c
+++ b/src/htslib.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -540,6 +539,7 @@ const char *hts_mime[][2] = {
  {"application/ogg", "ogg"},

  {"application/x-java-vm", "class"},
+  {"application/x-bittorrent","torrent"},

  {"", ""}
 };
@@ -2532,7 +2532,7 @@ int ident_url_absolute(const char *url, char *adr, char *fil) {
    fil_simplifie(fil);
  } else {                      // localhost file://
    const char *p;
-    int i;
+    size_t i;
    char *a;

    p = url + pos;
@@ -2551,7 +2551,7 @@ int ident_url_absolute(const char *url, char *adr, char *fil) {
    if (a)
      *a = '\0';                /* couper query (inutile pour file:// lors de la requête) */
    // filtrer les \\ -> / pour les fichiers DOS
-    for(i = 0; i < (int) strlen(fil); i++)
+    for(i = 0; fil[i] != '\0'; i++)
      if (fil[i] == '\\')
        fil[i] = '/';
  }
@@ -3734,18 +3734,28 @@ void code64(unsigned char *a, int size_a, unsigned char *b, int crlf) {
  *b++ = '\0';
 }

-static int ehexh(char c) {
-  if ((c >= '0') && (c <= '9'))
+// return the hex character value, or -1 on error.
+static HTS_INLINE int ehexh(const char c) {
+  if (c >= '0' && c <= '9')
    return c - '0';
-  if ((c >= 'a') && (c <= 'f'))
-    c -= ('a' - 'A');
-  if ((c >= 'A') && (c <= 'F'))
+  else if (c >= 'a' && c <= 'f')
+    return (c - 'a' + 10);
+  else if (c >= 'A' && c <= 'F')
    return (c - 'A' + 10);
-  return 0;
+  else
+    return -1;
 }

-static int ehex(const char *s) {
-  return 16 * ehexh(*s) + ehexh(*(s + 1));
+// return the two-hex character value, or -1 on error.
+static HTS_INLINE int ehex(const char *s) {
+  const int c1 = ehexh(s[0]);
+  if (c1 >= 0) {
+    const int c2 = ehexh(s[1]);
+    if (c2 >= 0) {
+      return 16*c1 + c2;
+    }
+  }
+  return -1;
 }

 void unescape_amp(char *s) {
@@ -3754,23 +3764,17 @@ void unescape_amp(char *s) {
  }
 }

-// remplacer %20 par ' ', | par : etc..
+// remplacer %20 par ' ', etc..
 // buffer MAX 1Ko
 HTSEXT_API char *unescape_http(char *catbuff, const char *s) {
-  int i, j = 0;
+  size_t i, j;

-  for(i = 0; i < (int) strlen(s); i++) {
-    if (s[i] == '%') {
-      i++;
-      catbuff[j++] = (char) ehex(s + i);
-      i++;                      // sauter 2 caractères finalement
+  for(i = 0, j = 0; s[i] != '\0'; i++) {
+    int h;
+    if (s[i] == '%' && (h = ehex(&s[i + 1])) >= 0) {
+      catbuff[j++] = (char) h;
+      i += 2;
    }
-    /*
-       NON a cause de trucs comme /home/0,1837,1|7|1173|Content,00.html
-       else if (s[i]=='|') {                     // exemple: file:///C|Program%20Files...
-       tempo[j++]=':';
-       }
-     */
    else
      catbuff[j++] = s[i];
  }
@@ -3780,38 +3784,33 @@ HTSEXT_API char *unescape_http(char *catbuff, const char *s) {

 // unescape in URL/URI ONLY what has to be escaped, to form a standard URL/URI
 // DOES NOT DECODE %25 (part of CHAR_DELIM)
+// no_high & 1: decode high chars
+// no_high & 2: decode space
 HTSEXT_API char *unescape_http_unharm(char *catbuff, const char *s, int no_high) {
-  int i, j = 0;
+  size_t i, j;

-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0, j = 0; s[i] != '\0'; i++) {
    if (s[i] == '%') {
-      int nchar = (char) ehex(s + i + 1);
+      const int nchar = ehex(&s[i + 1]);

-      int test = ((  CHAR_RESERVED(nchar) && nchar != '+')        /* %2B => + (not in query!) */
-                  || CHAR_DELIM(nchar)
-                  || CHAR_UNWISE(nchar)
-                  || CHAR_LOW(nchar)    /* CHAR_SPECIAL */
-                  || CHAR_XXAVOID(nchar)
-                  || ((no_high)
-                      && CHAR_HIG(nchar)
-                  )
-        );
+      const int test = 
+        ( CHAR_RESERVED(nchar) && nchar != '+' )        /* %2B => + (not in query!) */
+        || CHAR_DELIM(nchar)
+        || CHAR_UNWISE(nchar)
+        || CHAR_LOW(nchar)    /* CHAR_SPECIAL */
+        || ( CHAR_XXAVOID(nchar) && ( nchar != ' ' || ( no_high & 2) == 0 ) )
+        || ( ( no_high & 1 ) && CHAR_HIG(nchar) )
+        ;

-      if (!test) {
-        catbuff[j++] = (char) ehex(s + i + 1);
+      if (!test && nchar >= 0) {  /* can safely unescape */
+        catbuff[j++] = (char) nchar;
        i += 2;
      } else {
        catbuff[j++] = '%';
      }
-    }
-    /*
-       NON a cause de trucs comme /home/0,1837,1|7|1173|Content,00.html
-       else if (s[i]=='|') {                     // exemple: file:///C|Program%20Files...
-       tempo[j++]=':';
-       }
-     */
-    else
+    } else {
      catbuff[j++] = s[i];
+    }
  }
  catbuff[j++] = '\0';
  return catbuff;
@@ -4005,9 +4004,9 @@ char *convtolower(char *catbuff, const char *a) {

 // conversion en minuscules
 void hts_lowcase(char *s) {
-  int i;
+  size_t i;

-  for(i = 0; i < (int) strlen(s); i++)
+  for(i = 0; s[i] != '\0'; i++)
    if ((s[i] >= 'A') && (s[i] <= 'Z'))
      s[i] += ('a' - 'A');
 }
@@ -4027,7 +4026,7 @@ HTS_INLINE void hts_replace(char *s, char from, char to) {
  #define  is_realspace(c) (strchr(" \x0d\x0a\x09\x0c",c)!=NULL)
 */
 /*
-HTS_INLINE int is_space(char c) {
+static HTS_INLINE int is_space(char c) {
  if (c==' ')  return 1;  // spc
  if (c=='"')  return 1;  // quote
  if (c==10)   return 1;  // lf
@@ -4041,7 +4040,7 @@ HTS_INLINE int is_space(char c) {

 // caractère espace, CR, LF, TAB
 /*
-HTS_INLINE int is_realspace(char c) {
+static HTS_INLINE int is_realspace(char c) {
  if (c==' ')  return 1;  // spc
  if (c==10)   return 1;  // lf
  if (c==13)   return 1;  // cr
@@ -4693,54 +4692,37 @@ void hts_cache_free(t_dnscache * cache) {
 // plus prudent quand plusieurs threads peuvent écrire dedans..
 // -1: status? 0: libérer 1:locker

-/* 
-  Simple lock for cache
-*/
-htsmutex dns_lock = HTSMUTEX_INIT;
-
+// MUST BE LOCKED
 // routine pour le cache - retour optionnel à donner à chaque fois
 // NULL: nom non encore testé dans le cache
 // si h_length==0 alors le nom n'existe pas dans le dns
-t_hostent *_hts_ghbn(t_dnscache * cache, const char *iadr, t_hostent * retour) {
-  t_hostent *ret = NULL;
-
-  hts_mutexlock(&dns_lock);
-  for(;;) {
+static t_hostent *hts_ghbn(t_dnscache * cache, const char *iadr, t_hostent * retour) {
+  for(; cache != NULL; cache = cache->n) {
    if (strcmp(cache->iadr, iadr) == 0) {       // ok trouvé
      if (cache->host_length > 0) {     // entrée valide
        if (retour->h_addr_list[0])
          memcpy(retour->h_addr_list[0], cache->host_addr, cache->host_length);
        retour->h_length = cache->host_length;
      } else if (cache->host_length == 0) {     // en cours
-        ret = NULL;
-        break;
+        return NULL;
      } else {                  // erreur dans le dns, déja vérifié
        if (retour->h_addr_list[0])
          retour->h_addr_list[0][0] = '\0';
        retour->h_length = 0;   // erreur, n'existe pas
      }
-      ret = retour;
-      break;
-    } else {                    // on a pas encore trouvé
-      if (cache->n != NULL) {   // chercher encore
-        cache = cache->n;       // suivant!
-      } else {
-        ret = NULL;
-        break;
-      }
+      return retour;
    }
  }
-  hts_mutexrelease(&dns_lock);
-  return ret;
+  return NULL;
 }

 // tester si iadr a déja été testé (ou en cours de test)
-// 0 non encore
+// 0 non encore (en cours)
 // 1 ok
 // 2 non présent
-int hts_dnstest(httrackp * opt, const char *_iadr) {
-  int ret = 0;
-  t_dnscache *cache = _hts_cache(opt);  // adresse du cache 
+int hts_dnstest(httrackp * opt, const char *_iadr, int add) {
+  int ret = 2;
+  t_dnscache *cache, *tail;
  char iadr[HTS_URLMAXSIZE * 2];

  // sauter user:pass@ éventuel
@@ -4760,21 +4742,32 @@ int hts_dnstest(httrackp * opt, const char *_iadr) {
 #endif
    return 1;

-  hts_mutexlock(&dns_lock);
-  for(;;) {
+  hts_mutexlock(&opt->state.lock);
+  for(cache = tail = _hts_cache(opt); cache != NULL; cache = cache->n) {
+    tail = cache;
    if (strcmp(cache->iadr, iadr) == 0) {       // ok trouvé
-      ret = 1;
+      ret = cache->host_length != 0 ? 1 : 0;
      break;
-    } else {                    // on a pas encore trouvé
-      if (cache->n != NULL) {   // chercher encore
-        cache = cache->n;       // suivant!
-      } else {
-        ret = 2;                // non présent        
-        break;
-      }
    }
  }
-  hts_mutexrelease(&dns_lock);
+  // Add empty entry ?
+  if (ret == 2 && add) {
+    assertf(tail != NULL);
+    assertf(tail->n == NULL);
+    if (opt->state.dns_cache_nthreads < 16) {
+      opt->state.dns_cache_nthreads++;
+      tail->n = (t_dnscache *) calloct(1, sizeof(t_dnscache));
+      if (tail->n != NULL) {
+        strcpybuff(tail->n->iadr, iadr);
+        tail->n->host_length = 0;        /* pour le moment rien */
+        tail->n->n = NULL;
+      }
+    } else {
+      hts_log_print(opt, LOG_DEBUG, "too many threads, not adding another dns resolution in background");
+      ret = 0;
+    }
+  }
+  hts_mutexrelease(&opt->state.lock);
  return ret;
 }

@@ -4865,8 +4858,9 @@ HTSEXT_API t_hostent *vxgethostbyname(char *hostname, void *v_buffer) {
  return vxgethostbyname2(hostname, v_buffer, NULL);
 }

+// Needs locking
 // cache dns interne à HTS // ** FREE A FAIRE sur la chaine
-t_hostent *hts_gethostbyname2(httrackp * opt, const char *_iadr, void *v_buffer, const char **error) {
+static t_hostent *hts_gethostbyname_(httrackp * opt, const char *_iadr, void *v_buffer, const char **error) {
  char BIGSTK iadr[HTS_URLMAXSIZE * 2];
  t_fullhostent *buffer = (t_fullhostent *) v_buffer;
  t_dnscache *cache = _hts_cache(opt);  // adresse du cache
@@ -4884,29 +4878,16 @@ t_hostent *hts_gethostbyname2(httrackp * opt, const char *_iadr, void *v_buffer,
      *a = '\0';
  }

-  // effacer structure de retour, créer nouvelle
-  /*
-     memset(&host, 0, sizeof(t_hostent));  
-     host.h_addr_list=he;
-     he[0]=NULL;
-     he[1]=NULL;  
-     host.h_length=0;  
-   */
-  cache->iadr[0] = '*';
-  cache->iadr[1] = '\0';
-
  /* get IP from the dns cache */
-  hp = _hts_ghbn(cache, iadr, &buffer->hp);
+  hp = hts_ghbn(cache, iadr, &buffer->hp);
  if (hp) {
    if (hp->h_length > 0)
      return hp;
    else
      return NULL;              // entrée erronée (erreur DNS) dans le DNS
  } else {                      // non présent dans le cache dns, tester
-    t_dnscache *c = cache;
-
-    while(c->n)
-      c = c->n;                 // calculer queue
+    // find queue
+    for(; cache->n != NULL; cache = cache->n) ;

 #if HTS_WIDE_DEBUG
    DEBUG_W("gethostbyname\n");
@@ -4953,13 +4934,21 @@ t_hostent *hts_gethostbyname2(httrackp * opt, const char *_iadr, void *v_buffer,
  }                             // retour hp du cache
 }

+t_hostent *hts_gethostbyname2(httrackp * opt, const char *_iadr, void *v_buffer, const char **error) {
+  t_hostent *ret;
+  hts_mutexlock(&opt->state.lock);
+  ret = hts_gethostbyname_(opt, _iadr, v_buffer, error);
+  hts_mutexrelease(&opt->state.lock);
+  return ret;
+}
+
 t_hostent *hts_gethostbyname(httrackp * opt, const char *_iadr, void *v_buffer) {
  return hts_gethostbyname2(opt ,_iadr, v_buffer, NULL);
 }

 #else
-HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, char *iadr,
-                                        t_fullhostent * buffer) {
+static HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, char *iadr,
+                                               t_fullhostent * buffer) {
  t_hostent *retour;

 #if HTS_WIDE_DEBUG
@@ -5353,28 +5342,22 @@ HTSEXT_API void hts_log_print(httrackp * opt, int type, const char *format, ...)
    va_list args;
    const int save_errno = errno;
    const char *s_type = "unknown";
+    const int level = type & 0xff;

-    switch (type & 0xff) {
-    case LOG_DEBUG:
-      // check verbosity
-      if (opt->debug < 2) {
+    // Check log level
+    if (opt->debug < level) {
        return;
-      }
+    }
+
+    // Dispatch
+    switch (level) {
+    case LOG_DEBUG:
      s_type = "debug";
      break;
    case LOG_INFO:
-      // check verbosity
-      if (opt->debug < 1) {
-        return;
-      }
      s_type = "info";
      break;
    case LOG_NOTICE:
-      // check verbosity
-      if (opt->debug < 1) {
-        return;
-      }
-      /* nobreak; */
    case LOG_WARNING:
      s_type = "warning";
      break;
@@ -5530,7 +5513,7 @@ HTSEXT_API httrackp *hts_create_opt(void) {
  opt->extdepth = 0;            // mais pas à l'extérieur
  opt->seeker = 1;              // down 
  opt->urlmode = 2;             // relatif par défaut
-  opt->debug = 0;               // pas de débug en plus
+  opt->debug = LOG_NOTICE;      // small log
  opt->getmode = 3;             // linear scan
  opt->maxsite = -1;            // taille max site (aucune)
  opt->maxfile_nonhtml = -1;    // taille max fichier non html
--- a/src/htslib.h
+++ b/src/htslib.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -216,19 +215,17 @@ struct OLD_htsblk {
 typedef struct t_dnscache t_dnscache;
 #endif
 struct t_dnscache {
-  char iadr[1024];
  struct t_dnscache *n;
-  char host_addr[HTS_MAXADDRLEN];       // 4 octets (v4), ou 16 octets (v6)
  int host_length;              // 4 normalement - ==0  alors en cours de résolution
+  char host_addr[HTS_MAXADDRLEN];       // 4 octets (v4), ou 16 octets (v6)
  // ou >16 si sockaddr
  //                 ==-1 alors erreur (host n'éxiste pas)
+  char iadr[1024];
 };

 /* Library internal definictions */
 #ifdef HTS_INTERNAL_BYTECODE

-extern htsmutex dns_lock;
-
 // initialize an htsblk structure
 void hts_init_htsblk(htsblk * r);

@@ -298,12 +295,11 @@ HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, const char *iadr,
 HTSEXT_API t_hostent *vxgethostbyname2(char *hostname, void *v_buffer, const char **error);
 HTSEXT_API t_hostent *vxgethostbyname(char *hostname, void *v_buffer);
 #endif
-t_hostent *_hts_ghbn(t_dnscache * cache, const char *iadr, t_hostent * retour);
 int ftp_available(void);

 #if HTS_DNSCACHE
 void hts_cache_free(t_dnscache * cache);
-int hts_dnstest(httrackp * opt, const char *_iadr);
+int hts_dnstest(httrackp * opt, const char *_iadr, int add);
 t_dnscache *_hts_cache(httrackp * opt);
 #endif

--- a/src/htsmd5.c
+++ b/src/htsmd5.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsmd5.h
+++ b/src/htsmd5.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsmms.c
+++ b/src/htsmms.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsmms.h
+++ b/src/htsmms.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsmodules.c
+++ b/src/htsmodules.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsmodules.h
+++ b/src/htsmodules.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsname.c
+++ b/src/htsname.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -444,7 +443,23 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
          // note: if savename_delayed is enabled, the naming will be temporary (and slightly invalid!)
          // note: if we are about to stop (opt->state.stop), back_add() will fail later
          else if (opt->savename_delayed != 0 && !opt->state.stop) {
-            if (mime_type != NULL) {
+            // Check if the file is ready in backing. We basically take the same logic as later.
+            // FIXME: we should cleanup and factorize this unholy mess
+            if (headers != NULL && headers->status >= 0) {
+              if (strnotempty(headers->r.cdispo)) {        /* filename given */
+                ext_chg = 2;      /* change filename */
+                strcpybuff(ext, headers->r.cdispo);
+              } else if (!may_unknown2(opt, headers->r.contenttype, headers->url_fil)) {    // on peut patcher à priori? (pas interdit ou pas de type)
+                char s[16];
+                s[0] = '\0';
+                give_mimext(s, headers->r.contenttype);    // obtenir extension
+                if (strnotempty(s) > 0) { // on a reconnu l'extension
+                  ext_chg = 1;
+                  strcpybuff(ext, s);
+                }
+              }
+            }
+            else if (mime_type != NULL) {
              ext[0] = '\0';
              if (*mime_type) {
                give_mimext(ext, mime_type);
@@ -1181,7 +1196,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
      }
      break;
    case 99:{                  // 'codé' .. c'est un gadget
-        int i;
+        size_t i;
        int j;
        char *a;
        char C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
@@ -1191,10 +1206,10 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
        unsigned int s = 0;

        L = (int) strlen(C);
-        for(i = 0; i < (int) strlen(fil_complete); i++) {
+        for(i = 0; fil_complete[i] != '\0'; i++) {
          s += (unsigned int) fil_complete[i];
        }
-        for(i = 0; i < (int) strlen(adr_complete); i++) {
+        for(i = 0; adr_complete[i] != '\0'; i++) {
          s += (unsigned int) adr_complete[i];
        }
        srand(s);
--- a/src/htsname.h
+++ b/src/htsname.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsnet.h
+++ b/src/htsnet.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsopt.h
+++ b/src/htsopt.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -166,12 +165,12 @@ struct fspc_strc {
 #ifndef HTS_DEF_DEFSTRUCT_hts_log_type
 #define HTS_DEF_DEFSTRUCT_hts_log_type
 typedef enum hts_log_type {
-  LOG_DEBUG,
-  LOG_INFO,
-  LOG_NOTICE,
-  LOG_WARNING,
-  LOG_ERROR,
  LOG_PANIC,
+  LOG_ERROR,
+  LOG_WARNING,
+  LOG_NOTICE,
+  LOG_INFO,
+  LOG_DEBUG,
  LOG_ERRNO = 1 << 8
 } hts_log_type;
 #endif
@@ -225,6 +224,7 @@ struct htsoptstate {
  int verif_backblue_done;
  int verif_external_status;
  t_dnscache *dns_cache;
+  int dns_cache_nthreads;
  /* HTML parsing state */
  char _hts_errmsg[HTS_CDLMAXSIZE + 256];
  int _hts_in_html_parsing;
--- a/src/htsparse.c
+++ b/src/htsparse.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -2100,18 +2099,20 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
                  const int hasCharset = charset != NULL 
                    && *charset != '\0';
                  char BIGSTK query[HTS_URLMAXSIZE * 2];
-                  char *const a = strchr(lien, '?');

                  // cut query string
-                  if (a != NULL) {
-                    strcpybuff(query, a);
-                    *a = '\0';
-                  } else {
-                    query[0] = '\0';
+                  {
+                    char *const a = strchr(lien, '?');
+                    if (a != NULL) {
+                      strcpybuff(query, a);
+                      *a = '\0';
+                    } else {
+                      query[0] = '\0';
+                    }
                  }

                  // Unescape %XX, but not yet high-chars (supposedly encoded with UTF-8)
-                  strcpybuff(lien, unescape_http_unharm(catbuff, lien, 1));     /* note: '%' is still escaped */
+                  strcpybuff(lien, unescape_http_unharm(catbuff, lien, 1 | 2));     /* note: '%' is still escaped */

                  // Force to encode non-printable chars (should never happend)
                  escape_remove_control(lien);
@@ -2149,7 +2150,8 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
                  // Decode remaining %XX high characters with UTF-8 
                  // but only when this leads to valid UTF-8.
                  // Otherwise, leave them unescaped.
-                  if (hts_unescapeUrl(lien, catbuff, sizeof(catbuff)) == 0) {
+                  if (hts_unescapeUrlSpecial(lien, catbuff, sizeof(catbuff),
+                                             UNESCAPE_URL_NO_ASCII) == 0) {
                    strcpybuff(lien, catbuff);
                  } else {
                    hts_log_print(opt, LOG_WARNING,
@@ -2601,8 +2603,8 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {

                    // pas d'erreur, on continue
                    r_sv =
-                      hts_wait_delayed(str, adr, fil, save, parenturladr,
-                                       parenturlfil, former_adr, former_fil,
+                      hts_wait_delayed(str, adr, fil, save, liens[ptr]->adr,
+                                       liens[ptr]->fil, former_adr, former_fil,
                                       &forbidden_url);

                    /* User interaction, because hts_wait_delayed can be slow.. (3.43) */
@@ -3745,48 +3747,47 @@ int hts_mirror_check_moved(htsmoduleStruct * str,
      ) {                       // Precondition Failed, c'est à dire pour nous redemander TOUT le fichier
      if (fexist_utf8(liens[ptr]->sav)) {
        remove(liens[ptr]->sav);        // Eliminer
-        if (!fexist_utf8(liens[ptr]->sav)) {    // Bien éliminé? (sinon on boucle..)
-#if HDEBUG
-          printf("Partial content NOT up-to-date, reget all file for %s\n",
-                 liens[ptr]->sav);
-#endif
-          hts_log_print(opt, LOG_DEBUG, "Partial file reget (%s) for %s%s",
-                        r->msg, urladr, urlfil);
-          // enregistrer le MEME lien (MACRO)
-          liens_record(liens[ptr]->adr, liens[ptr]->fil, liens[ptr]->sav, "",
-                       "");
-          if (liens[lien_tot] != NULL) {        // OK, pas d'erreur
-            liens[lien_tot]->testmode = liens[ptr]->testmode;   // mode test?
-            liens[lien_tot]->link_import = 0;   // pas mode import
-            liens[lien_tot]->depth = liens[ptr]->depth;
-            liens[lien_tot]->pass2 = max(liens[ptr]->pass2, numero_passe);
-            liens[lien_tot]->retry = liens[ptr]->retry;
-            liens[lien_tot]->premier = liens[ptr]->premier;
-            liens[lien_tot]->precedent = ptr;
-            lien_tot++;
-            //
-            // canceller lien actuel
-            error = 1;
-            strcpybuff(liens[ptr]->adr, "!");   // caractère bidon (invalide hash)
-            //
-          } else {              // oups erreur, plus de mémoire!!
-            printf("PANIC! : Not enough memory [%d]\n", __LINE__);
-            hts_log_print(opt, LOG_PANIC,
-                          "Not enough memory, can not re-allocate %d bytes",
-                          (int) ((add_tab_alloc + 1) * sizeof(lien_url)));
-            //if (opt->getmode & 1) { if (fp) { fclose(fp); fp=NULL; } }
-            XH_uninit;          // désallocation mémoire & buffers
-            return 0;
-          }
-        } else {
-          hts_log_print(opt, LOG_ERROR, "Can not remove old file %s", urlfil);
-          error = 1;
-        }
      } else {
        hts_log_print(opt, LOG_WARNING,
                      "Unexpected 412/416 error (%s) for %s%s, '%s' could not be found on disk",
                      r->msg, urladr, urlfil,
                      liens[ptr]->sav != NULL ? liens[ptr]->sav : "");
+      }
+      if (!fexist_utf8(liens[ptr]->sav)) {    // Bien éliminé? (sinon on boucle..)
+#if HDEBUG
+        printf("Partial content NOT up-to-date, reget all file for %s\n",
+               liens[ptr]->sav);
+#endif
+        hts_log_print(opt, LOG_DEBUG, "Partial file reget (%s) for %s%s",
+                      r->msg, urladr, urlfil);
+        // enregistrer le MEME lien (MACRO)
+        liens_record(liens[ptr]->adr, liens[ptr]->fil, liens[ptr]->sav, "",
+                     "");
+        if (liens[lien_tot] != NULL) {        // OK, pas d'erreur
+          liens[lien_tot]->testmode = liens[ptr]->testmode;   // mode test?
+          liens[lien_tot]->link_import = 0;   // pas mode import
+          liens[lien_tot]->depth = liens[ptr]->depth;
+          liens[lien_tot]->pass2 = max(liens[ptr]->pass2, numero_passe);
+          liens[lien_tot]->retry = liens[ptr]->retry;
+          liens[lien_tot]->premier = liens[ptr]->premier;
+          liens[lien_tot]->precedent = ptr;
+          lien_tot++;
+          //
+          // canceller lien actuel
+          error = 1;
+          strcpybuff(liens[ptr]->adr, "!");   // caractère bidon (invalide hash)
+          //
+        } else {              // oups erreur, plus de mémoire!!
+          printf("PANIC! : Not enough memory [%d]\n", __LINE__);
+          hts_log_print(opt, LOG_PANIC,
+                        "Not enough memory, can not re-allocate %d bytes",
+                        (int) ((add_tab_alloc + 1) * sizeof(lien_url)));
+          //if (opt->getmode & 1) { if (fp) { fclose(fp); fp=NULL; } }
+          XH_uninit;          // désallocation mémoire & buffers
+          return 0;
+        }
+      } else {
+        hts_log_print(opt, LOG_ERROR, "Can not remove old file %s", urlfil);
        error = 1;
      }

--- a/src/htsparse.h
+++ b/src/htsparse.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsrobots.c
+++ b/src/htsrobots.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsrobots.h
+++ b/src/htsrobots.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsserver.c
+++ b/src/htsserver.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsserver.h
+++ b/src/htsserver.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -267,9 +266,9 @@ static int ehex(char *s) {
 }

 HTS_UNUSED static void unescapehttp(char *s, String * tempo) {
-  int i;
+  size_t i;

-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; s[i] != '\0'; i++) {
    if (s[i] == '%' && s[i + 1] == '%') {
      i++;
      StringAddchar(*tempo, '%');
@@ -288,10 +287,10 @@ HTS_UNUSED static void unescapehttp(char *s, String * tempo) {
 }

 HTS_UNUSED static void unescapeini(char *s, String * tempo) {
-  int i;
+  size_t i;
  char lastc = 0;

-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; s[i] != '\0'; i++) {
    if (s[i] == '%' && s[i + 1] == '%') {
      i++;
      StringAddchar(*tempo, lastc = '%');
--- a/src/htsstrings.h
+++ b/src/htsstrings.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsthread.c
+++ b/src/htsthread.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsthread.h
+++ b/src/htsthread.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htstools.c
+++ b/src/htstools.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -97,9 +96,9 @@ static int ehex(char *s) {
 }

 static void unescapehttp(char *s, String * tempo) {
-  int i;
+  size_t i;

-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; s[i] != '\0'; i++) {
    if (s[i] == '%' && s[i + 1] == '%') {
      i++;
      StringAddchar(*tempo, '%');
--- a/src/htstools.h
+++ b/src/htstools.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsweb.c
+++ b/src/htsweb.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htsweb.h
+++ b/src/htsweb.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htswizard.c
+++ b/src/htswizard.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htswizard.h
+++ b/src/htswizard.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htswrap.c
+++ b/src/htswrap.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htswrap.h
+++ b/src/htswrap.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htszlib.c
+++ b/src/htszlib.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/htszlib.h
+++ b/src/htszlib.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/httrack-library.h
+++ b/src/httrack-library.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
+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
 as published by the Free Software Foundation; either version 2
-of the License, or any later version.
+(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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

@@ -47,12 +46,12 @@ typedef struct strc_int2bytes2 strc_int2bytes2;
 #ifndef HTS_DEF_DEFSTRUCT_hts_log_type
 #define HTS_DEF_DEFSTRUCT_hts_log_type
 typedef enum hts_log_type {
-  LOG_DEBUG,
-  LOG_INFO,
-  LOG_NOTICE,
-  LOG_WARNING,
-  LOG_ERROR,
  LOG_PANIC,
+  LOG_ERROR,
+  LOG_WARNING,
+  LOG_NOTICE,
+  LOG_INFO,
+  LOG_DEBUG,
  LOG_ERRNO = 1 << 8
 } hts_log_type;
 #endif
--- a/src/httrack.c
+++ b/src/httrack.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/httrack.h
+++ b/src/httrack.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Important notes:

--- a/src/proxy/main.c
+++ b/src/proxy/main.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
@@ -91,12 +90,12 @@ int main(int argc, char *argv[]) {
  /* Args */
  printf("ProxyTrack %s, build proxies upon HTTrack Website Copier Archives\n",
         PROXYTRACK_VERSION);
-  printf("Copyright (C) Xavier Roche and other contributors\n");
+  printf("Copyright (C) 1998-2013 Xavier Roche and other contributors\n");
  printf("\n");
-  printf("This program is free software; you can redistribute it and/or\n");
-  printf("modify it under the terms of the GNU General Public License\n");
-  printf("as published by the Free Software Foundation; either version 3\n");
-  printf("of the License, or any later version.\n");
+  printf("This program is free software: you can redistribute it and/or modify\n");
+  printf("it under the terms of the GNU General Public License as published by\n");
+  printf("the Free Software Foundation, either version 3 of the License, or\n");
+  printf("(at your option) any later version.\n");
  printf("\n");
  printf("*** This version is a development release ***\n");
  printf("\n");
--- a/src/proxy/proxystrings.h
+++ b/src/proxy/proxystrings.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
--- a/src/proxy/proxytrack.c
+++ b/src/proxy/proxytrack.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
--- a/src/proxy/proxytrack.h
+++ b/src/proxy/proxytrack.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
--- a/src/proxy/store.c
+++ b/src/proxy/store.c
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
--- a/src/proxy/store.h
+++ b/src/proxy/store.h
@@ -1,12 +1,12 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors

-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 any later version.
+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
@@ -14,8 +14,7 @@ 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

 Please visit our Website: http://www.httrack.com
 */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Xavier Roche	146d2e8981	Merged revisions 878 via svnmerge from http://proliant/svn/httrack/trunk ........ r878 \| roche \| 2013-09-24 07:51:21 +0200 (mar., 24 sept. 2013) \| 3 lines Do not depend anymore on automake1.9, but automake (see http://lists.debian.org/debian-devel/2013/05/msg01459.html) ........	2013-09-24 05:53:16 +00:00
Xavier Roche	ceda82f4fd	3.47.27	2013-09-15 09:09:28 +00:00
Xavier Roche	f6f01eaa96	Fixed license	2013-09-15 08:33:55 +00:00
Xavier Roche	47ca31b627	Fixed logging level (especially for robots.txt rules)	2013-09-15 08:33:31 +00:00
Xavier Roche	f06bd4cd7b	Merged revisions 865 via svnmerge from http://proliant/svn/httrack/trunk ........ r865 \| roche \| 2013-09-14 11:33:39 +0200 (sam., 14 sept. 2013) \| 3 lines Also remove these commands in the help ........	2013-09-14 09:38:10 +00:00
Xavier Roche	f4b879adc9	Merged revisions 851,853,855-857,861-862 via svnmerge from http://proliant/svn/httrack/trunk ........ r851 \| roche \| 2013-09-09 19:20:34 +0200 (lun., 09 sept. 2013) \| 3 lines Fixed Keywords field in desktop files (Sebastian Pipping) ........ r853 \| roche \| 2013-09-13 17:54:23 +0200 (ven., 13 sept. 2013) \| 4 lines Fixed FSF GPL reference (postal address removed, added website) Fixed year notice ........ r855 \| roche \| 2013-09-13 18:08:40 +0200 (ven., 13 sept. 2013) \| 3 lines AUTHORS should be 644 ........ r856 \| roche \| 2013-09-13 18:12:52 +0200 (ven., 13 sept. 2013) \| 3 lines Replaced AM_PROG_LIBTOOL by LT_INIT ........ r857 \| roche \| 2013-09-13 18:13:02 +0200 (ven., 13 sept. 2013) \| 3 lines Updated man ........ r861 \| roche \| 2013-09-13 21:21:03 +0200 (ven., 13 sept. 2013) \| 3 lines Fixed license and copyright ........ r862 \| roche \| 2013-09-13 21:26:08 +0200 (ven., 13 sept. 2013) \| 3 lines Fixed man ........	2013-09-13 19:29:17 +00:00
Xavier Roche	e5f8882c06	Backported r841 Fixed DNS stuck with unresolvable hosts.	2013-09-06 20:40:20 +00:00
Xavier Roche	09fab9362c	3.47.26	2013-09-06 19:55:32 +00:00
Xavier Roche	36e15496c9	Merged revisions 831-833 via svnmerge from http://proliant/svn/httrack/trunk ........ r831 \| roche \| 2013-09-06 18:55:20 +0200 (ven., 06 sept. 2013) \| 3 lines Fixed a little bit the infamous DNS cache ........ r832 \| roche \| 2013-09-06 19:32:04 +0200 (ven., 06 sept. 2013) \| 3 lines Fixed dangling pointer which probably explain the crash at libhttrack.so:0x639d0 ........ r833 \| roche \| 2013-09-06 20:51:07 +0200 (ven., 06 sept. 2013) \| 3 lines Finished to cleanup the DNS cache. ........	2013-09-06 19:46:42 +00:00
Xavier Roche	411965963f	Merged revisions 415 via svnmerge from http://proliant/svn/httrack/trunk ........ r415 \| roche \| 2013-06-30 09:57:07 +0200 (dim., 30 juin 2013) \| 3 lines Added Keywords entries for desktop files. ........	2013-09-06 19:46:09 +00:00
Xavier Roche	eaf4973b4c	3.47.25-1	2013-09-01 14:49:51 +00:00
Xavier Roche	4ae051f6e8	Merged revisions 824-825 via svnmerge from http://proliant/svn/httrack/trunk ........ r824 \| roche \| 2013-09-01 15:58:23 +0200 (dim., 01 sept. 2013) \| 3 lines Fixed content-disposition NOT taken in account (Stephan Matthiesen) except when updating/continuing. ........ r825 \| roche \| 2013-09-01 16:05:08 +0200 (dim., 01 sept. 2013) \| 3 lines Updated history ........	2013-09-01 14:44:16 +00:00
Xavier Roche	c118b8f1ea	3.47.24	2013-08-23 16:29:40 +00:00
Xavier Roche	f49b20df54	Merged revisions 764 via svnmerge from http://proliant/svn/httrack/trunk ........ r764 \| roche \| 2013-08-22 18:21:47 +0200 (jeu., 22 août 2013) \| 4 lines Fixed regression introduced in recent code cleanup The relative "luck" was that the {{{i < s[i] != '\0'}}} expression is actually working for small strings with standard ascii characters (...) ........	2013-08-22 18:01:49 +00:00
Xavier Roche	d40af55729	3.47.23	2013-08-17 10:27:03 +00:00
Xavier Roche	c7db0e2824	Merged revisions 428,704,706-709 via svnmerge from http://proliant/svn/httrack/trunk ........ r428 \| roche \| 2013-07-05 21:42:21 +0200 (ven., 05 juil. 2013) \| 3 lines Croatian translation by Dominko Aždajić (domazd at mail dot ru) ........ r704 \| roche \| 2013-08-16 15:10:20 +0200 (ven., 16 août 2013) \| 3 lines Make "Unexpected 412/416 error" non-fatal until I find out why in hell this bug is still out there. ........ r706 \| roche \| 2013-08-17 09:43:45 +0200 (sam., 17 août 2013) \| 3 lines A bit of cleanup in really old code (strlen() in loops, shame on me, but hey, this code is 15 years old) ........ r707 \| roche \| 2013-08-17 09:57:44 +0200 (sam., 17 août 2013) \| 3 lines Some cleanup in obviously wrong 15-year-old code. ........ r708 \| roche \| 2013-08-17 09:57:53 +0200 (sam., 17 août 2013) \| 3 lines Fixed definition. ........ r709 \| roche \| 2013-08-17 11:09:13 +0200 (sam., 17 août 2013) \| 3 lines Fixed issue 25 regarding un-encoding of characters such as # in the filename. ........	2013-08-17 10:14:38 +00:00
Xavier Roche	e542b0c49a	Fixed history	2013-08-11 19:59:42 +00:00
Xavier Roche	617aeb1e22	3.47.22	2013-08-11 19:58:57 +00:00
Xavier Roche	7b470aa3a6	Merged revisions 528 via svnmerge from http://proliant/svn/httrack/trunk ........ r528 \| roche \| 2013-08-05 12:07:40 +0200 (lun., 05 août 2013) \| 3 lines Allow -m,10000 variant ........	2013-08-05 10:08:07 +00:00
Xavier Roche	3f8efc9209	Merged revisions 493 via svnmerge from http://proliant/svn/httrack/trunk ........ r493 \| roche \| 2013-07-15 21:12:46 +0200 (lun., 15 juil. 2013) \| 4 lines Fixed "Wildcard domains in cookies do not match" (alexei dot co at gmail dot com ) * closes issue #19 ........	2013-07-15 20:05:09 +00:00
Xavier Roche	25e296c53a	Merged revisions 494 via svnmerge from http://proliant/svn/httrack/trunk ........ r494 \| roche \| 2013-07-15 21:19:24 +0200 (lun., 15 juil. 2013) \| 5 lines Fixed buggy referer while parsing: the referer of all links in the page is the current page being parsed, NOT the parent page. (alexei dot co at gmail dot com) * closes: issue #20 ........	2013-07-15 20:04:51 +00:00
Xavier Roche	98db40d5e5	Merged revisions 495 via svnmerge from http://proliant/svn/httrack/trunk ........ r495 \| roche \| 2013-07-15 21:21:25 +0200 (lun., 15 juil. 2013) \| 3 lines Added .torrent => application/x-bittorrent built-in MIME type (alexei dot co at gmail dot com) ........	2013-07-15 20:04:40 +00:00
Xavier Roche	42010f42e7	Merged revisions 496 via svnmerge from http://proliant/svn/httrack/trunk ........ r496 \| roche \| 2013-07-15 21:54:17 +0200 (lun., 15 juil. 2013) \| 3 lines CLEANFILES = check-network_sh.cache ........	2013-07-15 20:04:28 +00:00
Xavier Roche	df67c753f0	Merged revisions 497 via svnmerge from http://proliant/svn/httrack/trunk ........ r497 \| roche \| 2013-07-15 21:56:37 +0200 (lun., 15 juil. 2013) \| 3 lines Ignore *.in, aclocal.m4 and configure ........	2013-07-15 20:03:47 +00:00
Xavier Roche	e1275ce47d	Merged revisions 426 via svnmerge from http://proliant/svn/httrack/trunk ........ r426 \| roche \| 2013-07-05 21:28:02 +0200 (ven., 05 juil. 2013) \| 3 lines Russian translation fixes by Oleg Komarov (komoleg at mail dot ru) ........	2013-07-05 19:28:31 +00:00
Xavier Roche	d7359881ca	Merged revisions 424 via svnmerge from http://proliant/svn/httrack/trunk ........ r424 \| roche \| 2013-07-05 20:48:22 +0200 (ven., 05 juil. 2013) \| 3 lines Fixed ut ........	2013-07-05 18:49:28 +00:00
Xavier Roche	d93f93510d	Merged revisions 422 via svnmerge from http://proliant/svn/httrack/trunk ........ r422 \| roche \| 2013-07-05 20:36:20 +0200 (ven., 05 juil. 2013) \| 3 lines Fixed escaping ........	2013-07-05 18:36:58 +00:00
Xavier Roche	cc76389094	3.47.21	2013-07-05 18:20:48 +00:00
Xavier Roche	b3942b9878	Merged revisions 419 via svnmerge from http://proliant/svn/httrack/trunk ........ r419 \| roche \| 2013-07-05 19:53:54 +0200 (ven., 05 juil. 2013) \| 4 lines Do not unescape '+' before the query string Fixed issue 18 ........	2013-07-05 17:59:26 +00:00
Xavier Roche	fa33acc27e	3.47.20	2013-06-28 17:59:54 +00:00
Xavier Roche	31b5a463fd	Created 3.47 branch.	2013-06-19 18:23:50 +00:00