Commit a0a33ee5 authored by Wayne Davison's avatar Wayne Davison

Call set_msg_fd_in() during the early phase of being a client sender

so that we monitor the socket for any messages that it might send to
us (and thus avoid a potential hang when verbosity is high).
parent 98f8c9a5
......@@ -688,6 +688,8 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out();
if (!remote_filesfrom_file)
set_msg_fd_in(f_in);
if (cvs_exclude)
add_cvs_excludes();
if (delete_mode && !delete_excluded)
......@@ -699,6 +701,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
start_write_batch(f_out);
if (!read_batch) /* don't write to pipe */
flist = send_file_list(f_out,argc,argv);
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment