diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | history.txt | 4 | ||||
| -rw-r--r-- | html/httrack.man.html | 2 | ||||
| -rw-r--r-- | src/htscore.c | 12 | ||||
| -rw-r--r-- | src/htsglobal.h | 2 | ||||
| -rw-r--r-- | src/htsparse.c | 16 |
7 files changed, 31 insertions, 9 deletions
@@ -2992,7 +2992,7 @@ fi # Define the identity of the package. PACKAGE=httrack - VERSION=3.45.1 + VERSION=3.45.2 cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index 01f817d..d3cd435 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(src/httrack.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(httrack, 3.45.1) +AM_INIT_AUTOMAKE(httrack, 3.45.2) VERSION_INFO="2:45:0" AM_MAINTAINER_MODE diff --git a/history.txt b/history.txt index fe2785f..4a3f8aa 100644 --- a/history.txt +++ b/history.txt @@ -4,6 +4,10 @@ HTTrack Website Copier release history: This file lists all changes and fixes that have been made for HTTrack. +3.45-2 +* Fixed: number of simultaneous connections was often only one +* Fixed: "Unexpected 412/416 error" leading to have broken files on disk + 3.45-1 * Fixed: interrupting an update/continue mirror session should not delete anymore previously downloaded content (William Roeder, Alain Desilets and many others) * Fixed: --continue/--update bug leading to download again already cached data in some cases (especially redirect/error pages) diff --git a/html/httrack.man.html b/html/httrack.man.html index 7936d22..73c6d94 100644 --- a/html/httrack.man.html +++ b/html/httrack.man.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.20.1 --> -<!-- CreationDate: Sat Mar 17 12:40:38 2012 --> +<!-- CreationDate: Sun Mar 18 22:01:48 2012 --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> diff --git a/src/htscore.c b/src/htscore.c index 650633e..1d1bc88 100644 --- a/src/htscore.c +++ b/src/htscore.c @@ -2934,9 +2934,15 @@ int back_fill(struct_back* sback,httrackp* opt,cache_back* cache,lien_url** lien if (numero_passe!=0) ok=0; } - if (ok && liens[p]->sav != NULL && liens[p]->sav[0] != '\0' - && hash_read(opt->hash,liens[p]->sav,"",0,opt->urlhack) >= 0) // lookup in liens_record - { + + // Why in hell did I do that ? + //if (ok && liens[p]->sav != NULL && liens[p]->sav[0] != '\0' + // && hash_read(opt->hash,liens[p]->sav,"",0,opt->urlhack) >= 0) // lookup in liens_record + //{ + // ok = 0; + //} + if (liens[p]->sav == NULL || liens[p]->sav[0] == '\0' + || hash_read(opt->hash,liens[p]->sav,"",0,opt->urlhack) < 0) { ok = 0; } diff --git a/src/htsglobal.h b/src/htsglobal.h index 2b9e0a4..c4db403 100644 --- a/src/htsglobal.h +++ b/src/htsglobal.h @@ -41,7 +41,7 @@ Please visit our Website: http://www.httrack.com // Version (also check external version information) #define HTTRACK_VERSION "3.45" -#define HTTRACK_VERSIONID "3.45.1" +#define HTTRACK_VERSIONID "3.45.2" #define HTTRACK_AFF_VERSION "3.x" #define HTTRACK_LIB_VERSION "2.0" diff --git a/src/htsparse.c b/src/htsparse.c index 146f8e9..2ee266a 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -3473,12 +3473,24 @@ int hts_mirror_check_moved(htsmoduleStruct* str, htsmoduleStructExtended* stre) if (opt->log!=NULL) { HTS_LOG(opt,LOG_ERROR); fprintf(opt->log,"Can not remove old file %s"LF,urlfil); test_flush; + error = 1; } } } else { if (opt->log!=NULL) { - HTS_LOG(opt,LOG_WARNING); fprintf(opt->log,"Unexpected 412/416 error (%s) for %s%s"LF,r->msg,urladr,urlfil); + HTS_LOG(opt,LOG_WARNING); fprintf(opt->log,"Unexpected 412/416 error (%s) for %s%s, '%s' could not be found on disk"LF,r->msg,urladr,urlfil,liens[ptr]->sav != NULL ? liens[ptr]->sav : ""); test_flush; + error = 1; + } + } + + // Error ? + if (error) { + if (!opt->errpage) { + if (r->adr) { // désalloc + freet(r->adr); + r->adr=NULL; + } } } } else if (r->statuscode!=HTTP_OK) { @@ -3619,8 +3631,8 @@ int hts_mirror_check_moved(htsmoduleStruct* str, htsmoduleStructExtended* stre) freet(r->adr); r->adr=NULL; } - error=1; // erreur! } + error=1; // erreur! } // FIN rattrapage des 301,302,307.. // ------------------------------------------------------------ |