github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-02-24 10:41:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Don't fiddle with "interactive timeout" if read timeout is unset.

Browse Source
This commit is contained in:
hniksic 2003-12-12 14:40:39 -08:00
parent 78890a267c
commit 9179f2e699
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-12 Hrvoje Niksic <hniksic@xemacs.org>
* retr.c (fd_read_body): Don't fiddle with "interactive timeout"
if read timeout is unset.
2003-12-12 Hrvoje Niksic <hniksic@xemacs.org> 2003-12-12 Hrvoje Niksic <hniksic@xemacs.org>
* connect.c (bind_local): Don't set the IPV6_V6ONLY option on the * connect.c (bind_local): Don't set the IPV6_V6ONLY option on the

21
src/retr.c
View File

@ -259,21 +259,24 @@ fd_read_body (int fd, FILE *out, long toread, long startpos,
double tmout = opt.read_timeout; double tmout = opt.read_timeout;
if (progress_interactive) if (progress_interactive)
{ {
double waittm;
/* For interactive progress gauges, always specify a ~1s /* For interactive progress gauges, always specify a ~1s
timeout, so that the gauge can be updated regularly even timeout, so that the gauge can be updated regularly even
when the data arrives very slowly or stalls. */ when the data arrives very slowly or stalls. */
tmout = 0.95; tmout = 0.95;
waittm = (wtimer_read (timer) - last_successful_read_tm) / 1000; if (opt.read_timeout)
if (waittm + tmout > opt.read_timeout)
{ {
/* Don't let total idle time exceed read timeout. */ double waittm;
tmout = opt.read_timeout - waittm; waittm = (wtimer_read (timer) - last_successful_read_tm) / 1000;
if (tmout < 0) if (waittm + tmout > opt.read_timeout)
{ {
/* We've already exceeded the timeout. */ /* Don't let total idle time exceed read timeout. */
ret = -1, errno = ETIMEDOUT; tmout = opt.read_timeout - waittm;
break; if (tmout < 0)
{
/* We've already exceeded the timeout. */
ret = -1, errno = ETIMEDOUT;
break;
}
} }
} }
} }