summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-12-12 09:32:14 -0800
committerWayne Davison <wayned@samba.org>2009-12-12 09:46:02 -0800
commit2885270b52e4fd6c5daa1ed60f657c808d6cb504 (patch)
tree3f673e4e60edd131484763d361443be32a2b44eb /main.c
parent0c2e8f93643fd94a8d388e4373c30331d0af75b4 (diff)
downloadrsync-2885270b52e4fd6c5daa1ed60f657c808d6cb504.tar.gz
Fix a hang that can happen when the sender is sending an extra file-list
and no one is reading (i.e. do advantageous reading in perform_io()).
Diffstat (limited to 'main.c')
-rw-r--r--main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main.c b/main.c
index 3f194f1b..a2bf0107 100644
--- a/main.c
+++ b/main.c
@@ -73,6 +73,7 @@ extern int send_msgs_to_gen;
extern pid_t cleanup_child_pid;
extern size_t bwlimit_writemax;
extern unsigned int module_dirlen;
+extern BOOL flist_receiving_enabled;
extern BOOL shutting_down;
extern struct stats stats;
extern char *stdout_format;
@@ -898,6 +899,7 @@ static int do_recv(int f_in, int f_out, char *local_name)
}
am_generator = 1;
+ flist_receiving_enabled = True;
io_end_multiplex_in(MPLX_SWITCHING);
if (write_batch && !am_server)