From: Daniel Stenberg Date: Sun, 10 Dec 2017 22:58:28 +0000 (+0100) Subject: Revert "curl: don't set CURLOPT_INTERLEAVEDATA" X-Git-Tag: curl-7_58_0~76 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=671f0b506c01897a606fe62ef96369e4bf3ca08a;p=thirdparty%2Fcurl.git Revert "curl: don't set CURLOPT_INTERLEAVEDATA" This reverts commit 9ffad8eb1329bb35c8988115ac7ed85cf91ef955. It was actually added rather recently in 8e8afa82cbb629 due to a crash that would otherwise happen in the RTSP code. As I don't think we've fixed that behavior yet, we better keep this work-around until we have fixed it better. --- diff --git a/src/tool_operate.c b/src/tool_operate.c index fe7b652006..5401955afb 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 e8090f552b..0cef18dfd0 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -81,6 +81,7 @@ 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 02705df2e1..de4d0aa4f7 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -100,6 +100,7 @@ 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 9c4f47342f..d2b05f5620 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -88,6 +88,7 @@ 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 c7b8896a80..b087283147 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -83,6 +83,7 @@ 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 6d81441aa5..53ab37b499 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -152,6 +152,7 @@ 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 34b165e739..f3ad3e7953 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -97,6 +97,7 @@ 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 738870ba9d..033957f607 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -90,6 +90,7 @@ 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 a8cc18e6c3..5a3de1b179 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -70,6 +70,7 @@ 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 69337e770e..38139e0b08 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -75,6 +75,7 @@ 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