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
Don't allow keep-alive sending if --read-batch is enabled.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
9e53be1
..
9dff344
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-252,8
+252,8
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (!dirlist->files[i]->basename)
continue;
if (flist_find(flist, dirlist->files[i]) < 0) {
if (!dirlist->files[i]->basename)
continue;
if (flist_find(flist, dirlist->files[i]) < 0) {
- f_name_to(dirlist->files[i], delbuf);
int mode = dirlist->files[i]->mode;
int mode = dirlist->files[i]->mode;
+ f_name_to(dirlist->files[i], delbuf);
if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
break;
}
if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
break;
}
@@
-1075,7
+1075,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name,
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
- int allowed_lull = io_timeout / 2;
+ int allowed_lull =
read_batch ? 0 :
io_timeout / 2;
if (protocol_version >= 29) {
itemizing = 1;
if (protocol_version >= 29) {
itemizing = 1;