Merge branch 'development' of https://git01.codeplex.com/casablanca into nuget

Author: stgates

CONTRIBUTORS.txt

@@ -15,6 +15,7 @@ DeCarabas
 luisfeliu
 intercommiura
 halex2005
+simonlep
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/include/cpprest/asyncrt_utils.h

@@ -184,24 +184,43 @@ namespace conversions
     _ASYNCRTIMP std::vector<unsigned char> __cdecl from_base64(const utility::string_t& str);
 
     template <typename Source>
-    utility::string_t print_string(const Source &val)
+    utility::string_t print_string(const Source &val, const std::locale &loc)
     {
         utility::ostringstream_t oss;
+        oss.imbue(loc);
         oss << val;
         if (oss.bad())
+        {
             throw std::bad_cast();
+        }
         return oss.str();
     }
+
+    template <typename Source>
+    utility::string_t print_string(const Source &val)
+    {
+        return print_string(val, std::locale());
+    }
+
     template <typename Target>
-    Target scan_string(const utility::string_t &str)
+    Target scan_string(const utility::string_t &str, const std::locale &loc)
     {
         Target t;
         utility::istringstream_t iss(str);
+        iss.imbue(loc);
         iss >> t;
         if (iss.bad())
+        {
             throw std::bad_cast();
+        }
         return t;
     }
+
+    template <typename Target>
+    Target scan_string(const utility::string_t &str)
+    {
+        return scan_string<Target>(str, std::locale());
+    }
 }
 
 namespace details

Release/include/cpprest/details/SafeInt3.hpp

@@ -136,6 +136,7 @@ class hostport_listener
         m_all_connections_complete.set();
 
         std::istringstream hostport_in(hostport);
+        hostport_in.imbue(std::locale::classic());
 
         std::getline(hostport_in, m_host, ':');
         std::getline(hostport_in, m_port);

Release/include/cpprest/details/http_server_asio.h

