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 fe7b6520069701e027465ef4f516d4cf2c31155a..5401955afba14f108a4166b3cd52224564d6d08b 100644 (file)
--- 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 e8090f552b1e381cad4c3cc01637d67f900d920c..0cef18dfd0c98517cf355a764cdb3e92aa17a760 100644 (file)
--- 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 02705df2e1a9ceb1fd4e9ed4023e3487e156897d..de4d0aa4f7b8a9f2cfca1ff0de93212cc9ebd75c 100644 (file)
--- 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 9c4f47342f5705028e6f37efd8fc5ea05cec36d3..d2b05f56204220871f019d791f41e42112714de8 100644 (file)
--- 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 c7b8896a8043a99254ad3aaacf923737e8df9923..b0872831477b4e278ae3cc9502c4cf8454ef6ff4 100644 (file)
--- 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 6d81441aa548f7365af67d152d7137f3ea1cab97..53ab37b49981ea1a9841f6c803a7319089d63614 100644 (file)
--- 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 34b165e73974f3b4fedbe235e2793d1b328e2132..f3ad3e7953fda3e2c22332e83285eb8160f56af4 100644 (file)
--- 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 738870ba9db13205cace465cde76bd9588c55c8f..033957f607687f4a509dbc65fd57c377f0fbf1b6 100644 (file)
--- 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 a8cc18e6c33b00d3ef28b23fc209707f2b37da97..5a3de1b179dd510eaae957d911909190add73225 100644 (file)
--- 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 69337e770e98e2a7b9e2041d4b9fb8f1d5584194..38139e0b0847bf864d57744ba46cef9064a1181f 100644 (file)
--- 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