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/libtest/lib664.c | 117 ------------------------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 tests/libtest/lib664.c (limited to 'tests/libtest/lib664.c') 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; -} -- cgit v1.2.3