Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when --backup-dir is excessively long.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
60820dd
..
600ad84
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-43,7
+43,6
@@
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern int file_old_total;
extern int batch_fd;
extern int write_batch;
extern int file_old_total;
-extern BOOL we_send_keepalive_messages;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
@@
-64,7
+63,7
@@
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
int32 i;
{
struct sum_struct *s;
int32 i;
- int lull_mod = allowed_lull * 5;
+ int lull_mod =
protocol_version >= 31 ? 0 :
allowed_lull * 5;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
@@
-105,7
+104,7
@@
static struct sum_struct *receive_sums(int f)
s->sums[i].len = s->blength;
offset += s->sums[i].len;
s->sums[i].len = s->blength;
offset += s->sums[i].len;
- if (
we_send_keepalive_messages
&& !(i % lull_mod))
+ if (
lull_mod
&& !(i % lull_mod))
maybe_send_keepalive(time(NULL), True);
if (DEBUG_GTE(DELTASUM, 3)) {
maybe_send_keepalive(time(NULL), True);
if (DEBUG_GTE(DELTASUM, 3)) {