The patches for 3.1.1.

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

diff --git a/time-limit.diff b/time-limit.diff
index 5d5077cda3d14c7a7d4082692105a63d781ac816..15c28dd7f0e73429fa72730c939587cb2baaeeb1 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 4c8eb5f9511dd1393b147c4e993ee15448faedf5
+based-on: 7cb0de6326c915a72253fd103dae93308031ec3f
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
@@ -116,7 +116,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2581,6 +2617,15 @@ void server_options(char **args, int *argc_p)
+@@ -2582,6 +2618,15 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -135,7 +135,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -448,6 +448,8 @@ to the detailed description below for a complete description.  verb(
+@@ -451,6 +451,8 @@ to the detailed description below for a complete description.  verb(
       --password-file=FILE    read daemon-access password from FILE
       --list-only             list the files instead of copying them
       --bwlimit=RATE          limit socket I/O bandwidth
@@ -144,7 +144,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
-@@ -2514,6 +2516,19 @@ files can show up as being rapidly sent when the data is quickly buffered,
+@@ -2517,6 +2519,19 @@ files can show up as being rapidly sent when the data is quickly buffered,
  while other can show up as very slow when the flushing of the output buffer
  occurs.  This may be fixed in a future version.