d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to skip to the requested offset if the server returns more data

Browse Source 
than requested.  Instead, inform the caller of the real offset by modifying
the offset field in the original struct url, and let him decide how to handle
the situation.
This commit is contained in:
Dag-Erling Smørgrav 2000-07-19 23:43:49 +00:00
parent 23053d8f2f
commit 87b41116cc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=63567
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libfetch/http.c
View File

@ -825,7 +825,7 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
/* other headers */
_http_cmd(fd, "Host: %s:%d", host, url->port);
_http_cmd(fd, "User-Agent: %s " _LIBFETCH_VER, __progname);
if (URL->offset)
if (url->offset)
_http_cmd(fd, "Range: bytes=%lld-", url->offset);
_http_cmd(fd, "Connection: close");
_http_cmd(fd, "");
@ -950,19 +950,21 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
goto ouch;
}
/* too far? */
if (offset > url->offset) {
_http_seterr(HTTP_PROTOCOL_ERROR);
goto ouch;
}
/* report back real offset */
URL->offset = offset;
/* wrap it up in a FILE */
if ((f = chunked ? _http_funopen(fd) : fdopen(fd, "r")) == NULL) {
_fetch_syserr();
goto ouch;
}
while (offset++ < url->offset)
if (fgetc(f) == EOF) {
_fetch_syserr();
fclose(f);
f = NULL;
}
if (url != URL)
fetchFreeURL(url);