@@ -40,6 +40,7 @@ namespace web { namespace http {
 /// <param name="ref">The value to bind to.</param>
 /// <returns><c>true</c> if the binding succeeds, <c>false</c> otherwise.</returns>
 template<typename key_type, typename _t>
+CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, std::istringstream instead.")
 bool bind(const key_type &text, _t &ref) // const
 {
     utility::istringstream_t iss(text);
@@ -61,6 +62,7 @@ bool bind(const key_type &text, _t &ref) // const
 /// <param name="ref">The value to bind to.</param>
 /// <returns><c>true</c> if the binding succeeds, <c>false</c> otherwise.</returns>
 template <typename key_type>
+CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release.")
 bool bind(const key_type &text, utility::string_t &ref) //const
 {
     ref = text;
@@ -175,7 +177,7 @@ class http_headers
     }
 
     /// <summary>
-    /// Removes all elements from the hearders
+    /// Removes all elements from the headers.
     /// </summary>
     void clear() { m_headers.clear(); }
 
@@ -227,10 +229,10 @@ class http_headers
             // Check to see if doesn't have a value.
             if(iter->second.empty())
             {
-                http::bind(iter->second, value);
+                bind_impl(iter->second, value);
                 return true;
             }
-            return http::bind(iter->second, value);
+            return bind_impl(iter->second, value);
         }
         else
         {
@@ -239,7 +241,7 @@ class http_headers
     }
 
     /// <summary>
-    /// Returns an iterator refering to the first header field.
+    /// Returns an iterator referring to the first header field.
     /// </summary>
     /// <returns>An iterator to the beginning of the HTTP headers</returns>
     iterator begin() { return m_headers.begin(); }
@@ -248,7 +250,7 @@ class http_headers
     /// <summary>
     /// Returns an iterator referring to the past-the-end header field.
     /// </summary>
-            /// <returns>An iterator to the element past the end of the HTTP headers</returns>
+    /// <returns>An iterator to the element past the end of the HTTP headers.</returns>
     iterator end() { return m_headers.end(); }
     const_iterator end() const { return m_headers.end(); }
 
@@ -302,6 +304,26 @@ class http_headers
 
 private:
 
+    template<typename _t>
+    bool bind_impl(const key_type &text, _t &ref) const
+    {
+        utility::istringstream_t iss(text);
+        iss.imbue(std::locale::classic());
+        iss >> ref;
+        if (iss.fail() || !iss.eof())
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    bool bind_impl(const key_type &text, ::utility::string_t &ref) const
+    {
+        ref = text;
+        return true;
+    }
+
     // Headers are stored in a map with case insensitive key.
     std::map<utility::string_t, utility::string_t, _case_insensitive_cmp> m_headers;
 };

Release/include/cpprest/http_headers.h

@@ -250,7 +250,7 @@ class http_listener
     /// Add a general handler to support all requests.
     /// </summary>
     /// <param name="handler">Function object to be called for all requests.</param>
-    void support(std::function<void(http_request)> handler)
+    void support(const std::function<void(http_request)> &handler)
     {
         m_impl->m_all_requests = handler;
     }
@@ -260,7 +260,7 @@ class http_listener
     /// </summary>
     /// <param name="method">An HTTP method.</param>
     /// <param name="handler">Function object to be called for all requests for the given HTTP method.</param>
-    void support(const http::method &method, std::function<void(http_request)> handler)
+    void support(const http::method &method, const std::function<void(http_request)> &handler)
     {
         m_impl->m_supported_methods[method] = handler;
     }

Release/include/cpprest/http_listener.h

@@ -505,9 +505,7 @@ class oauth1_config
 
     static utility::string_t _generate_timestamp()
     {
-        utility::ostringstream_t os;
-        os << utility::datetime::utc_timestamp();
-        return os.str();
+        return utility::conversions::print_string(utility::datetime::utc_timestamp(), std::locale::classic());
     }
 
     _ASYNCRTIMP static std::vector<unsigned char> __cdecl _hmac_sha1(const utility::string_t& key, const utility::string_t& data);

Release/include/cpprest/oauth1.h

@@ -237,6 +237,7 @@ namespace web
         uri_builder &append_query(utility::string_t name, const T &value, bool do_encoding = true)
         {
             utility::ostringstream_t ss;
+            ss.imbue(std::locale::classic());
             ss << name << _XPLATSTR("=") << value;
             return append_query(ss.str(), do_encoding);
         }

Release/include/cpprest/uri_builder.h

@@ -72,14 +72,9 @@ class threadpool
         for (size_t i = 0; i < n; i++)
             add_thread();
     }
-#if defined(__ANDROID__)
+
     static threadpool& shared_instance();
-#else
-    static threadpool& shared_instance()
-    {
-        return s_shared;
-    }
-#endif
+
     ~threadpool()
     {
         m_service.stop();
@@ -105,10 +100,6 @@ class threadpool
 private:
     struct _cancel_thread { };
 
-#if !defined(__ANDROID__)
-    static threadpool s_shared;
-#endif
-
     void add_thread()
     {
         pthread_t t;

Release/include/pplx/threadpool.h

@@ -442,8 +442,8 @@ class connection : public config::socket_type::socket_con_type {
         if (ec) {
             // reset the handlers to break the circular reference:
             // this->handler->this
-            m_async_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-            m_async_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+            m_async_read_handler = async_read_handler();
+            m_async_write_handler = async_write_handler();
         }
 
         return ec;
@@ -969,12 +969,12 @@ class connection : public config::socket_type::socket_con_type {
 		// Reset cached handlers now that we won't be reading or writing anymore
 		// These cached handlers store shared pointers to this connection and
 		// will leak the connection if not destroyed.
-		m_async_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-		m_async_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-		m_init_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+		m_async_read_handler = async_read_handler();
+		m_async_write_handler = async_write_handler();
+		m_init_handler = init_handler();
 
-        m_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-        m_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+        m_read_handler = read_handler();
+        m_write_handler = write_handler();
 
         timer_ptr shutdown_timer;
         shutdown_timer = set_timer(