youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Supported another crypt libraries as GnuTLS and NSS, and added configure options

Browse Source
This commit is contained in:
Takeshi Nakatani
2014-05-06 14:23:05 +00:00
parent c7665f80ab
commit cd27f0aa54
13 changed files with 1034 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fdcache.cpp
View File

@ -31,7 +31,6 @@
#include <string.h>
#include <assert.h>
#include <curl/curl.h>
#include <openssl/crypto.h>
#include <string>
#include <iostream>
#include <sstream>
@ -797,7 +796,7 @@ int FdEntity::Load(off_t start, off_t size)
break;
}
// download
if((*iter)->bytes >= (2 * S3fsCurl::GetMultipartSize()) && !nomultipart){ // default 20MB
if((*iter)->bytes >= static_cast<size_t>(2 * S3fsCurl::GetMultipartSize()) && !nomultipart){ // default 20MB
// parallel request
// Additional time is needed for large files
time_t backup = 0;
@ -1197,3 +1196,4 @@ bool FdManager::Close(FdEntity* ent)
return false;
}
/// END