1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

Automated merge.

This commit is contained in:
Micah Cowan 2008-11-26 21:53:40 -08:00
commit d8c11a82ca
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2008-11-13 Micah Cowan <micah@cowan.name>
* http.c (gethttp): Don't do anything when content-length >= our
requested range.
2008-11-16 Steven Schubiger <stsc@members.fsf.org> 2008-11-16 Steven Schubiger <stsc@members.fsf.org>
* main.c: Declare and initialize the numurls counter. * main.c: Declare and initialize the numurls counter.

View File

@ -2150,11 +2150,15 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file));
} }
} }
if (statcode == HTTP_STATUS_RANGE_NOT_SATISFIABLE) if (statcode == HTTP_STATUS_RANGE_NOT_SATISFIABLE
|| (hs->restval > 0 && statcode == HTTP_STATUS_OK
&& contrange == 0 && hs->restval >= contlen)
)
{ {
/* If `-c' is in use and the file has been fully downloaded (or /* If `-c' is in use and the file has been fully downloaded (or
the remote file has shrunk), Wget effectively requests bytes the remote file has shrunk), Wget effectively requests bytes
after the end of file and the server response with 416. */ after the end of file and the server response with 416
(or 200 with a <= Content-Length. */
logputs (LOG_VERBOSE, _("\ logputs (LOG_VERBOSE, _("\
\n The file is already fully retrieved; nothing to do.\n\n")); \n The file is already fully retrieved; nothing to do.\n\n"));
/* In case the caller inspects. */ /* In case the caller inspects. */