Fixing locale issues in json library, on Linux.

Author: stgates

Release/include/cpprest/asyncrt_utils.h

@@ -48,6 +48,7 @@ namespace pplx = Concurrency;
 
 #ifndef _MS_WINDOWS
 #include <boost/algorithm/string.hpp>
+#include <xlocale.h>
 #endif
 
 /// Various utilities for string conversions and date and time manipulation.
@@ -171,6 +172,8 @@ namespace details
 #ifdef _MS_WINDOWS
             _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
             m_prevLocale = setlocale(LC_ALL, locale);
+#else
+            m_prevLocale = uselocale(newlocale(LC_ALL, locale, nullptr));        
 #endif
         }
 
@@ -180,13 +183,18 @@ namespace details
             {
 #ifdef _MS_WINDOWS
                 setlocale(LC_ALL, m_prevLocale);
+#else
+                locale_t original = uselocale(m_prevLocale);
+                freelocale(original);
 #endif
             }
         }
 
     private:
 #ifdef _MS_WINDOWS
         char * m_prevLocale;
+#else
+        locale_t m_prevLocale;
 #endif
     };
 

Release/src/json/json_serialization.cpp

@@ -27,6 +27,7 @@
 
 #include "stdafx.h"
 #include <stdio.h>
+#include <inttypes.h>
 
 using namespace web;
 using namespace web::json;
@@ -145,28 +146,26 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
 {
     if(m_number.m_type != number::type::double_type)
     {
-#ifdef _MS_WINDOWS
         // #digits + 1 to avoid loss + 1 for the sign + 1 for null terminator.
         const size_t tempSize = std::numeric_limits<uint64_t>::digits10 + 3;
         char tempBuffer[tempSize];
 
+#ifdef _MS_WINDOWS
         // This can be improved performance-wise if we implement our own routine
         if (m_number.m_type == number::type::signed_type)
             _i64toa_s(m_number.m_intval, tempBuffer, tempSize, 10);
         else
             _ui64toa_s(m_number.m_uintval, tempBuffer, tempSize, 10);
 
         const auto numChars = strnlen_s(tempBuffer, tempSize);
-        stream.append(tempBuffer, numChars);
 #else
-        std::stringstream ss; // TODO - also consider replacing with snprintf...
+        int numChars;
         if (m_number.m_type == number::type::signed_type)
-            ss << m_number.m_intval;
+            numChars = snprintf(tempBuffer, tempSize, "%" PRId64, m_number.m_intval);
         else
-            ss << m_number.m_uintval;
-
-        stream.append(ss.str());
+            numChars = snprintf(tempBuffer, tempSize, "%" PRIu64, m_number.m_uintval);
 #endif
+        stream.append(tempBuffer, numChars);
     }
     else
     {