From 62da1e7458ce98479ddbfd259f0b3675b6f0b84c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 3 Jan 2014 12:25:09 +0100 Subject: test1513: added - verify early progress callback return fail Verify the change brought in commit 8e11731653061. It makes sure that returning a failure from the progress callback even very early results in the correct return code. --- tests/libtest/lib1513.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 tests/libtest/lib1513.c (limited to 'tests/libtest/lib1513.c') diff --git a/tests/libtest/lib1513.c b/tests/libtest/lib1513.c new file mode 100644 index 000000000..1a19621db --- /dev/null +++ b/tests/libtest/lib1513.c @@ -0,0 +1,66 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2013, 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 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. + * + ***************************************************************************/ +/* + * Test case converted from bug report #1318 by Petr Novak. + * + * Before the fix, this test program returned 52 (CURLE_GOT_NOTHING) instead + * of 42 (CURLE_ABORTED_BY_CALLBACK). + */ + +#include "test.h" + +#include "memdebug.h" + +static int progressKiller(void *arg) +{ + (void)arg; + return 1; +} + +int test(char *URL) +{ + CURL *curl; + CURLcode result; + int res=0; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + easy_setopt(curl, CURLOPT_URL, URL); + easy_setopt(curl, CURLOPT_TIMEOUT, (long)7); + easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1); + easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progressKiller); + easy_setopt(curl, CURLOPT_PROGRESSDATA, NULL); + easy_setopt(curl, CURLOPT_NOPROGRESS, (long)0); + + result = curl_easy_perform(curl); + +test_cleanup: + + /* undocumented cleanup sequence - type UA */ + + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return (int)result; +} -- cgit v1.2.3