moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Undo the 2004-11-18 change to fd_read_body. Instead, always use the

Browse Source 
"exact" flag.
This commit is contained in:
hniksic 2005-03-19 09:38:46 -08:00
parent 72ce32e8ab
commit 828a50e4f3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-15 Hrvoje Niksic <hniksic@xemacs.org>
* retr.c (fd_read_body): Undo the 2004-11-18 change. Instead,
always be "exact".
2005-03-17 Hrvoje Niksic <hniksic@xemacs.org> 2005-03-17 Hrvoje Niksic <hniksic@xemacs.org>
* ftp-basic.c (ftp_login): Don't free the string if ftp_response * ftp-basic.c (ftp_login): Don't free the string if ftp_response

10
src/retr.c
View File

@ -214,7 +214,8 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
data arrives slowly. */ data arrives slowly. */
int progress_interactive = 0; int progress_interactive = 0;
int exact = flags & rb_read_exactly; /*int exact = flags & rb_read_exactly;*/
int exact = 1;
wgint skip = 0; wgint skip = 0;
/* How much data we've read/written. */ /* How much data we've read/written. */
@ -285,13 +286,6 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
} }
ret = fd_read (fd, dlbuf, rdsize, tmout); ret = fd_read (fd, dlbuf, rdsize, tmout);
/* when retrieving from http-proxy wget sometimes does not trust the
* file length reported by server.
* this check is to tell wget not to stubbornly try to read again and
* again until another errno code was received. */
if ( ret == -1 && errno == ETIMEDOUT && sum_read == toread && toread > 0 )
break;
if (ret == 0 || (ret < 0 && errno != ETIMEDOUT)) if (ret == 0 || (ret < 0 && errno != ETIMEDOUT))
break; /* read error */ break; /* read error */
else if (ret < 0) else if (ret < 0)