generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep the upload byte counter in an curl_off_t, not an int. 32bits is not

Browse Source 
enough. This is most likely the bug Jean-Louis Lemaire reported that makes
2GB FTP uploads to report error when completed.
Also padded comments to get them aligned again, only for visibility.
This commit is contained in:
Daniel Stenberg
2004-06-16 09:28:47 +00:00
parent a76288b99a
commit 05baf94b43
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/urldata.h
View File

@@ -338,16 +338,16 @@ struct hostname {
*/ */
struct Curl_transfer_keeper { struct Curl_transfer_keeper {
curl_off_t bytecount; /* total number of bytes read */ curl_off_t bytecount; /* total number of bytes read */
int writebytecount; /* number of bytes written */ curl_off_t writebytecount; /* number of bytes written */
struct timeval start; /* transfer started at this time */ struct timeval start; /* transfer started at this time */
struct timeval now; /* current time */ struct timeval now; /* current time */
bool header; /* incoming data has HTTP header */ bool header; /* incoming data has HTTP header */
enum { enum {
HEADER_NORMAL, /* no bad header at all */ HEADER_NORMAL, /* no bad header at all */
HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest is HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest
normal data */ is normal data */
HEADER_ALLBAD /* all was believed to be header */ HEADER_ALLBAD /* all was believed to be header */
} badheader; /* the header was deemed bad and will be } badheader; /* the header was deemed bad and will be
written as body */ written as body */
int headerline; /* counts header lines to better track the int headerline; /* counts header lines to better track the
@@ -359,7 +359,7 @@ struct Curl_transfer_keeper {
char *end_ptr; /* within buf */ char *end_ptr; /* within buf */
char *p; /* within headerbuff */ char *p; /* within headerbuff */
bool content_range; /* set TRUE if Content-Range: was found */ bool content_range; /* set TRUE if Content-Range: was found */
curl_off_t offset; /* possible resume offset read from the curl_off_t offset; /* possible resume offset read from the
Content-Range: header */ Content-Range: header */
int httpcode; /* error code from the 'HTTP/1.? XXX' line */ int httpcode; /* error code from the 'HTTP/1.? XXX' line */
int httpversion; /* the HTTP version*10 */ int httpversion; /* the HTTP version*10 */
@@ -383,7 +383,6 @@ struct Curl_transfer_keeper {
z_stream z; /* State structure for zlib. */ z_stream z; /* State structure for zlib. */
#endif #endif
/* for the low speed checks: */
time_t timeofdoc; time_t timeofdoc;
long bodywrites; long bodywrites;