[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 235/254: file: make speedcheck use current time for
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 235/254: file: make speedcheck use current time for checks |
Date: |
Sat, 17 Jun 2017 16:54:27 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.1
in repository gnurl.
commit 68c6dcb2cb682bc7363cdf3d2e58da225cf4e72e
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Jun 7 13:29:46 2017 +0200
file: make speedcheck use current time for checks
... as it would previously just get the "now" timestamp before the
transfer starts and then not update it again.
Closes #1550
---
lib/file.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/file.c b/lib/file.c
index 7bd4535a0..c804d75e1 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -311,7 +311,6 @@ static CURLcode file_upload(struct connectdata *conn)
size_t nread;
size_t nwrite;
curl_off_t bytecount = 0;
- struct timeval now = Curl_tvnow();
struct_stat file_stat;
const char *buf2;
@@ -399,7 +398,7 @@ static CURLcode file_upload(struct connectdata *conn)
if(Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK;
else
- result = Curl_speedcheck(data, now);
+ result = Curl_speedcheck(data, Curl_tvnow());
}
if(!result && Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK;
@@ -436,7 +435,6 @@ static CURLcode file_do(struct connectdata *conn, bool
*done)
char *buf = data->state.buffer;
curl_off_t bytecount = 0;
int fd;
- struct timeval now = Curl_tvnow();
struct FILEPROTO *file;
*done = TRUE; /* unconditionally */
@@ -585,7 +583,7 @@ static CURLcode file_do(struct connectdata *conn, bool
*done)
if(Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK;
else
- result = Curl_speedcheck(data, now);
+ result = Curl_speedcheck(data, Curl_tvnow());
}
if(Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 219/254: travis: add coverage, distcheck and cmake builds, (continued)
- [GNUnet-SVN] [gnurl] 219/254: travis: add coverage, distcheck and cmake builds, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 223/254: RELEASE-NOTES: synced with 65ba92650, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 186/254: CURLOPT_PROXY.3: fix test 1140 breakage, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 162/254: url: fix declaration of 'pipe' shadows a global declaration, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 214/254: updatemanpages.pl: error out on too old git version, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 148/254: mkhelp.pl: do not add current time into curl binary, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 164/254: LDAP: using ldap_bind_s on Windows with methods (#878), gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 234/254: metalink: remove unused printf() argument, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 153/254: tests: stabilize test 1034, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 238/254: asyn-ares: s/Curl_expire_latest/Curl_expire, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 235/254: file: make speedcheck use current time for checks,
gnunet <=
- [GNUnet-SVN] [gnurl] 156/254: cmake: add CURL_CA_BUNDLE/CURL_CA_FALLBACK/CURL_CA_PATH options, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 183/254: docs: clarify NO_PROXY further, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 237/254: expire: remove Curl_expire_latest(), gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 200/254: typecheck-gcc.h: separate getinfo slist checks from other pointers, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 218/254: libtest: fix int-in-bool-context warnings, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 244/254: RELEASE-PROCEDURE: updated future release dates, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 249/254: urlglob: fix division by zero, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 175/254: opts: more examples added in option man pages, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 251/254: libressl: OCSP and intermediate certs workaround no longer needed, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 80/254: typecheck-gcc: add support for CURLINFO_SOCKET, gnunet, 2017/06/17