octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-17 01:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

url: handle scheme omission

Browse Source 
When the scheme is omitted in URL overriding (for example `example.com`
instead of `https://example.com`), s3fs is modifying the URL by
inserting `s3.` in the middle of the name  (`examples3..com`).

This can be a bit difficult to troubleshoot and curl seems to handle
schema-less requests just fine. So, just handle this case correctly.
This commit is contained in:
Vincent Bernat 2014-10-23 10:25:17 +02:00
parent 1eddf92c35
commit 7212072ff0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/string_util.cpp
View File

@ -180,10 +180,12 @@ string prepare_url(const char* url)
string token = str("/" + bucket); string token = str("/" + bucket);
int bucket_pos = url_str.find(token); int bucket_pos = url_str.find(token);
int bucket_length = token.size(); int bucket_length = token.size();
int uri_length = 7; int uri_length = 0;
if(!strncasecmp(url_str.c_str(), "https://", 8)){ if(!strncasecmp(url_str.c_str(), "https://", 8)){
uri_length = 8; uri_length = 8;
} else if(!strncasecmp(url_str.c_str(), "http://", 7)) {
uri_length = 7;
} }
uri = url_str.substr(0, uri_length); uri = url_str.substr(0, uri_length);