X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/251f22b5d7726f60e884d92d5e1418345075dda8..e6bc6f42325e2127c7289cb28833e091c783d8ca:/generator.c

diff --git a/generator.c b/generator.c
index 1c3ceaaa..ac68c576 100644
--- a/generator.c
+++ b/generator.c
@@ -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 allowed_lull = io_timeout / 2;
+	int allowed_lull = read_batch ? 0 : io_timeout / 2;
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1146,6 +1146,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	only_existing = max_size = opt_ignore_existing = 0;
 	update_only = always_checksum = size_only = 0;
 	ignore_times = 1;
+	make_backups = 0; /* avoid a duplicate backup for inplace processing */
 
 	/* We expect to just sit around now, so don't exit on a timeout.
 	 * If we really get a timeout then the other process should exit. */
@@ -1200,6 +1201,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 				       flist, file, i, itemizing,
 				       maybe_PERMS_REPORT, code, allowed_lull,
 				       -1, -1);
+			if (allowed_lull && !(i % 500))
+				maybe_send_keepalive(allowed_lull, flist->count);
 		}
 	}
 	recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1);