[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 55/125: Revert "curl: don't set CURLOPT_INTERLEAVED
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 55/125: Revert "curl: don't set CURLOPT_INTERLEAVEDATA" |
Date: |
Sun, 21 Jan 2018 23:41:50 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 671f0b506c01897a606fe62ef96369e4bf3ca08a
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sun Dec 10 23:58:28 2017 +0100
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.
---
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, 10 insertions(+), 1 deletion(-)
diff --git a/src/tool_operate.c b/src/tool_operate.c
index fe7b65200..5401955af 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 e8090f552..0cef18dfd 100644
--- 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 02705df2e..de4d0aa4f 100644
--- 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 9c4f47342..d2b05f562 100644
--- 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 c7b8896a8..b08728314 100644
--- 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 6d81441aa..53ab37b49 100644
--- 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 34b165e73..f3ad3e795 100644
--- 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 738870ba9..033957f60 100644
--- 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 a8cc18e6c..5a3de1b17 100644
--- 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 69337e770..38139e0b0 100644
--- 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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 25/125: conncache: fix several lock issues, (continued)
- [GNUnet-SVN] [gnurl] 25/125: conncache: fix several lock issues, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 67/125: curl: support >256 bytes warning messsages, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 99/125: setopt: reintroduce non-static Curl_vsetopt() for OS400 support, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 82/125: build: Fixed incorrect script termination from commit ad1dc10e61, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 92/125: mail-rcpt.d: fix short-text description, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 102/125: configure.ac: append extra linker flags instead of prepending them., gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 112/125: SMB: fix numeric constant suffix and variable types, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 119/125: examples/url2file.c: add missing curl_global_cleanup() call, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 84/125: examples/cacertinmem: ignore cert-already-exists error, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 123/125: libcurl-env.3: first take, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 55/125: Revert "curl: don't set CURLOPT_INTERLEAVEDATA",
gnunet <=
- [GNUnet-SVN] [gnurl] 62/125: setopt: less *or equal* than INT_MAX/1000 should be fine, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 68/125: conncache: fix a return code [regression], gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 65/125: examples/smtp-mail.c: use separate defines for options and mail, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 125/125: Merge branch 'master' of https://github.com/curl/curl, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 81/125: Makefile.vc: Added our standard copyright header, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 73/125: content_encoding: rework zlib_inflate, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 96/125: system.h: Additionally check __LONG_MAX__ for defining curl_off_t, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 107/125: docs: comment about CURLE_READ_ERROR returned by curl_mime_filedata, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 120/125: test558: fix for multissl builds, gnunet, 2018/01/21
- [GNUnet-SVN] [gnurl] 79/125: build: Added Visual Studio 2017 project files, gnunet, 2018/01/21