jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #282 : use thread-safe variants of gmtime

Browse source
This commit is contained in:
eidheim 2019-09-14 14:23:46 +02:00
commit b914172056
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
utility.hpp
View file

@ -321,8 +321,6 @@ namespace SimpleWeb {
class Date { class Date {
public: public:
/// Returns the given std::chrono::system_clock::time_point as a string with the following format: Wed, 31 Jul 2019 11:34:23 GMT. /// Returns the given std::chrono::system_clock::time_point as a string with the following format: Wed, 31 Jul 2019 11:34:23 GMT.
/// Warning: while this function is thread safe with other Date::to_string() calls,
/// it is not thread safe with other functions that include calls to std::gmtime.
static std::string to_string(const std::chrono::system_clock::time_point time_point) noexcept { static std::string to_string(const std::chrono::system_clock::time_point time_point) noexcept {
static std::string result_cache; static std::string result_cache;
static std::chrono::system_clock::time_point last_time_point; static std::chrono::system_clock::time_point last_time_point;
@ -339,7 +337,14 @@ namespace SimpleWeb {
result.reserve(29); result.reserve(29);
auto time = std::chrono::system_clock::to_time_t(time_point); auto time = std::chrono::system_clock::to_time_t(time_point);
auto gmtime = std::gmtime(&time); tm tm;
#ifdef _MSC_VER
auto gmtime = gmtime_s(&time, &tm);
#else
auto gmtime = gmtime_r(&time, &tm);
#endif
if(!gmtime)
return {};
switch(gmtime->tm_wday) { switch(gmtime->tm_wday) {
case 0: result += "Sun, "; break; case 0: result += "Sun, "; break;