6beb0eeea1
Historically the default "unknown" value for progress.size_dl and progress.size_ul has been zero, since these values are initialized implicitly by the calloc that allocates the curl handle that these variables are a part of. Users of curl that install progress callbacks may expect these values to always be >= 0. Currently it is possible for progress.size_dl and progress.size_ul to by set to a value of -1, if Curl_pgrsSetDownloadSize() or Curl_pgrsSetUploadSize() are passed a "size" of -1 (which a few places currently do, and a following patch will add more). So lets update Curl_pgrsSetDownloadSize() and Curl_pgrsSetUploadSize() so they make sure that these variables always contain a value that is >= 0. Updates test579 and test599. Signed-off-by: Brandon Casey <drafnel@gmail.com>
97 lines
2.7 KiB
C
97 lines
2.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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 "test.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
static int progress_callback(void *clientp, double dltotal,
|
|
double dlnow, double ultotal, double ulnow)
|
|
{
|
|
(void)clientp;
|
|
(void)ulnow;
|
|
(void)ultotal;
|
|
|
|
if((dltotal > 0.0) && (dlnow > dltotal)) {
|
|
/* this should not happen with test case 599 */
|
|
printf("%.0f > %.0f !!\n", dltotal, dlnow);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int test(char *URL)
|
|
{
|
|
CURL *curl;
|
|
CURLcode res=CURLE_OK;
|
|
double content_length = 0.0;
|
|
|
|
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
fprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
if ((curl = curl_easy_init()) == NULL) {
|
|
fprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* First set the URL that is about to receive our POST. */
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
/* we want to use our own progress function */
|
|
test_setopt(curl, CURLOPT_NOPROGRESS, 0L);
|
|
test_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
|
|
|
|
/* get verbose debug output please */
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* follow redirects */
|
|
test_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
|
|
|
|
/* include headers in the output */
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
|
|
/* Perform the request, res will get the return code */
|
|
res = curl_easy_perform(curl);
|
|
|
|
if (!res) {
|
|
FILE *moo;
|
|
res = curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD,
|
|
&content_length);
|
|
moo = fopen(libtest_arg2, "wb");
|
|
if (moo) {
|
|
fprintf(moo, "CL: %.0f\n", content_length);
|
|
fclose(moo);
|
|
}
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|