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

Merge pull request #3 from worpet/master

Browse Source 
Fixed local timezone was incorrectly being applied to IAM and Last-Modified dates.
This commit is contained in:
rrizun 2014-01-01 05:15:51 -08:00
commit 26187b954e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/s3fs_util.cpp
View File

@ -752,7 +752,7 @@ time_t cvtIAMExpireStringToTime(const char* s)
}
memset(&tm, 0, sizeof(struct tm));
strptime(s, "%Y-%m-%dT%H:%M:%S", &tm);
return mktime(&tm); // GMT
return timegm(&tm); // GMT
}
time_t get_lastmodified(const char* s)
@ -763,7 +763,7 @@ time_t get_lastmodified(const char* s)
}
memset(&tm, 0, sizeof(struct tm));
strptime(s, "%a, %d %b %Y %H:%M:%S %Z", &tm);
return mktime(&tm); // GMT
return timegm(&tm); // GMT
}
time_t get_lastmodified(headers_t& meta)