aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-06-16 09:28:47 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-06-16 09:28:47 +0000
commit05baf94b4339db865f2c6ec8ffd27b1ed9f0715a (patch)
tree7910aaee3fb0319115ca17ded0e45598c1146641
parenta76288b99aae391127a4f0ff3dc065b8c64efa9b (diff)
Keep the upload byte counter in an curl_off_t, not an int. 32bits is not
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.
-rw-r--r--lib/urldata.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/urldata.h b/lib/urldata.h
index 74bef224c..95aa5fb65 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -338,16 +338,16 @@ struct hostname {
*/
struct Curl_transfer_keeper {
- curl_off_t bytecount; /* total number of bytes read */
- int writebytecount; /* number of bytes written */
+ curl_off_t bytecount; /* total number of bytes read */
+ curl_off_t writebytecount; /* number of bytes written */
struct timeval start; /* transfer started at this time */
struct timeval now; /* current time */
bool header; /* incoming data has HTTP header */
enum {
- HEADER_NORMAL, /* no bad header at all */
- HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest is
- normal data */
- HEADER_ALLBAD /* all was believed to be header */
+ HEADER_NORMAL, /* no bad header at all */
+ HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest
+ is normal data */
+ HEADER_ALLBAD /* all was believed to be header */
} badheader; /* the header was deemed bad and will be
written as body */
int headerline; /* counts header lines to better track the
@@ -359,7 +359,7 @@ struct Curl_transfer_keeper {
char *end_ptr; /* within buf */
char *p; /* within headerbuff */
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 */
int httpcode; /* error code from the 'HTTP/1.? XXX' line */
int httpversion; /* the HTTP version*10 */
@@ -383,7 +383,6 @@ struct Curl_transfer_keeper {
z_stream z; /* State structure for zlib. */
#endif
- /* for the low speed checks: */
time_t timeofdoc;
long bodywrites;