From 9323658b01a46e4eed676894fdedf43c25035ca7 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 11 Nov 2013 17:45:19 +0100 Subject: [PATCH] Remove ne_sock_init and ne_sock_exit from owncloud module. This change, together with a change in mirall calling the two functions in folderman, should fix https://github.com/owncloud/mirall/issues/1115 This needs to be verified and maybe reverted! --- modules/csync_owncloud.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/csync_owncloud.c b/modules/csync_owncloud.c index bfd531b324..948142ef9b 100644 --- a/modules/csync_owncloud.c +++ b/modules/csync_owncloud.c @@ -497,12 +497,14 @@ static int dav_connect(const char *base_url) { port = ne_uri_defaultport(protocol); } +#if 0 rc = ne_sock_init(); DEBUG_WEBDAV("ne_sock_init: %d", rc ); if (rc < 0) { rc = -1; goto out; } +#endif dav_session.ctx = ne_session_create( protocol, host, port); @@ -1081,7 +1083,7 @@ static int owncloud_commit() { dav_session.ctx = 0; - ne_sock_exit(); + // ne_sock_exit(); _connected = 0; /* triggers dav_connect to go through the whole neon setup */ SAFE_FREE( dav_session.user );