summaryrefslogtreecommitdiff
path: root/tests/libtest
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-01-14 16:31:42 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-01-15 08:33:27 +0100
commit1123a0eb243338d259dc21863b2f2c54e3427782 (patch)
tree1c3fcd226ea1110af13203578123c78a1a6d5e2e /tests/libtest
parentb68dc34af341805aeb7b371541a2b4074da76217 (diff)
downloadcurl-1123a0eb243338d259dc21863b2f2c54e3427782.tar.gz
mime: make sure setting MIMEPOST to NULL resets properly
... so that a function can first use MIMEPOST and then set it to NULL to reset it back to a blank POST. Added test 584 to verify the fix. Reported-by: Christoph M. Becker Fixes #6455 Closes #6456
Diffstat (limited to 'tests/libtest')
-rw-r--r--tests/libtest/Makefile.inc6
-rw-r--r--tests/libtest/lib589.c17
2 files changed, 20 insertions, 3 deletions
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 28cf92ab7..ef52e80f8 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -44,7 +44,8 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 lib557 lib558 \
lib559 lib560 lib562 lib564 lib565 lib566 lib567 lib568 lib569 lib570 \
lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \
- lib583 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 lib599 \
+ lib583 lib584 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 \
+ lib599 \
lib643 lib644 lib645 lib650 lib651 lib652 lib653 lib654 lib655 lib658 \
lib659 lib661 lib666 lib667 lib668 \
lib670 lib671 lib672 lib673 lib674 \
@@ -302,6 +303,9 @@ lib582_CPPFLAGS = $(AM_CPPFLAGS)
lib583_SOURCES = lib583.c $(SUPPORTFILES)
lib583_CPPFLAGS = $(AM_CPPFLAGS)
+lib584_SOURCES = lib589.c $(SUPPORTFILES)
+lib584_CPPFLAGS = $(AM_CPPFLAGS) -DLIB584
+
lib585_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(MULTIBYTE)
lib585_LDADD = $(TESTUTIL_LIBS)
lib585_CPPFLAGS = $(AM_CPPFLAGS) -DLIB585
diff --git a/tests/libtest/lib589.c b/tests/libtest/lib589.c
index 43b1aee01..06cc375f9 100644
--- a/tests/libtest/lib589.c
+++ b/tests/libtest/lib589.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -42,10 +42,23 @@ int test(char *URL)
/* First set the URL that is about to receive our POST. */
test_setopt(curl, CURLOPT_URL, URL);
- test_setopt(curl, CURLOPT_MIMEPOST, NULL);
test_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */
test_setopt(curl, CURLOPT_HEADER, 1L); /* include header */
+#ifdef LIB584
+ {
+ curl_mime *mime = curl_mime_init(curl);
+ curl_mimepart *part = curl_mime_addpart(mime);
+ curl_mime_name(part, "fake");
+ curl_mime_data(part, "party", 5);
+ test_setopt(curl, CURLOPT_MIMEPOST, mime);
+ res = curl_easy_perform(curl);
+ curl_mime_free(mime);
+ }
+#endif
+
+ test_setopt(curl, CURLOPT_MIMEPOST, NULL);
+
/* Now, we should be making a zero byte POST request */
res = curl_easy_perform(curl);