generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now uses CURL_FORMAT_OFF_T instead of %Od

Browse Source 
Fixed the check for bad resumes. Made test case 99 work and proved a bug
in test case ... eh, was it 32?
This commit is contained in:
Daniel Stenberg
2004-03-01 16:27:34 +00:00
parent b0c51d198c
commit 71d81f1f75
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/transfer.c
View File

@@ -462,10 +462,28 @@ CURLcode Curl_readwrite(struct connectdata *conn,
data->info.header_size += headerlen; data->info.header_size += headerlen;
conn->headerbytecount += headerlen; conn->headerbytecount += headerlen;
/* *auth_act() checks what authentication methods that are if (conn->resume_from &&
available and decides which one (if any) to use. It will !k->content_range &&
set 'newurl' if an auth metod was picked. */ (data->set.httpreq==HTTPREQ_GET)) {
Curl_http_auth_act(conn); if(k->httpcode == 416) {
/* "Requested Range Not Satisfiable" */
stop_reading = TRUE;
}
else {
/* we wanted to resume a download, although the server
doesn't seem to support this and we did this with a GET
(if it wasn't a GET we did a POST or PUT resume) */
failf (data, "HTTP server doesn't seem to support "
"byte ranges. Cannot resume.");
return CURLE_HTTP_RANGE_ERROR;
}
}
if(!stop_reading)
/* *auth_act() checks what authentication methods that are
available and decides which one (if any) to use. It will
set 'newurl' if an auth metod was picked. */
Curl_http_auth_act(conn);
if(!k->header) { if(!k->header) {
/* /*
@@ -881,17 +899,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
k->ignorebody = TRUE; k->ignorebody = TRUE;
infof(data, "Ignoring the response-body\n"); infof(data, "Ignoring the response-body\n");
} }
if (conn->resume_from && if(data->set.timecondition && !conn->range) {
!k->content_range &&
(data->set.httpreq==HTTPREQ_GET)) {
/* we wanted to resume a download, although the server
doesn't seem to support this and we did this with a GET
(if it wasn't a GET we did a POST or PUT resume) */
failf (data, "HTTP server doesn't seem to support "
"byte ranges. Cannot resume.");
return CURLE_HTTP_RANGE_ERROR;
}
else if(data->set.timecondition && !conn->range) {
/* A time condition has been set AND no ranges have been /* A time condition has been set AND no ranges have been
requested. This seems to be what chapter 13.3.4 of requested. This seems to be what chapter 13.3.4 of
RFC 2616 defines to be the correct action for a RFC 2616 defines to be the correct action for a
@@ -1232,7 +1240,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if (data->set.timeout && if (data->set.timeout &&
((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) { ((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) {
failf (data, "Operation timed out with %Od out of %Od bytes received", failf (data, "Operation timed out with " CURL_FORMAT_OFF_T " out of "
CURL_FORMAT_OFF_T " bytes received",
k->bytecount, conn->size); k->bytecount, conn->size);
return CURLE_OPERATION_TIMEOUTED; return CURLE_OPERATION_TIMEOUTED;
} }
@@ -1246,7 +1255,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if(!(data->set.no_body) && (conn->size != -1) && if(!(data->set.no_body) && (conn->size != -1) &&
(k->bytecount != conn->size) && (k->bytecount != conn->size) &&
!conn->newurl) { !conn->newurl) {
failf(data, "transfer closed with %Od bytes remaining to read", failf(data, "transfer closed with " CURL_FORMAT_OFF_T
" bytes remaining to read",
conn->size - k->bytecount); conn->size - k->bytecount);
return CURLE_PARTIAL_FILE; return CURLE_PARTIAL_FILE;
} }