mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-15 06:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bagder/curl_range-data-conn'

Browse Source
This commit is contained in:
Daniel Stenberg 2021-01-20 14:59:24 +01:00
commit 86a95eb076
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/curl_range.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -33,12 +33,11 @@
Check if this is a range download, and if so, set the internal variables
properly.
*/
CURLcode Curl_range(struct connectdata *conn)
CURLcode Curl_range(struct Curl_easy *data)
{
curl_off_t from, to;
char *ptr;
char *ptr2;
struct Curl_easy *data = conn->data;
if(data->state.use_range && data->state.range) {
CURLofft from_t;

5
lib/curl_range.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -25,6 +25,5 @@
#include "curl_setup.h"
#include "urldata.h"
CURLcode Curl_range(struct connectdata *conn);
CURLcode Curl_range(struct Curl_easy *data);
#endif /* HEADER_CURL_RANGE_H */

3
lib/file.c
View File

@ -372,7 +372,6 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
curl_off_t expected_size = -1;
bool size_known;
bool fstated = FALSE;
struct connectdata *conn = data->conn;
char *buf = data->state.buffer;
curl_off_t bytecount = 0;
int fd;
@ -451,7 +450,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
}
/* Check whether file range has been specified */
result = Curl_range(conn);
result = Curl_range(data);
if(result)
return result;

4
lib/ftp.c
View File

@ -830,7 +830,7 @@ static int ftp_domore_getsock(struct Curl_easy *data,
connect on the secondary connection */
socks[0] = conn->sock[FIRSTSOCKET];
if(!conn->data->set.ftp_use_port) {
if(!data->set.ftp_use_port) {
int s;
int i;
/* PORT is used to tell the server to connect to us, and during that we
@ -3633,7 +3633,7 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep)
/* download */
ftp->downloadsize = -1; /* unknown as of yet */
result = Curl_range(conn);
result = Curl_range(data);
if(result == CURLE_OK && data->req.maxdownload >= 0) {
/* Don't check for successful transfer */