[GNUnet-SVN] [gnurl] 43/125: curl: don't set CURLOPT_INTERLEAVEDATA

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 9ffad8eb1329bb35c8988115ac7ed85cf91ef955
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Dec 8 16:07:01 2017 +0100

    curl: don't set CURLOPT_INTERLEAVEDATA
    
    That data is only ever used by the CURLOPT_INTERLEAVEFUNCTION callback
    and that option isn't set or used by the curl tool!
    
    Updates the 9 tests that verify --libcurl
    
    Closes #2167
---
 src/tool_operate.c  | 2 +-
 tests/data/test1400 | 1 -
 tests/data/test1401 | 1 -
 tests/data/test1402 | 1 -
 tests/data/test1403 | 1 -
 tests/data/test1404 | 1 -
 tests/data/test1405 | 1 -
 tests/data/test1406 | 1 -
 tests/data/test1407 | 1 -
 tests/data/test1420 | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 5401955af..fe7b65200 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 0cef18dfd..e8090f552 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 de4d0aa4f..02705df2e 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 d2b05f562..9c4f47342 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 b08728314..c7b8896a8 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 53ab37b49..6d81441aa 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 f3ad3e795..34b165e73 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 033957f60..738870ba9 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 5a3de1b17..a8cc18e6c 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 38139e0b0..69337e770 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

-- 
To stop receiving notification emails like this one, please contact
address@hidden