diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2015-02-06 12:20:10 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2015-02-06 12:23:20 +0300 |
commit | 5ec793e0457012dd9d49520abeddf376d0225428 (patch) | |
tree | d45342a143e0d9d903994b5962eaca624100bb51 /csync | |
parent | 9e945eb47170b4a7697601febfc4584f11b92515 (diff) |
propagateupload: Save the mtime given by the server in the reply to GET
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.
This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
Diffstat (limited to 'csync')
-rwxr-xr-x | csync/tests/ownCloud/t6.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/csync/tests/ownCloud/t6.pl b/csync/tests/ownCloud/t6.pl index 099915d74..8df72eb2f 100755 --- a/csync/tests/ownCloud/t6.pl +++ b/csync/tests/ownCloud/t6.pl @@ -125,6 +125,10 @@ while(readdir $dh) { closedir $dh; assert( $seen == 1, "No conflict file created on precondition failed!" ); unlink($script); +$ENV{'OWNCLOUD_POST_UPDATE_SCRIPT'} = ""; + +assertLocalAndRemoteDir( '', 1); + # Set a custom chunk size in environment. my $ChunkSize = 1*1024*1024; |