Moved the write_stream_flags() call from io.c into main.c so that

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 8fe8284..1bc3e2f 100644 (file)
--- a/io.c
+++ b/io.c
@@ -302,11 +302,13 @@ static void read_msg_fd(void)
                        flist_ndx_push(&hlink_list, IVAL(buf,0));
                break;
        case MSG_SOCKERR:
+       case MSG_CLIENT:
                if (!am_generator) {
                        rprintf(FERROR, "invalid message %d:%d\n", tag, len);
                        exit_cleanup(RERR_STREAMIO);
                }
-               close_multiplexing_out();
+               if (tag == MSG_SOCKERR)
+                       close_multiplexing_out();
                /* FALL THROUGH */
        case MSG_INFO:
        case MSG_ERROR:
@@ -1546,8 +1548,6 @@ void close_multiplexing_out(void)
 
 void start_write_batch(int fd)
 {
-       write_stream_flags(batch_fd);
-
        /* Some communication has already taken place, but we don't
         * enable batch writing until here so that we can write a
         * canonical record of the communication even though the