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
Daniel Molkentin
91e527dc2a
Fix csync_version.h creation for cmake 2.6
2013-09-17 22:38:19 +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
d22dc6e6af
Exclude the progress database.
2013-09-11 10:43:05 +02:00
Daniel Molkentin
93fdbcd371
reversed decision: httpbf stays statically linked
2013-09-10 19:47:18 +02:00
Daniel Molkentin
6a2631631c
Make httpbf a shared lib
...
remove the lib suffix along the way
2013-09-10 14:41:42 +02:00
Klaas Freitag
9cb3af801a
Fixes for win32 after upstream merge.
2013-09-10 12:59:29 +02:00
Daniel Molkentin
1a10663c2b
csync_vio: fix defines
2013-09-05 19:50:20 +02:00
Daniel Molkentin
9c1a4fa68e
gcc/clang OS X does not know about __thread
...
This needs a proper implementation
2013-09-05 19:03:14 +02:00
Olivier Goffart
83cdece0b4
Merge remote-tracking branch 'owncloud/ocsync' into ocsync
2013-09-04 15:53:47 +02:00
Klaas Freitag
4cc1ef3624
Merge remote-tracking branch 'freitag/dav' into ocsync
...
Conflicts:
src/csync_propagate.c
src/csync_statedb.c
2013-09-04 15:51:38 +02:00
Daniel Molkentin
12b9b87c61
Update 0.90.0 changelog
2013-09-04 11:15:42 +02:00
Daniel Molkentin
0e1858ef2f
0.90.0 for final release with mirall 1.4
2013-09-03 16:44:46 +02:00
Klaas Freitag
d65b9aa404
Fixed exclude test.
2013-09-03 15:15:14 +02:00
Klaas Freitag
8b224e2c0a
Don't warn about a finished sqlite3 query.
2013-09-03 11:47:19 +02:00
Klaas Freitag
ce554eb44a
Let csync exclude report the exclude reason.
2013-09-02 17:23:17 +02:00
Daniel Molkentin
bff9b3843f
0.83.0
2013-08-23 14:35:45 +02:00
Olivier Goffart
ef1a47a5a2
Save the database with the new propagator
2013-08-21 15:42:03 +02:00
Olivier Goffart
3a57eb1b54
Add the size in the TREE_WALK_FILE structur
2013-08-21 13:24:49 +02:00
Olivier Goffart
79c1514a2b
Chenge the headers to LGPL for the file that were added in the dav branch
...
The LGPL changes was not merged for the new files
2013-08-21 13:23:52 +02:00
Olivier Goffart
9527b9f4d2
Compile fix
...
That file was removed
2013-08-21 12:59:22 +02:00
Klaas Freitag
6d259f80e0
Remove file.
2013-08-19 17:01:33 +02:00
Klaas Freitag
0afbbeb8dc
Log the new module capabilities.
2013-08-19 17:01:21 +02:00
Klaas Freitag
4dbee1015f
Some minor compile fixes.
2013-08-19 17:00:56 +02:00
Olivier Goffart
835813a86f
Fix the tests after merge
2013-08-18 20:13:27 +02:00
Olivier Goffart
b4efcf1627
Compile the tests after merge
...
(Still not passing)
2013-08-18 19:11:36 +02:00
Olivier Goffart
56d5359f5b
Fix compilation after merge
...
Still untetested
2013-08-18 18:55:32 +02:00
Klaas Freitag
e0d121d370
More minor cleanups.
2013-08-18 18:18:05 +02:00
Klaas Freitag
a5de9994ec
Set a proper error message on in-between-changes.
2013-08-18 18:18:05 +02:00
Olivier Goffart
d098a12321
leak fix
2013-08-18 18:18:05 +02:00
Daniel Molkentin
6cda2f0c24
Do not report removable ignored files
2013-08-18 17:52:45 +02:00
Olivier Goffart
4e04a2ccb0
Addapt to new error codes
2013-08-18 17:29:23 +02:00
Markus Goetz
b923554935
Revert "DB: Don't use metadata_tmp table"
...
Let's not do this in the release branch
This reverts commit 79f72a1211
.
2013-08-18 17:13:19 +02:00
Markus Goetz
6474780d80
Revert "DB: More easy IO mode"
...
This reverts commit ea6caed5a3
.
2013-08-18 17:12:59 +02:00
Markus Goetz
79f72a1211
DB: Don't use metadata_tmp table
...
Not sure why this was ever needed
2013-08-18 17:05:04 +02:00
Olivier Goffart
ec8adf2bd7
Fix compilation of src/std after merge
2013-08-18 16:51:02 +02:00
Olivier Goffart
2afdc9d095
Adapt to new multybyte api after merge
...
(Search and replace)
2013-08-18 16:43:46 +02:00
Olivier Goffart
9f5388544a
Fix cmake after merge
...
iniparser dependency is gone.
2013-08-18 16:29:35 +02:00
Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Markus Goetz
ea6caed5a3
DB: More easy IO mode
...
We move the DB anyway at the end, no need to be so harsh
2013-08-18 16:10:30 +02:00
Olivier Goffart
868f8029a2
Close the database file in all cases.
...
If the database was empty, we forgot to close the file descriptor,
making it impssible to remove the database and replace it with the real
one
2013-08-16 12:23:26 +02:00
Olivier Goffart
14219a1ea5
Log error of sqlite3_close
2013-08-15 18:39:26 +02:00
Daniel Molkentin
1663c84db7
Return an error if rename fails on win32.
...
Amends 9ea39dbaa9
.
2013-08-15 18:06:27 +02:00
Klaas Freitag
9ea39dbaa9
win32: Retry renaming in case of access denied.
2013-08-15 17:40:30 +02:00