mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
c44d45db86
With FOLLOWLOCATION enabled. When a 3xx page is downloaded and the download size was known (like with a Content-Length header), but the subsequent URL (transfered after the 3xx page) was chunked encoded, then the previous "known download size" would linger and cause the progress meter to get incorrect information, ie the former value would remain being sent in. This could easily result in downloads that were WAY larger than "expected" and would cause >100% outputs with the curl command line tool. Test case 599 was created and it was used to repeat the bug and then verify the fix. Bug: http://curl.haxx.se/bug/view.cgi?id=3510057 Reported by: Michael Wallner
72 lines
2.4 KiB
C
72 lines
2.4 KiB
C
#ifndef __PROGRESS_H
|
|
#define __PROGRESS_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "timeval.h"
|
|
|
|
|
|
typedef enum {
|
|
TIMER_NONE,
|
|
TIMER_NAMELOOKUP,
|
|
TIMER_CONNECT,
|
|
TIMER_APPCONNECT,
|
|
TIMER_PRETRANSFER,
|
|
TIMER_STARTTRANSFER,
|
|
TIMER_POSTRANSFER,
|
|
TIMER_STARTSINGLE,
|
|
TIMER_STARTACCEPT,
|
|
TIMER_REDIRECT,
|
|
TIMER_LAST /* must be last */
|
|
} timerid;
|
|
|
|
void Curl_pgrsDone(struct connectdata *);
|
|
void Curl_pgrsStartNow(struct SessionHandle *data);
|
|
void Curl_pgrsSetDownloadSize(struct SessionHandle *data, curl_off_t size);
|
|
void Curl_pgrsSetUploadSize(struct SessionHandle *data, curl_off_t size);
|
|
void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, curl_off_t size);
|
|
void Curl_pgrsSetUploadCounter(struct SessionHandle *data, curl_off_t size);
|
|
int Curl_pgrsUpdate(struct connectdata *);
|
|
void Curl_pgrsResetTimesSizes(struct SessionHandle *data);
|
|
void Curl_pgrsTime(struct SessionHandle *data, timerid timer);
|
|
|
|
|
|
/* Don't show progress for sizes smaller than: */
|
|
#define LEAST_SIZE_PROGRESS BUFSIZE
|
|
|
|
#define PROGRESS_DOWNLOAD (1<<0)
|
|
#define PROGRESS_UPLOAD (1<<1)
|
|
#define PROGRESS_DOWN_AND_UP (PROGRESS_UPLOAD | PROGRESS_DOWNLOAD)
|
|
|
|
#define PGRS_SHOW_DL (1<<0)
|
|
#define PGRS_SHOW_UL (1<<1)
|
|
#define PGRS_DONE_DL (1<<2)
|
|
#define PGRS_DONE_UL (1<<3)
|
|
#define PGRS_HIDE (1<<4)
|
|
#define PGRS_UL_SIZE_KNOWN (1<<5)
|
|
#define PGRS_DL_SIZE_KNOWN (1<<6)
|
|
|
|
#define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
|
|
|
|
|
|
#endif /* __PROGRESS_H */
|