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

Author: stgates

Build/version.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>3</CppRestSDKVersionMinor>
+    <CppRestSDKVersionMinor>4</CppRestSDKVersionMinor>
     <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>

Release/include/cpprest/asyncrt_utils.h

@@ -385,6 +385,7 @@ class datetime
     /// <summary>
     /// Creates <c>datetime</c> from a string representing time in UTC in RFC 1123 format.
     /// </summary>
+    /// <returns>Returns a <c>datetime</c> of zero if not successful.</returns>
     static _ASYNCRTIMP datetime __cdecl from_string(const utility::string_t& timestring, date_format format = RFC_1123);
 
     /// <summary>
@@ -465,14 +466,15 @@ class datetime
     // void* to avoid pulling in windows.h
     static _ASYNCRTIMP bool __cdecl datetime::system_type_to_datetime(/*SYSTEMTIME*/ void* psysTime, uint64_t seconds, datetime * pdt);
 #else
-    static datetime timeval_to_datetime(struct timeval time);
+    static datetime timeval_to_datetime(const timeval &time);
 #endif
 
     // Private constructor. Use static methods to create an instance.
     datetime(interval_type interval) : m_interval(interval)
     {
     }
 
+    // Storing as hundreds of nanoseconds 10e-7, i.e. 1 here equals 100ns.
     interval_type m_interval;
 };
 

Release/include/cpprest/details/http_client_impl.h

@@ -188,8 +188,6 @@ class request_context
     http_request m_request;
     http_response m_response;
 
-    std::exception_ptr m_exceptionPtr;
-
     utility::size64_t m_uploaded;
     utility::size64_t m_downloaded;
 
@@ -204,7 +202,6 @@ class request_context
     request_context(const std::shared_ptr<_http_client_communicator> &client, const http_request &request)
         : m_http_client(client),
         m_request(request),
