From: Wayne Davison <wayned@samba.org>
Date: Fri, 31 Dec 2004 00:35:03 +0000 (+0000)
Subject: Set select_timeout if the per-module timeout value was lower than
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/ad54dcc827451383222d1cf12d33038ba7f49447

Set select_timeout if the per-module timeout value was lower than
the default select_timeout value.
---

diff --git a/clientserver.c b/clientserver.c
index c8ba5d8e..bf5a1334 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -43,6 +43,7 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
+extern int select_timeout;
 extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
@@ -476,8 +477,11 @@ static int rsync_module(int f_in, int f_out, int i)
 		exit_cleanup(RERR_UNSUPPORTED);
 	}
 
-	if (lp_timeout(i))
+	if (lp_timeout(i)) {
 		io_timeout = lp_timeout(i);
+		if (io_timeout && io_timeout < select_timeout)
+			select_timeout = io_timeout;
+	}
 
 	start_server(f_in, f_out, argc, argp);