octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 09:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Issue 343 (Issue 235 , Issue 257 , Issue 265)

Browse Source 
1) Fixes "SSL connect error"(curl 35 error)
    Re-fixed "SSL connect error",  so r434 could not fix it completely(mistook fixing).



git-svn-id: http://s3fs.googlecode.com/svn/trunk@441 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
ggtakec@gmail.com 2013-06-06 03:01:21 +00:00
parent b921844ff8
commit a285716f87
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/s3fs.cpp
View File

@ -3505,7 +3505,7 @@ static void* s3fs_init(struct fuse_conn_info *conn)
} }
CRYPTO_set_locking_callback(locking_function); CRYPTO_set_locking_callback(locking_function);
CRYPTO_set_id_callback(id_function); CRYPTO_set_id_callback(id_function);
curl_global_init(CURL_GLOBAL_ALL); init_curl_global_all();
init_curl_handles_mutex(); init_curl_handles_mutex();
InitMimeType("/etc/mime.types"); InitMimeType("/etc/mime.types");
init_curl_share(dns_cache); init_curl_share(dns_cache);
@ -3531,7 +3531,7 @@ static void s3fs_destroy(void*)
free(mutex_buf); free(mutex_buf);
mutex_buf = NULL; mutex_buf = NULL;
destroy_curl_share(dns_cache); destroy_curl_share(dns_cache);
curl_global_cleanup(); cleanup_curl_global_all();
destroy_curl_handles_mutex(); destroy_curl_handles_mutex();
} }
@ -4584,15 +4584,9 @@ int main(int argc, char *argv[]) {
s3fs_oper.access = s3fs_access; s3fs_oper.access = s3fs_access;
s3fs_oper.create = s3fs_create; s3fs_oper.create = s3fs_create;
// Re-Initiate curl global for ssl before calling fuse.
if(!init_curl_global_all()){
exit(EXIT_FAILURE);
}
// now passing things off to fuse, fuse will finish evaluating the command line args // now passing things off to fuse, fuse will finish evaluating the command line args
fuse_res = fuse_main(custom_args.argc, custom_args.argv, &s3fs_oper, NULL); fuse_res = fuse_main(custom_args.argc, custom_args.argv, &s3fs_oper, NULL);
fuse_opt_free_args(&custom_args); fuse_opt_free_args(&custom_args);
cleanup_curl_global_all();
exit(fuse_res); exit(fuse_res);
} }