The patches for 3.0.4pre2.

[rsync/rsync-patches.git] / time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 5226710..6c71919 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -20,7 +20,7 @@ diff --git a/io.c b/io.c
  extern struct file_list *cur_flist;
  #ifdef ICONV_OPTION
  extern int filesfrom_convert;
-@@ -221,16 +222,24 @@ static void check_timeout(void)
+@@ -222,16 +223,24 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -123,7 +123,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1903,6 +1938,15 @@ void server_options(char **args, int *argc_p)
+@@ -1911,6 +1946,15 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -151,7 +151,7 @@ diff --git a/rsync.yo b/rsync.yo
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
-@@ -2013,6 +2015,19 @@ transfer was too fast, it will wait before sending the next data block. The
+@@ -2025,6 +2027,19 @@ transfer was too fast, it will wait before sending the next data block. The
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.