Unverified Commit 671f0b50 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Revert "curl: don't set CURLOPT_INTERLEAVEDATA" 

This reverts commit 9ffad8eb.

It was actually added rather recently in 8e8afa82 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.
parent 4b6f3cff

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

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

tests/data/test1401

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

tests/data/test1402

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

tests/data/test1403

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