From 8351ab45105c3e58c38205c045477198ff887829 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Fri, 20 Oct 2017 14:01:14 +0100 Subject: test653: check reuse of easy handle after mime data change See issue #1999 --- tests/data/Makefile.inc | 2 +- tests/data/test653 | 93 ++++++++++++++++++++++++++++++++++++++++++++++ tests/libtest/Makefile.inc | 5 ++- tests/libtest/lib653.c | 63 +++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 tests/data/test653 create mode 100644 tests/libtest/lib653.c diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index dcd663f3e..eaa1bbced 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -79,7 +79,7 @@ test617 test618 test619 test620 test621 test622 test623 test624 test625 \ test626 test627 test628 test629 test630 test631 test632 test633 test634 \ test635 test636 test637 test638 test639 test640 test641 test642 \ test643 test644 test645 test646 test647 test648 test649 test650 test651 \ -test652 \ +test652 test653 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ test709 test710 test711 test712 test713 test714 test715 \ diff --git a/tests/data/test653 b/tests/data/test653 new file mode 100644 index 000000000..d620b5761 --- /dev/null +++ b/tests/data/test653 @@ -0,0 +1,93 @@ + + + +HTTP +HTTP POST +MIME + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake swsclose +Connection: close +Content-Type: text/html + +hello + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake swsclose +Connection: close +Content-Type: text/html + +hello +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake swsclose +Connection: close +Content-Type: text/html + +hello + + + +# Client-side + + +http + +# tool is what to use instead of 'curl' + +lib653 + + + +Reuse of handle after altering mime data + + +http://%HOSTIP:%HTTPPORT/653 + + + +# +# Verify data after the test has been "shot" + + +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ + +# Note that the stripping above removes 12 bytes from every occurrence of the +# boundary string and since 5 of them are in the body contents, we see +# (5*12) == 60 bytes less + +POST /653 HTTP/1.1 +Host: 127.0.0.1:8990 +Accept: */* +Content-Length: 150 +Content-Type: multipart/form-data; boundary=---------------------------- + +------------------------------ +Content-Disposition: form-data; name="name" + +short value +-------------------------------- +POST /653 HTTP/1.1 +Host: 127.0.0.1:8990 +Accept: */* +Content-Length: 167 +Content-Type: multipart/form-data; boundary=---------------------------- + +------------------------------ +Content-Disposition: form-data; name="name" + +long value for length change +-------------------------------- + + + diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 381f80552..230416763 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -20,7 +20,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ 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 \ - lib643 lib644 lib645 lib650 lib651 lib652 \ + lib643 lib644 lib645 lib650 lib651 lib652 lib653 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 lib1521 \ @@ -321,6 +321,9 @@ lib651_CPPFLAGS = $(AM_CPPFLAGS) lib652_SOURCES = lib652.c $(SUPPORTFILES) lib652_CPPFLAGS = $(AM_CPPFLAGS) +lib653_SOURCES = lib653.c $(SUPPORTFILES) +lib653_CPPFLAGS = $(AM_CPPFLAGS) + lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL) lib1500_LDADD = $(TESTUTIL_LIBS) lib1500_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib653.c b/tests/libtest/lib653.c new file mode 100644 index 000000000..6d78ee0f4 --- /dev/null +++ b/tests/libtest/lib653.c @@ -0,0 +1,63 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "testutil.h" +#include "warnless.h" +#include "memdebug.h" + + +int test(char *URL) +{ + CURL *curls = NULL; + int res = 0; + curl_mimepart *field = NULL; + curl_mime *mime = NULL; + + global_init(CURL_GLOBAL_ALL); + easy_init(curls); + + mime = curl_mime_init(curls); + field = curl_mime_addpart(mime); + curl_mime_name(field, "name"); + curl_mime_data(field, "short value", CURL_ZERO_TERMINATED); + + easy_setopt(curls, CURLOPT_URL, URL); + easy_setopt(curls, CURLOPT_HEADER, 1L); + easy_setopt(curls, CURLOPT_VERBOSE, 1L); + easy_setopt(curls, CURLOPT_MIMEPOST, mime); + easy_setopt(curls, CURLOPT_NOPROGRESS, 1L); + + res = curl_easy_perform(curls); + if(res) + goto test_cleanup; + + /* Alter form and resubmit. */ + curl_mime_data(field, "long value for length change", CURL_ZERO_TERMINATED); + res = curl_easy_perform(curls); + +test_cleanup: + curl_mime_free(mime); + curl_easy_cleanup(curls); + curl_global_cleanup(); + return (int) res; /* return the final return code */ +} -- cgit v1.2.3