From d7242f4757de67f02b13fac850c3472598f999ca Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 2 Mar 2020 07:42:54 +0100 Subject: Revert "mime: do not perform more than one read in a row" This reverts commit ed0f357f7d25566110d4302f33759f4ffb5a6f83. --- tests/data/Makefile.inc | 2 +- tests/data/test643 | 12 ++--- tests/data/test644 | 2 +- tests/data/test645 | 64 +++--------------------- tests/data/test650 | 12 +---- tests/data/test654 | 18 +------ tests/data/test664 | 85 ------------------------------- tests/data/test665 | 99 ------------------------------------ tests/libtest/Makefile.inc | 10 +--- tests/libtest/lib643.c | 6 ++- tests/libtest/lib654.c | 8 +-- tests/libtest/lib664.c | 117 ------------------------------------------- tests/libtest/lib665.c | 122 --------------------------------------------- 13 files changed, 27 insertions(+), 530 deletions(-) delete mode 100644 tests/data/test664 delete mode 100644 tests/data/test665 delete mode 100644 tests/libtest/lib664.c delete mode 100644 tests/libtest/lib665.c (limited to 'tests') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 99052007f..39739e500 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -85,7 +85,7 @@ 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 test653 test654 test655 test656 test658 test659 test660 test661 \ -test662 test663 test664 test665 \ +test662 test663 \ test670 test671 test672 test673 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ diff --git a/tests/data/test643 b/tests/data/test643 index e8da2b1c4..0eaf22c5f 100644 --- a/tests/data/test643 +++ b/tests/data/test643 @@ -69,18 +69,18 @@ s/boundary=------------------------[a-z0-9]*/boundary=-------------------------- POST /643 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -Content-Length: 640 +Content-Length: 718 Content-Type: multipart/form-data; boundary=---------------------------- ------------------------------ Content-Disposition: form-data; name="sendfile"; filename="postit2.c" -dummy +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="callbackdata" -dummy +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="filename" @@ -99,18 +99,18 @@ blah blah POST /643 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -Content-Length: 654 +Content-Length: 732 Content-Type: multipart/form-data; boundary=---------------------------- ------------------------------ Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2" -dummy +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="callbackdata" -dummy +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="filename" diff --git a/tests/data/test644 b/tests/data/test644 index 99337ae0f..256d3379a 100644 --- a/tests/data/test644 +++ b/tests/data/test644 @@ -44,7 +44,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=-------------------------- POST /644 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -Content-Length: 640 +Content-Length: 718 Content-Type: multipart/form-data; boundary=---------------------------- ------------------------------ diff --git a/tests/data/test645 b/tests/data/test645 index eeb15f994..6533944b4 100644 --- a/tests/data/test645 +++ b/tests/data/test645 @@ -73,42 +73,16 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -76 +2ce ------------------------------ Content-Disposition: form-data; name="sendfile"; filename="postit2.c" -d -1 -u -1 -m -1 -m -1 -y -1 - - -65 +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="callbackdata" - -1 -d -1 -u -1 -m -1 -m -1 -y -1 - - -19a +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="filename" @@ -134,42 +108,16 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -84 +2dc ------------------------------ Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2" -d -1 -u -1 -m -1 -m -1 -y -1 - - -65 +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="callbackdata" - -1 -d -1 -u -1 -m -1 -m -1 -y -1 - - -19a +this is what we post to the silly web server ------------------------------ Content-Disposition: form-data; name="filename" diff --git a/tests/data/test650 b/tests/data/test650 index 03fe43816..1a06064c7 100644 --- a/tests/data/test650 +++ b/tests/data/test650 @@ -63,7 +63,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -361 +60a ------------------------------ Content-Disposition: form-data; name="fieldname" Content-Type: text/plain @@ -89,16 +89,12 @@ This is data from a file. Content-Disposition: attachment; filename="test650.filedata" Content-Type: text/whatever - -a5 This is data from a file. ------------------------------ Content-Disposition: attachment; filename="test650.filedata" Content-Type: text/whatever - -af This is data from a file. -------------------------------- @@ -106,8 +102,6 @@ This is data from a file. ------------------------------ Content-Disposition: form-data; name="filecontents" - -10f This is data from a file. ------------------------------ @@ -118,12 +112,8 @@ Content-Disposition: form-data; name="formlength" Content-Disposition: form-data; name="standardinput" Content-Type: application/octet-stream - -16 Some data from stdin -30 - -------------------------------- 0 diff --git a/tests/data/test654 b/tests/data/test654 index 9d4bf45a1..21697e763 100644 --- a/tests/data/test654 +++ b/tests/data/test654 @@ -81,7 +81,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -1af +20c ------------------------------ Content-Disposition: form-data; name="greeting" Content-Type: application/X-Greeting @@ -98,21 +98,7 @@ This is data from a file ------------------------------ Content-Disposition: form-data - -1 -d -1 -u -1 -m -1 -m -1 -y -1 - - -30 +this is what we post to the silly web server -------------------------------- diff --git a/tests/data/test664 b/tests/data/test664 deleted file mode 100644 index 3e6cf6f7a..000000000 --- a/tests/data/test664 +++ /dev/null @@ -1,85 +0,0 @@ - - - -HTTP -HTTP POST -HTTP MIME POST - - - -# -# 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 - - - -# Client-side - - -http - -# tool is what to use instead of 'curl' - -lib664 - - - -HTTP chunked mimepost using single-byte read callback with encoder - - -http://%HOSTIP:%HTTPPORT/664 - - - -# -# 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 /664 HTTP/1.1 -Host: %HOSTIP:%HTTPPORT -Accept: */* -Transfer-Encoding: chunked -Content-Type: multipart/form-data; boundary=---------------------------- -Expect: 100-continue - -7f ------------------------------- -Content-Disposition: form-data; name="field" -Content-Transfer-Encoding: base64 - - -4 -ZHVt -34 -bXk= --------------------------------- - -0 - - - - diff --git a/tests/data/test665 b/tests/data/test665 deleted file mode 100644 index 093e56a08..000000000 --- a/tests/data/test665 +++ /dev/null @@ -1,99 +0,0 @@ - - - -HTTP -HTTP POST -HTTP MIME POST - - - -# -# 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 - - - -# Client-side - - -http - -# tool is what to use instead of 'curl' - -lib665 - - - -HTTP mimepost early end of data detection - - -http://%HOSTIP:%HTTPPORT/665 - - -This is data from a file - - - -# -# 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 /665 HTTP/1.1 -Host: %HOSTIP:%HTTPPORT -Accept: */* -Transfer-Encoding: chunked -Content-Type: multipart/form-data; boundary=---------------------------- -Expect: 100-continue - -c1 ------------------------------- -Content-Disposition: form-data; name="field1" - -dummy ------------------------------- -Content-Disposition: form-data; name="field2" - - -5 -dummy -91 - ------------------------------- -Content-Disposition: form-data; name="field3"; filename="file665.txt" -Content-Type: text/plain - - -49 -This is data from a file - --------------------------------- - -0 - - - - diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 28df0b650..9652f03fe 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -22,7 +22,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ 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 lib653 lib654 lib655 lib658 \ - lib659 lib661 lib664 lib665 \ + lib659 lib661 \ lib670 lib671 lib672 lib673 \ lib1156 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ @@ -349,14 +349,6 @@ lib659_CPPFLAGS = $(AM_CPPFLAGS) lib661_SOURCES = lib661.c $(SUPPORTFILES) lib661_CPPFLAGS = $(AM_CPPFLAGS) -lib664_SOURCES = lib664.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib664_LDADD = $(TESTUTIL_LIBS) -lib664_CPPFLAGS = $(AM_CPPFLAGS) - -lib665_SOURCES = lib665.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib665_LDADD = $(TESTUTIL_LIBS) -lib665_CPPFLAGS = $(AM_CPPFLAGS) - lib670_SOURCES = lib670.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib670_LDADD = $(TESTUTIL_LIBS) lib670_CPPFLAGS = $(AM_CPPFLAGS) -DLIB670 diff --git a/tests/libtest/lib643.c b/tests/libtest/lib643.c index 5af0f4a14..08c0f2e80 100644 --- a/tests/libtest/lib643.c +++ b/tests/libtest/lib643.c @@ -26,9 +26,11 @@ static char data[]= #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ - "\x64\x75\x6d\x6d\x79\x0a"; + "\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70" + "\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20" + "\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72\x0a"; #else - "dummy\n"; + "this is what we post to the silly web server\n"; #endif struct WriteThis { diff --git a/tests/libtest/lib654.c b/tests/libtest/lib654.c index f9c8b9118..45051a9c7 100644 --- a/tests/libtest/lib654.c +++ b/tests/libtest/lib654.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, 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 @@ -26,9 +26,11 @@ static char data[]= #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ - "\x64\x75\x6d\x6d\x79\x0a"; + "\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70" + "\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20" + "\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72\x0a"; #else - "dummy\n"; + "this is what we post to the silly web server\n"; #endif struct WriteThis { diff --git a/tests/libtest/lib664.c b/tests/libtest/lib664.c deleted file mode 100644 index 8bf7be43f..000000000 --- a/tests/libtest/lib664.c +++ /dev/null @@ -1,117 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2020, 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 "memdebug.h" - -static char data[]= -#ifdef CURL_DOES_CONVERSIONS - /* ASCII representation with escape sequences for non-ASCII platforms */ - "\x64\x75\x6d\x6d\x79"; -#else - "dummy"; -#endif - -struct WriteThis { - char *readptr; - curl_off_t sizeleft; -}; - -static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) -{ - struct WriteThis *pooh = (struct WriteThis *)userp; - int eof = !*pooh->readptr; - - if(size*nmemb < 1) - return 0; - - eof = pooh->sizeleft <= 0; - if(!eof) - pooh->sizeleft--; - - if(!eof) { - *ptr = *pooh->readptr; /* copy one single byte */ - pooh->readptr++; /* advance pointer */ - return 1; /* we return 1 byte at a time! */ - } - - return 0; /* no more data left to deliver */ -} - -int test(char *URL) -{ - CURL *easy = NULL; - curl_mime *mime = NULL; - curl_mimepart *part; - CURLcode result; - int res = TEST_ERR_FAILURE; - struct WriteThis pooh; - - /* - * Check proper handling of mime encoder feature when the part read callback - * delivers data bytes one at a time. Use chunked encoding for accurate test. - */ - - if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { - fprintf(stderr, "curl_global_init() failed\n"); - return TEST_ERR_MAJOR_BAD; - } - - easy = curl_easy_init(); - - /* First set the URL that is about to receive our POST. */ - test_setopt(easy, CURLOPT_URL, URL); - - /* get verbose debug output please */ - test_setopt(easy, CURLOPT_VERBOSE, 1L); - - /* include headers in the output */ - test_setopt(easy, CURLOPT_HEADER, 1L); - - /* Prepare the callback structure. */ - pooh.readptr = data; - pooh.sizeleft = (curl_off_t) strlen(data); - - /* Build the mime tree. */ - mime = curl_mime_init(easy); - part = curl_mime_addpart(mime); - curl_mime_name(part, "field"); - curl_mime_encoder(part, "base64"); - /* Using an undefined length forces chunked transfer. */ - curl_mime_data_cb(part, (curl_off_t) -1, read_callback, NULL, NULL, &pooh); - - /* Bind mime data to its easy handle. */ - test_setopt(easy, CURLOPT_MIMEPOST, mime); - - /* Send data. */ - result = curl_easy_perform(easy); - if(result) { - fprintf(stderr, "curl_easy_perform() failed\n"); - res = (int) result; - } - -test_cleanup: - curl_easy_cleanup(easy); - curl_mime_free(mime); - curl_global_cleanup(); - return res; -} diff --git a/tests/libtest/lib665.c b/tests/libtest/lib665.c deleted file mode 100644 index c62d2f69b..000000000 --- a/tests/libtest/lib665.c +++ /dev/null @@ -1,122 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2020, 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 "memdebug.h" - -static char data[]= -#ifdef CURL_DOES_CONVERSIONS - /* ASCII representation with escape sequences for non-ASCII platforms */ - "\x64\x75\x6d\x6d\x79"; -#else - "dummy"; -#endif - -struct WriteThis { - char *readptr; - curl_off_t sizeleft; -}; - -static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) -{ - struct WriteThis *pooh = (struct WriteThis *)userp; - size_t len = strlen(pooh->readptr); - - (void) size; /* Always 1.*/ - - if(len > nmemb) - len = nmemb; - if(len) { - memcpy(ptr, pooh->readptr, len); - pooh->readptr += len; - } - return len; -} - -int test(char *URL) -{ - CURL *easy = NULL; - curl_mime *mime = NULL; - curl_mimepart *part; - CURLcode result; - int res = TEST_ERR_FAILURE; - struct WriteThis pooh1, pooh2; - - /* - * Check early end of part data detection. - */ - - if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { - fprintf(stderr, "curl_global_init() failed\n"); - return TEST_ERR_MAJOR_BAD; - } - - easy = curl_easy_init(); - - /* First set the URL that is about to receive our POST. */ - test_setopt(easy, CURLOPT_URL, URL); - - /* get verbose debug output please */ - test_setopt(easy, CURLOPT_VERBOSE, 1L); - - /* include headers in the output */ - test_setopt(easy, CURLOPT_HEADER, 1L); - - /* Prepare the callback structures. */ - pooh1.readptr = data; - pooh1.sizeleft = (curl_off_t) strlen(data); - pooh2 = pooh1; - - /* Build the mime tree. */ - mime = curl_mime_init(easy); - part = curl_mime_addpart(mime); - curl_mime_name(part, "field1"); - /* Early end of data detection can be done because the data size is known. */ - curl_mime_data_cb(part, (curl_off_t) strlen(data), - read_callback, NULL, NULL, &pooh1); - part = curl_mime_addpart(mime); - curl_mime_name(part, "field2"); - /* Using an undefined length forces chunked transfer and disables early - end of data detection for this part. */ - curl_mime_data_cb(part, (curl_off_t) -1, read_callback, NULL, NULL, &pooh2); - part = curl_mime_addpart(mime); - curl_mime_name(part, "field3"); - /* Regular file part sources early end of data can be detected because - the file size is known. In addition, and EOF test is performed. */ - curl_mime_filedata(part, "log/file665.txt"); - - /* Bind mime data to its easy handle. */ - test_setopt(easy, CURLOPT_MIMEPOST, mime); - - /* Send data. */ - result = curl_easy_perform(easy); - if(result) { - fprintf(stderr, "curl_easy_perform() failed\n"); - res = (int) result; - } - -test_cleanup: - curl_easy_cleanup(easy); - curl_mime_free(mime); - curl_global_cleanup(); - return res; -} -- cgit v1.2.3