Fossil SCM
Only check time, if it is set.
Commit
970cc4f16f3483c066534e14ed63ce68d374add3
Parent
ee6ae580eee084d…
1 file changed
+2
-1
+2
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -396,11 +396,12 @@ | ||
| 396 | 396 | } |
| 397 | 397 | if( uuid_is_shunned(blob_str(pUuid)) ){ |
| 398 | 398 | blob_reset(&uuid); |
| 399 | 399 | return; |
| 400 | 400 | } |
| 401 | - if( time(NULL) >= pXfer->maxTime || pXfer->mxSend<=blob_size(pXfer->pOut) ){ | |
| 401 | + if( (pXfer->maxTime != -1 && time(NULL) >= pXfer->maxTime) || | |
| 402 | + pXfer->mxSend<=blob_size(pXfer->pOut) ){ | |
| 402 | 403 | const char *zFormat = isPriv ? "igot %b 1\n" : "igot %b\n"; |
| 403 | 404 | blob_appendf(pXfer->pOut, zFormat, pUuid); |
| 404 | 405 | pXfer->nIGotSent++; |
| 405 | 406 | blob_reset(&uuid); |
| 406 | 407 | return; |
| 407 | 408 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -396,11 +396,12 @@ | |
| 396 | } |
| 397 | if( uuid_is_shunned(blob_str(pUuid)) ){ |
| 398 | blob_reset(&uuid); |
| 399 | return; |
| 400 | } |
| 401 | if( time(NULL) >= pXfer->maxTime || pXfer->mxSend<=blob_size(pXfer->pOut) ){ |
| 402 | const char *zFormat = isPriv ? "igot %b 1\n" : "igot %b\n"; |
| 403 | blob_appendf(pXfer->pOut, zFormat, pUuid); |
| 404 | pXfer->nIGotSent++; |
| 405 | blob_reset(&uuid); |
| 406 | return; |
| 407 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -396,11 +396,12 @@ | |
| 396 | } |
| 397 | if( uuid_is_shunned(blob_str(pUuid)) ){ |
| 398 | blob_reset(&uuid); |
| 399 | return; |
| 400 | } |
| 401 | if( (pXfer->maxTime != -1 && time(NULL) >= pXfer->maxTime) || |
| 402 | pXfer->mxSend<=blob_size(pXfer->pOut) ){ |
| 403 | const char *zFormat = isPriv ? "igot %b 1\n" : "igot %b\n"; |
| 404 | blob_appendf(pXfer->pOut, zFormat, pUuid); |
| 405 | pXfer->nIGotSent++; |
| 406 | blob_reset(&uuid); |
| 407 | return; |
| 408 |