moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Revert "curl: don't set CURLOPT_INTERLEAVEDATA"

Browse Source 
This reverts commit 9ffad8eb13.

It was actually added rather recently in 8e8afa82cb 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.
This commit is contained in:
Daniel Stenberg 2017-12-10 23:58:28 +01:00
parent 4b6f3cff7c
commit 671f0b506c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
10 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tool_operate.c
View File

@ -864,7 +864,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
/* where to store */ /* where to store */
my_setopt(curl, CURLOPT_WRITEDATA, &outs); my_setopt(curl, CURLOPT_WRITEDATA, &outs);
my_setopt(curl, CURLOPT_INTERLEAVEDATA, &outs);
if(metalink || !config->use_metalink) if(metalink || !config->use_metalink)
/* what call to write */ /* what call to write */
my_setopt(curl, CURLOPT_WRITEFUNCTION, tool_write_cb); my_setopt(curl, CURLOPT_WRITEFUNCTION, tool_write_cb);

1
tests/data/test1400
View File

@ -81,6 +81,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1401
View File

@ -100,6 +100,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1402
View File

@ -88,6 +88,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1403
View File

@ -83,6 +83,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1404
View File

@ -152,6 +152,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1405
View File

@ -97,6 +97,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1406
View File

@ -90,6 +90,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1407
View File

@ -70,6 +70,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer

1
tests/data/test1420
View File

@ -75,6 +75,7 @@ int main(int argc, char *argv[])
them yourself. them yourself.
CURLOPT_WRITEDATA set to a objectpointer CURLOPT_WRITEDATA set to a objectpointer
CURLOPT_INTERLEAVEDATA set to a objectpointer
CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_WRITEFUNCTION set to a functionpointer
CURLOPT_READDATA set to a objectpointer CURLOPT_READDATA set to a objectpointer
CURLOPT_READFUNCTION set to a functionpointer CURLOPT_READFUNCTION set to a functionpointer