Commit graph

2168 commits

Author SHA1 Message Date
Klaas Freitag
a7d298a441 Fix c99 warning. 2013-10-07 12:59:35 +02:00
Markus Goetz
617949f2e1 Recursive PROPFIND: Change and improve
It is disabled by default, but can be enabled by the library
user on demand. We suggest to enable it for the first sync
and when the local DB is small enough.
It only gets used for the first PROPFIND. In case the server
supports the Depth 'infinity', we keep the cache. In case
the server does not support it (= reports only 1 level)
we will still use the result by converting it to the legacy
PROPFIND cache.
2013-10-04 13:23:10 +02:00
Daniel Molkentin
770539f0a5 Look in PlugIns, not Plugins on Mac (consistent with Qt) 2013-10-04 12:42:08 +02:00
Olivier Goffart
9b31ef0ca8 Do not write to the db if we did not do csync_propagate 2013-10-03 18:37:13 +02:00
Olivier Goffart
be6e208328 Merge branch 'dav' into ocsync
Conflicts:
	src/csync_update.c
2013-10-03 12:08:51 +02:00
Olivier Goffart
b24f894a32 Set the start_id while aborting. This allow to resume from this block 2013-10-03 11:58:28 +02:00
Olivier Goffart
fb54cc8597 Fix the test.
conflictcopy is no longer in the default config file
2013-10-02 16:05:24 +02:00
Olivier Goffart
77b3780ab2 Do not put the conflict_copies in the ocsync config file.
Because owncloud sets it too true programmaticaly, and we don't
want to overwrite it with the config
2013-10-02 15:33:48 +02:00
Olivier Goffart
b29a31d36a httpbf: add a 'previous_etag' entry in that is sent in If-Match header 2013-10-02 15:33:48 +02:00
Klaas Freitag
fb582d8b3d Fix macos test cases. 2013-10-02 12:33:10 +02:00
Klaas Freitag
dbe63727a3 Quote regexp to hopefully not confuse cmake 2.6 2013-10-02 09:15:17 +02:00
Klaas Freitag
3e27afadd5 Use a cross platform capable mkdir mask 2013-10-02 08:51:11 +02:00
Klaas Freitag
e7c72fc60c Keep an out pointer on the beginning of the buffer.
For some reason the iconv function changes the pointer to the buffer but
for the return one ptr has to be kept at the start of the buf.
2013-10-02 08:48:58 +02:00
Klaas Freitag
da1245bcd8 Check if there really is a file to delete before doing unlink.
The (not succeeding) call to unlink might change errno which disturbs
the test code.
2013-10-02 08:47:55 +02:00
Klaas Freitag
6a73fd984c Added missing cmake modules for cmake 2.6 2013-10-01 16:09:59 +02:00
Klaas Freitag
ef9f0edd61 Ignore all csync journal files right at beginning. 2013-10-01 13:18:36 +02:00
Klaas Freitag
0c2f9177d1 For silently ignored files return immediately. 2013-10-01 13:18:06 +02:00
Klaas Freitag
bae3838513 Nicer name for HTTP header for mtime. 2013-09-26 15:07:06 +02:00
Klaas Freitag
f3acf2447c Remove duplicated code from merge. 2013-09-26 15:03:35 +02:00
Klaas Freitag
8f1e318cde Set version to 0.90.2 2013-09-26 10:30:36 +02:00
Klaas Freitag
532bc450fb Added changelog entry. 2013-09-26 10:30:03 +02:00
Klaas Freitag
8d14286bd3 Merge dav and transmit the mtime with the PUT request 2013-09-25 14:23:04 +02:00
Klaas Freitag
f1b4a7a0ae Disable comparison of local inode values for the win32 platform.
Bug owncloud/mirall#779 reports about continous upload of files
even though nothing has changed. Logfiles show the fact that the
inode on windows is not reliable for this. Disabled as a result
to fix bug #779.
2013-09-25 11:39:06 +02:00
Klaas Freitag
33d55c0757 Remove unused commented code. 2013-09-25 11:34:50 +02:00
Klaas Freitag
740f0091f2 Updated version to 0.90.1 2013-09-23 16:37:31 +02:00
Klaas Freitag
ed636ffc9c Added Changelog entries. 2013-09-23 16:37:18 +02:00
Klaas Freitag
0e17b00675 Added a new error code HBF_TRANSFER_NOT_ACKED.
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:52:54 +02:00
Klaas Freitag
740a275836 Cleaned and added some debugging output. 2013-09-19 12:52:11 +02:00
Klaas Freitag
125a63bf8d More descriptive error message. 2013-09-19 12:50:44 +02:00
Klaas Freitag
b4f14e086d Added a new error code HBF_TRANSFER_NOT_ACKED.
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:40:17 +02:00
Klaas Freitag
6d8cef3bb6 Cleaned and added some debugging output. 2013-09-19 12:38:20 +02:00
Daniel Molkentin
d657a679ba Fix for previous commit 2013-09-18 16:28:01 +02:00
Klaas Freitag
219ce5fc4c Make compile on win32 without fnmatch 2013-09-18 16:17:58 +02:00
Klaas Freitag
2ec1bcfc29 Make compile on win32 without fnmatch. 2013-09-18 16:15:08 +02:00
Klaas Freitag
373746c296 Fix crash in case of NE_TIMEOUT happened.
Fixes https://github.com/owncloud/mirall/issues/1010

In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:58:17 +02:00
Klaas Freitag
525278450a Fix crash in case of NE_TIMEOUT happened.
Fixes https://github.com/owncloud/mirall/issues/1010

In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:57:15 +02:00
Daniel Molkentin
91e527dc2a Fix csync_version.h creation for cmake 2.6 2013-09-17 22:38:19 +02:00
Daniel Molkentin
82d31095f2 Fix csync_version.h creation for cmake 2.6 2013-09-17 22:37:59 +02:00
Klaas Freitag
de074804eb Detect empty etags coming from server side. 2013-09-16 16:15:15 +02:00
Klaas Freitag
c54a3ab7cc Added missing parenthesis. 2013-09-16 14:16:14 +02:00
Klaas Freitag
e09cb0c068 Move the check on the progressdb to the correct place, no crash anymore. 2013-09-12 15:37:10 +02:00
Klaas Freitag
62f4d118ea Use new interface to csync_excluded. 2013-09-12 15:30:47 +02:00
Klaas Freitag
302f81b1d2 Adjusted tests for csync_excluded. 2013-09-12 15:30:13 +02:00
Klaas Freitag
1c87314b88 Fix a typo. 2013-09-12 15:30:04 +02:00
Klaas Freitag
ba1184f5ab Make csync_excluded function work gitignore like. 2013-09-12 15:29:52 +02:00
Daniel Molkentin
30d8290d1c Replace every occurrence of csync with ocsync in the documentation.
Patch by Sandro Knauß <buggs@sandroknauss.de>

Fixes Mirall issue #991

Conflicts:
	doc/ocsync.1.txt
2013-09-12 15:29:37 +02:00
Daniel Molkentin
d4da443b12 Fixing spelling error 'transferred'
Lintian complains about the wrong spelling for transferred

Patch by Sandro Knauß <bugs@sandroknauss.de>

Fixes Mirall issue #990
2013-09-12 15:28:41 +02:00
Klaas Freitag
1f8aee8a4f Adjusted tests for csync_excluded. 2013-09-12 14:47:17 +02:00
Klaas Freitag
526d23583a Use new interface to csync_excluded. 2013-09-12 14:47:17 +02:00
Klaas Freitag
20821e6ffd Fix a typo. 2013-09-12 14:47:17 +02:00