Unverified Commit 9ffad8eb authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 91232402

src/tool_operate.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

tests/data/test1400

+0 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test1401

+0 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test1402

+0 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test1403

+0 −1
Original line number Diff line number Diff line
@@ -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