octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-03 11:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from s3fs-fuse/issue#149

Browse Source 
Fixed url-encoding for ampersand etc on sigv4 - Improvement/#149
This commit is contained in:
Takeshi Nakatani 2015-03-21 11:32:08 +09:00
commit 66e0233410
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/string_util.cpp
View File

@ -125,10 +125,6 @@ string urlEncode(const string &s)
for (unsigned i = 0; i < s.length(); ++i) { for (unsigned i = 0; i < s.length(); ++i) {
if (s[i] == '/') { // Note- special case for fuse paths... if (s[i] == '/') { // Note- special case for fuse paths...
result += s[i]; result += s[i];
}else if (s[i] == '=') { // Note- special case for s3...
result += s[i];
}else if (s[i] == '&') { // Note- special case for s3...
result += s[i];
} else if (isalnum(s[i])) { } else if (isalnum(s[i])) {
result += s[i]; result += s[i];
} else if (s[i] == '.' || s[i] == '-' || s[i] == '*' || s[i] == '_') { } else if (s[i] == '.' || s[i] == '-' || s[i] == '*' || s[i] == '_') {
@ -159,6 +155,8 @@ string urlEncode2(const string &s)
result += s[i]; result += s[i];
}else if (s[i] == '&') { // Note- special case for s3... }else if (s[i] == '&') { // Note- special case for s3...
result += s[i]; result += s[i];
}else if(s[i] == '%'){
result += s[i];
} else if (isalnum(s[i])) { } else if (isalnum(s[i])) {
result += s[i]; result += s[i];
} else if (s[i] == '.' || s[i] == '-' || s[i] == '*' || s[i] == '_') { } else if (s[i] == '.' || s[i] == '-' || s[i] == '*' || s[i] == '_') {