-        m_exceptionPtr(),
         m_uploaded(0),
         m_downloaded(0)
     {

Release/include/cpprest/details/http_helpers.h

@@ -95,9 +95,9 @@ namespace details
     utf16string convert_utf16be_to_utf16le(utf16string src, bool erase_bom);
 
     // simple helper functions to trim whitespace.
-    void ltrim_whitespace(utility::string_t &str);
-    void rtrim_whitespace(utility::string_t &str);
-    void trim_whitespace(utility::string_t &str);
+    _ASYNCRTIMP void ltrim_whitespace(utility::string_t &str);
+    _ASYNCRTIMP void rtrim_whitespace(utility::string_t &str);
+    _ASYNCRTIMP void trim_whitespace(utility::string_t &str);
 
     bool validate_method(const utility::string_t& method);
 

Release/include/cpprest/filestream.h

@@ -703,7 +703,7 @@ namespace details {
             return pplx::create_task(result_tce);
         }
 
-        basic_file_buffer(_In_ _file_info *info) : m_info(info), streambuf_state_manager<_CharType>(info->m_mode) { }
+        basic_file_buffer(_In_ _file_info *info) : streambuf_state_manager<_CharType>(info->m_mode), m_info(info) { }
 
 #if !defined(__cplusplus_winrt)
         static pplx::task<std::shared_ptr<basic_streambuf<_CharType>>> open(
@@ -825,7 +825,7 @@ namespace details {
         class _filestream_callback_read : public details::_filestream_callback
         {
         public:
-            _filestream_callback_read(_In_ _file_info *info, pplx::task_completion_event<size_t> op) : m_op(op), m_info(info) { }
+            _filestream_callback_read(_In_ _file_info *info, pplx::task_completion_event<size_t> op) : m_info(info), m_op(op) { }
 
             virtual void on_completed(size_t result)
             {
@@ -849,7 +849,7 @@ namespace details {
         class _filestream_callback_putc : public details::_filestream_callback
         {
         public:
-            _filestream_callback_putc(_In_ _file_info *info, pplx::task_completion_event<int_type> op, _CharType ch) : m_info(info), m_ch(ch), m_op(op) { }
+            _filestream_callback_putc(_In_ _file_info *info, pplx::task_completion_event<int_type> op, _CharType ch) : m_info(info), m_op(op), m_ch(ch) { }
 
             virtual void on_completed(size_t result)
             {
@@ -879,7 +879,7 @@ namespace details {
         class _filestream_callback_bumpc : public details::_filestream_callback
         {
         public:
-            _filestream_callback_bumpc(_In_ _file_info *info, pplx::task_completion_event<int_type> op) : m_op(op), m_ch(0), m_info(info) { }
+            _filestream_callback_bumpc(_In_ _file_info *info, pplx::task_completion_event<int_type> op) : m_ch(0), m_info(info), m_op(op) { }
 
             virtual void on_completed(size_t result)
             {
@@ -911,7 +911,7 @@ namespace details {
         class _filestream_callback_getc : public details::_filestream_callback
         {
         public:
-            _filestream_callback_getc(_In_ _file_info *info, pplx::task_completion_event<int_type> op) : m_op(op), m_ch(0), m_info(info) { }
+            _filestream_callback_getc(_In_ _file_info *info, pplx::task_completion_event<int_type> op) : m_ch(0), m_info(info), m_op(op) { }
 
             virtual void on_completed(size_t result)
             {

Release/include/cpprest/interopstream.h

@@ -57,7 +57,7 @@ namespace Concurrency { namespace streams {
         /// Private constructor
         /// </summary>
         basic_stdio_buffer(_In_ std::basic_streambuf<_CharType>* streambuf, std::ios_base::openmode mode)
-            : m_buffer(streambuf), streambuf_state_manager<_CharType>(mode)
+            : streambuf_state_manager<_CharType>(mode), m_buffer(streambuf)
         {
         }
 

Release/include/cpprest/rawptrstream.h

@@ -417,8 +417,8 @@ namespace Concurrency { namespace streams {
         basic_rawptr_buffer(const _CharType* data, size_t size)
             : streambuf_state_manager<_CharType>(std::ios_base::in),
               m_data(const_cast<_CharType*>(data)),
-              m_current_position(0),
-              m_size(size)
+              m_size(size),
+              m_current_position(0)
         {
             validate_mode(std::ios_base::in);
         }
@@ -432,8 +432,8 @@ namespace Concurrency { namespace streams {
         basic_rawptr_buffer(_CharType* data, size_t size, std::ios_base::openmode mode)
             : streambuf_state_manager<_CharType>(mode),
               m_data(data),
-              m_current_position(0),
-              m_size(size)
+              m_size(size),
+              m_current_position(0)
         {
             validate_mode(mode);
         }

Release/include/cpprest/streams.h

@@ -1328,7 +1328,7 @@ class type_parser<CharType,int64_t> : public _type_parser_base<CharType>
 template <typename FloatingPoint>
 struct _double_state
 {
-    _double_state() : result(0), minus(0), exponent(false), after_comma(0), exponent_number(0), exponent_minus(0), p_exception_string(), complete(false) {}
+    _double_state() : result(0), minus(0), after_comma(0), exponent(false), exponent_number(0), exponent_minus(0), complete(false), p_exception_string() {}
 
     FloatingPoint result;
     char minus;             // 0 -- no sign, 1 -- plus, 2 -- minus

Release/include/cpprest/version.h

@@ -16,7 +16,7 @@
 * ==--==
 */
 #define CPPREST_VERSION_REVISION 0
-#define CPPREST_VERSION_MINOR 3
+#define CPPREST_VERSION_MINOR 4
 #define CPPREST_VERSION_MAJOR 2
 
 #define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)

Release/nuget/cpprestsdk.nuspec

@@ -15,11 +15,6 @@
         <releaseNotes>"Release of C++ Rest SDK 2.3.0 libraries."</releaseNotes>
         <copyright>Copyright 2014</copyright>
         <tags>REST, native, C++, JSON, Casablanca, Http, Uri, WebSockets</tags>
-        
-        <!-- OpenSSL dependency only necessary for Windows Desktop, but unless our package is split into smaller components it is required for all. -->
-        <dependencies>
-          <dependency id="openssl" version="1.0.1.25" />
-        </dependencies>
     </metadata>
     <files>
         <!-- Include header files-->