diff --git a/src/tool_operate.c b/src/tool_operate.c index 5401955afb..fe7b652006 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -864,7 +864,7 @@ static CURLcode operate_do(struct GlobalConfig *global, /* where to store */ my_setopt(curl, CURLOPT_WRITEDATA, &outs); - my_setopt(curl, CURLOPT_INTERLEAVEDATA, &outs); + if(metalink || !config->use_metalink) /* what call to write */ my_setopt(curl, CURLOPT_WRITEFUNCTION, tool_write_cb); diff --git a/tests/data/test1400 b/tests/data/test1400 index 0cef18dfd0..e8090f552b 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -81,7 +81,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1401 b/tests/data/test1401 index de4d0aa4f7..02705df2e1 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -100,7 +100,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1402 b/tests/data/test1402 index d2b05f5620..9c4f47342f 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -88,7 +88,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1403 b/tests/data/test1403 index b087283147..c7b8896a80 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -83,7 +83,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1404 b/tests/data/test1404 index 53ab37b499..6d81441aa5 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -152,7 +152,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1405 b/tests/data/test1405 index f3ad3e7953..34b165e739 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -97,7 +97,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1406 b/tests/data/test1406 index 033957f607..738870ba9d 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -90,7 +90,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1407 b/tests/data/test1407 index 5a3de1b179..a8cc18e6c3 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -70,7 +70,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1420 b/tests/data/test1420 index 38139e0b08..69337e770e 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -75,7 +75,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer