summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--history.txt11
-rw-r--r--html/httrack.man.html14
-rw-r--r--man/httrack.16
-rw-r--r--src/htsinthash.h10
6 files changed, 36 insertions, 27 deletions
diff --git a/configure b/configure
index c6dbb5a..078d86c 100755
--- a/configure
+++ b/configure
@@ -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.99.
#
# 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.99'
+PACKAGE_STRING='httrack 3.47.99'
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.99 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.99:";;
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.99
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.99, 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.99'
cat >>confdefs.h <<_ACEOF
@@ -16892,7 +16892,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.99, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16959,7 +16959,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.99
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 479b9de..a8445e4 100644
--- 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.99], [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)
diff --git a/history.txt b/history.txt
index 9811dd7..c737d53 100644
--- 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,15 @@ 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)
3.46-1
diff --git a/html/httrack.man.html b/html/httrack.man.html
index efceee6..d1e15ae 100644
--- 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%">
diff --git a/man/httrack.1 b/man/httrack.1
index 8d035c2..133f888 100644
--- 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-21 (compiled Jul 5 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
diff --git a/src/htsinthash.h b/src/htsinthash.h
index 43bdd38..8406c9b 100644
--- a/src/htsinthash.h
+++ b/src/htsinthash.h
@@ -181,11 +181,11 @@ size_t inthash_nitems(inthash hashtable);
**/
size_t inthash_memory_size(inthash hashtable);
-/**
- * If 'flag' is non-zero, calls inthash_value_set_value_handler() with
- * default system free() handler function, otherwise, free the value handlers.
- **/
-void inthash_value_is_malloc(inthash hashtable, int flag);
+/**
+ * If 'flag' is non-zero, calls inthash_value_set_value_handler() with
+ * default system free() handler function, otherwise, free the value handlers.
+ **/
+void inthash_value_is_malloc(inthash hashtable, int flag);
/**
* Set handlers for values.