Commit graph

334 commits

Author SHA1 Message Date
Klaas Freitag
1a648a612e Merge remote-tracking branch 'ogoffart/rename_folders_merged' into dav 2013-05-13 16:28:31 +02:00
Klaas Freitag
b7c03e92da Temporary disable cached propfind. 2013-05-10 09:55:44 +02:00
Markus Goetz
952290890c Merge remote-tracking branch 'origin/dav' into dav_recursive_update_squashed
Conflicts:
	modules/csync_owncloud.c
2013-05-08 14:31:24 +02:00
Markus Goetz
9b4eb40216 Remove timedelta stuff 2013-05-08 14:27:59 +02:00
Markus Goetz
639f1127b7 Move stuff to _util.c 2013-05-08 13:59:07 +02:00
Markus Goetz
9c2f223093 Add module property to disable recursive PROPFIND 2013-05-08 13:26:59 +02:00
Markus Goetz
927ccf5d08 Use C-style comments instead of modern // 2013-05-08 13:20:42 +02:00
Markus Goetz
52e2775292 Make PROPFIND cache external unit
and introduce a csync_owncloud.h
2013-05-08 13:12:01 +02:00
Markus Goetz
980c176073 Recursive PROPFIND cache for ownCloud module 2013-05-08 11:58:17 +02:00
Olivier Goffart
3c87cd71d7 Merge branch 'rename_folders' into dav
Conflicts:
	modules/csync_owncloud.c
	src/csync.c
	src/csync.h
	src/csync_propagate.c
	src/csync_propagate.h
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_util.c
	src/std/c_path.h
2013-05-07 15:24:12 +02:00
Olivier Goffart
247f4d948c don't ajust the time anymore with the difference from client to server 2013-05-07 11:45:02 +02:00
Olivier Goffart
546fdeed6c Add a way for mirall to access the dav session 2013-05-03 19:23:25 +02:00
Klaas Freitag
ab17e2aa8b Revert "Don't include csync_version.h from csync.h"
This reverts commit 5cda5d523c.
2013-04-26 10:45:14 +02:00
Klaas Freitag
5cda5d523c Don't include csync_version.h from csync.h 2013-04-26 10:37:45 +02:00
Klaas Freitag
374d9b0a8c Merge from feature branch csync_commit. 2013-04-22 15:39:43 +02:00
Klaas Freitag
b91b96922e Remove frees from module destroy which happend in commit before 2013-04-22 15:17:45 +02:00
Klaas Freitag
4bdabb7f46 Added a module commit function. 2013-04-22 13:51:44 +02:00
Klaas Freitag
35aaddda87 Added check on changes on the source file when uploading. 2013-04-16 16:27:40 +02:00
Klaas Freitag
84febf4b77 Merge branch 'dav_0.70.5' into dav 2013-04-15 15:37:17 +02:00
Klaas Freitag
2a5c403d63 Default timeout to 300 seconds. 2013-04-09 15:18:26 +02:00
Klaas Freitag
6cee3f49bc More robust error handling in utimes function 2013-04-08 12:27:27 +02:00
Klaas Freitag
a1ebf8556a Fix for Coverity CID #996827 2013-04-08 09:07:19 +02:00
Klaas Freitag
c745bf4291 Use correct printf qualifiers. 2013-04-03 16:37:55 +02:00
Klaas Freitag
6de7ddf294 Use httpbf for all transfers. 2013-03-27 18:06:54 +01:00
Klaas Freitag
c263532ba3 Merge remote-tracking branch 'ogoffart/davbf' into dav 2013-03-14 13:36:55 +01:00
Klaas Freitag
dd74b12b48 Merge remote-tracking branch 'ogoffart/davbf' into dav 2013-03-13 17:13:42 +01:00
Olivier Goffart
2205c9a339 Resume chunked upload if conneciton is lost 2013-03-12 11:42:17 +01:00
Klaas Freitag
f211ee8bf1 Add a command line option to set a http proxy (owncloud only) 2013-03-05 15:33:14 +01:00
Olivier Goffart
2e73ce5605 owncloud: Properly report the error when the connection drop 2013-03-02 15:01:40 +01:00
Olivier Goffart
0906312c02 Merge remote-tracking branch 'freitag/dav' into davbf 2013-03-02 13:43:59 +01:00
Olivier Goffart
ca20703370 httpbf: Fix leak 2013-03-02 13:42:36 +01:00
Klaas Freitag
fed597c840 Only try the PROPFIND again if the error is ERRNO_WRONG_CONTENT. 2013-02-20 17:38:09 +01:00
Olivier Goffart
1be65be68e Fix crash in owncloud_mkdir
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-13 18:25:28 +01:00
Olivier Goffart
b6a37064e9 Allow to configure the timeout in the config 2013-02-13 18:25:28 +01:00
Olivier Goffart
2e945c07af owncloud: fix session cookie again.
Some load balancers may add more cookies, and we would pick the wrong
one.  So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-13 18:25:28 +01:00
Olivier Goffart
b028c64325 In case of error dirring a rename, mark the source as updated
That way, the file will be saved in the DB again, and the next try, it
will retry to rename
2013-02-12 15:11:15 +01:00
Olivier Goffart
79bbbe75d7 Report error to the callback in mkdir and rename 2013-02-12 13:36:17 +01:00
Klaas Freitag
75cc77b947 Fixed build on win. 2013-02-10 16:43:38 +01:00
Klaas Freitag
c98f2dfba9 Do PROPFIND with multiple attempts to fix owncloud/mirall #285
temporarily.
2013-02-09 17:13:57 +01:00
Klaas Freitag
0410771d1b Log the response buffer if the propfind response is not XML.
This will help to debug the problem described in bug owncloud/mirall
2013-02-09 17:13:56 +01:00
Klaas Freitag
b92a5f55b8 Fixed a typo lintian brought up. 2013-02-09 17:13:56 +01:00
Olivier Goffart
5a262d7588 Fix crash in owncloud_mkdir
ne_simple_request destroy the request, we cannot access the error code
after it.
2013-02-08 21:06:25 +01:00
Olivier Goffart
7edc31048a owncloud: Retry when a download fails because of a timeout 2013-02-08 13:46:53 +01:00
Olivier Goffart
71caa3356c Automatically creates the destination folder if it does not exist 2013-02-06 18:40:02 +01:00
Olivier Goffart
0cf770017d Do not abort when move fail 2013-02-06 18:40:02 +01:00
Olivier Goffart
bdd331ee08 Allow to configure the timeout in the config 2013-02-06 18:38:46 +01:00
Olivier Goffart
50dac60bc9 owncloud: fix session cookie again.
Some load balancers may add more cookies, and we would pick the wrong
one.  So keep all the cookies.
If we already read a session cookie, don't parse more cookie as they are
not session cookie.
2013-02-06 12:32:48 +01:00
Klaas Freitag
b7a740d0b3 Switch off unix extensions like the server, see mirall bug #204. 2013-02-05 12:38:40 +01:00
Olivier Goffart
624c99de8f Make progress works correctly when files are chunked 2013-01-30 12:29:56 +01:00
Olivier Goffart
e75f11b87a Use httpbf in owncloud 2013-01-29 16:23:28 +01:00