octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-09 22:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from timuralp/bug/fix_fallback_v2

Browse Source 
Fallback to v2 signatures correctly.
This commit is contained in:
Takeshi Nakatani 2015-02-27 00:02:12 +09:00
commit 1b1cf2d4bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/curl.h
View File

@ -300,7 +300,7 @@ class S3fsCurl
static const char* GetIAMRole(void) { return S3fsCurl::IAM_role.c_str(); } static const char* GetIAMRole(void) { return S3fsCurl::IAM_role.c_str(); }
static bool SetMultipartSize(off_t size); static bool SetMultipartSize(off_t size);
static off_t GetMultipartSize(void) { return S3fsCurl::multipart_size; } static off_t GetMultipartSize(void) { return S3fsCurl::multipart_size; }
static bool SetSignatureV4(bool isset = true) { bool bresult = S3fsCurl::is_sigv4; S3fsCurl::is_sigv4 = isset; return bresult; } static bool SetSignatureV4(bool isset) { bool bresult = S3fsCurl::is_sigv4; S3fsCurl::is_sigv4 = isset; return bresult; }
static bool IsSignatureV4(void) { return S3fsCurl::is_sigv4; } static bool IsSignatureV4(void) { return S3fsCurl::is_sigv4; }
// methods // methods

2
src/s3fs.cpp
View File

@ -3068,7 +3068,7 @@ static int s3fs_check_service(void)
// retry to use sigv2 // retry to use sigv2
LOWSYSLOGPRINT(LOG_ERR, "Could not connect, so retry to connect by signature version 2."); LOWSYSLOGPRINT(LOG_ERR, "Could not connect, so retry to connect by signature version 2.");
FPRN("Could not connect, so retry to connect by signature version 2."); FPRN("Could not connect, so retry to connect by signature version 2.");
S3fsCurl::SetSignatureV4(); S3fsCurl::SetSignatureV4(false);
// retry to check // retry to check
s3fscurl.DestroyCurlHandle(); s3fscurl.DestroyCurlHandle();