mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't cleanup in owncloud's vio_module_shutdown

Browse Source 
All the cleanup is done in owncloud_commit which should
necessarily be called.

Should fix https://github.com/owncloud/mirall/issues/713
The problem was that csync_destroy was called on another csync
instance in another thread, resulting in a crash

Yes, there is still a problem with the proxy settings.
This commit is contained in:
Olivier Goffart 2013-10-31 11:15:21 +01:00
parent 0a99aa5fc7
commit f5391def6b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/csync_owncloud.c
View File

@ -1084,6 +1084,16 @@ static int owncloud_commit() {
ne_sock_exit();
_connected = 0; /* triggers dav_connect to go through the whole neon setup */
SAFE_FREE( dav_session.user );
SAFE_FREE( dav_session.pwd );
SAFE_FREE( dav_session.session_key);
SAFE_FREE( dav_session.error_string );
SAFE_FREE( dav_session.proxy_type );
SAFE_FREE( dav_session.proxy_host );
SAFE_FREE( dav_session.proxy_user );
SAFE_FREE( dav_session.proxy_pwd );
return 0;
}
@ -1206,18 +1216,6 @@ csync_vio_method_t *vio_module_init(const char *method_name, const char *args,
void vio_module_shutdown(csync_vio_method_t *method) {
(void) method;
owncloud_commit();
SAFE_FREE( dav_session.user );
SAFE_FREE( dav_session.pwd );
SAFE_FREE( dav_session.proxy_type );
SAFE_FREE( dav_session.proxy_host );
SAFE_FREE( dav_session.proxy_user );
SAFE_FREE( dav_session.proxy_pwd );
SAFE_FREE( dav_session.session_key);
SAFE_FREE( dav_session.error_string );
/* DEBUG_WEBDAV( "********** vio_module_shutdown" ); */
}