 0aedccc18a
			
		
	
	0aedccc18a
	
	
	
		
			
			Properly deal with the fact that the last fread() call most probably is a short read, and when using callbacks in fact all calls can be short reads. No longer consider a file read done until it returns a 0 from the read function. Reported by: Aaron Orenstein Bug: http://curl.haxx.se/mail/lib-2011-06/0048.html
		
			
				
	
	
		
			96 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /***************************************************************************
 | |
|  *                                  _   _ ____  _
 | |
|  *  Project                     ___| | | |  _ \| |
 | |
|  *                             / __| | | | |_) | |
 | |
|  *                            | (__| |_| |  _ <| |___
 | |
|  *                             \___|\___/|_| \_\_____|
 | |
|  *
 | |
|  * Copyright (C) 1998 - 2011, 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
 | |
|  * are also available at http://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 "curlcheck.h"
 | |
| 
 | |
| #include <curl/curl.h>
 | |
| 
 | |
| static CURLcode unit_setup(void)
 | |
| {
 | |
|   return CURLE_OK;
 | |
| }
 | |
| 
 | |
| static void unit_stop(void)
 | |
| {
 | |
| 
 | |
| }
 | |
| 
 | |
| static size_t print_httppost_callback(void *arg, const char *buf, size_t len)
 | |
| {
 | |
|   fwrite(buf, len, 1, stdout);
 | |
|   (*(size_t *) arg) += len;
 | |
|   return len;
 | |
| }
 | |
| 
 | |
| UNITTEST_START
 | |
|   int rc;
 | |
|   struct curl_httppost* post = NULL;
 | |
|   struct curl_httppost* last = NULL;
 | |
|   size_t total_size = 0;
 | |
|   char buffer[] = "test buffer";
 | |
| 
 | |
|   rc = curl_formadd(&post, &last, CURLFORM_COPYNAME, "name",
 | |
|                     CURLFORM_COPYCONTENTS, "content", CURLFORM_END);
 | |
| 
 | |
|   fail_unless(rc == 0, "curl_formadd returned error");
 | |
| 
 | |
|   /* after the first curl_formadd when there's a single entry, both pointers
 | |
|      should point to the same struct */
 | |
|   fail_unless(post == last, "post and last weren't the same");
 | |
| 
 | |
|   rc = curl_formadd(&post, &last, CURLFORM_COPYNAME, "htmlcode",
 | |
|                     CURLFORM_COPYCONTENTS, "<HTML></HTML>",
 | |
|                     CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
 | |
| 
 | |
|   fail_unless(rc == 0, "curl_formadd returned error");
 | |
| 
 | |
|   rc = curl_formadd(&post, &last, CURLFORM_COPYNAME, "name_for_ptrcontent",
 | |
|                    CURLFORM_PTRCONTENTS, buffer, CURLFORM_END);
 | |
| 
 | |
|   fail_unless(rc == 0, "curl_formadd returned error");
 | |
| 
 | |
|   rc = curl_formget(post, &total_size, print_httppost_callback);
 | |
| 
 | |
|   fail_unless(rc == 0, "curl_formget returned error");
 | |
| 
 | |
|   fail_unless(total_size == 486, "curl_formget got wrong size back");
 | |
| 
 | |
|   curl_formfree(post);
 | |
| 
 | |
|   /* start a new formpost with a file upload and formget */
 | |
|   post = last = NULL;
 | |
| 
 | |
|   rc = curl_formadd(&post, &last,
 | |
|                     CURLFORM_PTRNAME, "name of file field",
 | |
|                     CURLFORM_FILE, "log/test-1308",
 | |
|                     CURLFORM_FILENAME, "custom named file",
 | |
|                     CURLFORM_END);
 | |
| 
 | |
|   fail_unless(rc == 0, "curl_formadd returned error");
 | |
| 
 | |
|   rc = curl_formget(post, &total_size, print_httppost_callback);
 | |
|   fail_unless(rc == 0, "curl_formget returned error");
 | |
|   fail_unless(total_size == 847, "curl_formget got wrong size back");
 | |
| 
 | |
|   curl_formfree(post);
 | |
| 
 | |
| UNITTEST_STOP
 |