system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 21:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

When restarting a transfer that has already completed, the server will

Browse source 
reply with a 416 error code (requested range not satisfiable) because
we ask it to start at the end of the file.  Handle this gracefully by
considering a 416 reply a success if the requested offset exactly
matches the length of the file and the requested length is zero.
This commit is contained in:
Dag-Erling Smørgrav 2004-02-11 09:31:39 +00:00
parent 2576e45915
commit b5e1214546
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=125696
1 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/libfetch/http.c
View file

@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$");
#define HTTP_SEE_OTHER 303
#define HTTP_NEED_AUTH 401
#define HTTP_NEED_PROXY_AUTH 407
#define HTTP_BAD_RANGE 416
#define HTTP_PROTOCOL_ERROR 999
#define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \
@ -513,22 +514,34 @@ _http_parse_range(const char *p, off_t *offset, off_t *length, off_t *size)
if (strncasecmp(p, "bytes ", 6) != 0)
return (-1);
for (first = 0, p += 6; *p && isdigit(*p); ++p)
first = first * 10 + *p - '0';
if (*p != '-')
return (-1);
for (last = 0, ++p; *p && isdigit(*p); ++p)
last = last * 10 + *p - '0';
p += 6;
if (*p == '*') {
first = last = -1;
++p;
} else {
for (first = 0; *p && isdigit(*p); ++p)
first = first * 10 + *p - '0';
if (*p != '-')
return (-1);
for (last = 0, ++p; *p && isdigit(*p); ++p)
last = last * 10 + *p - '0';
}
if (first > last || *p != '/')
return (-1);
for (len = 0, ++p; *p && isdigit(*p); ++p)
len = len * 10 + *p - '0';
if (*p || len < last - first + 1)
return (-1);
DEBUG(fprintf(stderr, "content range: [%lld-%lld/%lld]\n",
(long long)first, (long long)last, (long long)len));
if (first == -1) {
DEBUG(fprintf(stderr, "content range: [*/%lld]\n",
(long long)len));
*length = 0;
} else {
DEBUG(fprintf(stderr, "content range: [%lld-%lld/%lld]\n",
(long long)first, (long long)last, (long long)len));
*length = last - first + 1;
}
*offset = first;
*length = last - first + 1;
*size = len;
return (0);
}
@ -929,6 +942,13 @@ _http_request(struct url *URL, const char *op, struct url_stat *us,
*/
_http_seterr(conn->err);
goto ouch;
case HTTP_BAD_RANGE:
/*
* This can happen if we ask for 0 bytes because
* we already have the whole file. Consider this
* a success for now, and check sizes later.
*/
break;
case HTTP_PROTOCOL_ERROR:
/* fall through */
case -1:
@ -1010,6 +1030,18 @@ _http_request(struct url *URL, const char *op, struct url_stat *us,
continue;
}
/* requested range not satisfiable */
if (conn->err == HTTP_BAD_RANGE) {
if (url->offset == size && url->length == 0) {
/* asked for 0 bytes; fake it */
offset = url->offset;
conn->err = HTTP_OK;
break;
} else {
goto ouch;
}
}
/* we have a hit or an error */
if (conn->err == HTTP_OK || conn->err == HTTP_PARTIAL || HTTP_ERROR(conn->err))
break;