Merge remote-tracking branch 'ogoffart/dav' into dav

modules/csync_owncloud.c

@@ -2144,6 +2144,11 @@ static int owncloud_set_property(const char *key, void *data) {
         dav_session.chunk_info = (csync_hbf_info_t *)(data);
         return 0;
     }
+    if( c_streq(key, "get_dav_session")) {
+        /* Give the ne_session to the caller */
+        *(ne_session**)data = dav_session.ctx;
+        return 0;
+    }
 
     return -1;
 }

src/csync.c

@@ -577,9 +577,14 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
       trav.type =   cur->type;
       trav.instruction = cur->instruction;
       trav.rename_path = cur->destpath;
+      trav.md5 =    cur->md5;
 
       rc = (*visitor)(&trav, twctx->userdata);
       cur->instruction = trav.instruction;
+      if (trav.md5 != cur->md5) {
+          SAFE_FREE(cur->md5);
+          cur->md5 = c_strdup(trav.md5);
+      }
       return rc;
     }
     ctx->error_code = CSYNC_ERR_TREE;
@@ -715,6 +720,9 @@ int csync_commit(CSYNC *ctx) {
 
   ctx->error_code = CSYNC_ERR_NONE;
 
+  /* maybe the propagate was done using another propagator, let the merger think it has been done */
+  ctx->status = CSYNC_STATUS_DONE;
+
   if (_merge_and_write_statedb(ctx) < 0) {
     CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Merge and Write database failed!");
     if (ctx->error_code == CSYNC_ERR_NONE) {

src/csync.h

@@ -145,6 +145,7 @@ struct csync_tree_walk_file_s {
     enum csync_instructions_e instruction;
 
     const char *rename_path;
+    const char *md5;
 };
 typedef struct csync_tree_walk_file_s TREE_WALK_FILE;
 

src/httpbf/CMakeLists.txt

@@ -31,3 +31,14 @@ target_link_libraries(${HTTPBF_LIBRARY} ${NEON_LIBRARIES})
 if(NOT WIN32)
     add_definitions( -fPIC )
 endif()
+
+INSTALL(
+    TARGETS
+    ${HTTPBF_LIBRARY}
+    LIBRARY DESTINATION
+    ${LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION
+    ${LIB_INSTALL_DIR}
+    RUNTIME DESTINATION
+    ${BIN_INSTALL_DIR}
+)

src/httpbf/src/httpbf.h

@@ -25,6 +25,11 @@
 
 #include <neon/ne_session.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 enum hbf_state_e {
     HBF_SUCCESS,
     HBF_NOT_TRANSFERED,           /* never tried to transfer     */
@@ -100,4 +105,9 @@ const char *hbf_error_string( Hbf_State state );
  */
 int hbf_fail_http_code( hbf_transfer_t *transfer );
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif