diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2001-04-18 07:25:11 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2001-04-18 07:25:11 +0000 |
| commit | 3fd65fb7d83a8e3e6acd1a40c48b46088ebd536f (patch) | |
| tree | 13701e723f62ff38452b3c6096eaa98444d9d190 /lib/transfer.c | |
| parent | ebcafe73b313e70b19e4f7b806e020e59f84c5b1 (diff) | |
Remade resume stuff to keep data in the connectdata struct instead of the
main handle struct to work with persistant connections
Diffstat (limited to 'lib/transfer.c')
| -rw-r--r-- | lib/transfer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index cde665c85..52fde048f 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -465,7 +465,7 @@ Transfer(struct connectdata *c_conn) /* This second format was added August 1st 2000 by Igor Khristophorov since Sun's webserver JavaWebServer/1.1.1 obviously sends the header this way! :-( */ - if (data->resume_from == offset) { + if (conn->resume_from == offset) { /* we asked for a resume and we got it */ content_range = TRUE; } @@ -547,7 +547,7 @@ Transfer(struct connectdata *c_conn) infof (data, "Follow to new URL: %s\n", conn->newurl); return CURLE_OK; } - else if (data->resume_from && + else if (conn->resume_from && !content_range && (data->httpreq==HTTPREQ_GET)) { /* we wanted to resume a download, although the server @@ -557,7 +557,7 @@ Transfer(struct connectdata *c_conn) "byte ranges. Cannot resume."); return CURLE_HTTP_RANGE_ERROR; } - else if(data->timecondition && !data->range) { + else if(data->timecondition && !conn->range) { /* A time condition has been set AND no ranges have been requested. This seems to be what chapter 13.3.4 of RFC 2616 defines to be the correct action for a @@ -696,7 +696,7 @@ Transfer(struct connectdata *c_conn) } now = Curl_tvnow(); - if(Curl_pgrsUpdate(data)) + if(Curl_pgrsUpdate(conn)) urg = CURLE_ABORTED_BY_CALLBACK; else urg = Curl_speedcheck (data, now); @@ -730,7 +730,7 @@ Transfer(struct connectdata *c_conn) conn->proto.http->chunk.datasize); return CURLE_PARTIAL_FILE; } - if(Curl_pgrsUpdate(data)) + if(Curl_pgrsUpdate(conn)) return CURLE_ABORTED_BY_CALLBACK; if(conn->bytecountp) |