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

Author: stgates

Build/version.props

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

CONTRIBUTORS.txt

@@ -17,6 +17,7 @@ intercommiura
 halex2005
 simonlep
 jracle
+gandziej 
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/CMakeLists.txt

@@ -9,7 +9,7 @@ set(ANDROID_STL_FLAGS)
 
 # Platform (not compiler) specific settings
 if(IOS)
-  set(IOS_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../Build_iOS")
+  set(IOS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Build_iOS")
   set(Boost_FRAMEWORK "-F ${IOS_SOURCE_DIR} -framework boost")
   set(Boost_INCLUDE_DIR "${IOS_SOURCE_DIR}/boost.framework/Headers")
 

Release/include/cpprest/version.h

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

Release/src/CMakeLists.txt

@@ -92,7 +92,7 @@ target_link_libraries(${Casablanca_LIBRARY}
 
 # Portions specific to cpprest binary versioning.
 set (CPPREST_VERSION_MAJOR 2)
-set (CPPREST_VERSION_MINOR 5)
+set (CPPREST_VERSION_MINOR 6)
 set (CPPREST_VERSION_REVISION 0)
 
 if(WIN32)

Release/src/build/package_info.xml

@@ -1,7 +1,7 @@
 <package>
   <metadata>
     <base_id>cpprestsdk</base_id>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <authors>casablancacore</authors>
     <owners>Microsoft, Visual C++</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -10,7 +10,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications.</summary>
     <description>The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.</description>
-    <releaseNotes>https://casablanca.codeplex.com/releases/view/574398</releaseNotes>
+    <releaseNotes>https://casablanca.codeplex.com/releases/view/612765</releaseNotes>
     <copyright>Copyright 2015</copyright>
     <tags>cpprestsdk Casablanca REST JSON HTTP URI WebSockets</tags>
   </metadata>

Release/src/http/listener/http_server_asio.cpp

@@ -853,21 +853,37 @@ pplx::task<void> http_linux_server::register_listener(details::http_listener_imp
     {
         pplx::extensibility::scoped_rw_lock_t lock(m_listeners_lock);
         if (m_registered_listeners.find(listener) != m_registered_listeners.end())
+        {
             throw std::invalid_argument("listener already registered");
+        }
 
-        m_registered_listeners[listener] = utility::details::make_unique<pplx::extensibility::reader_writer_lock_t>();
-
-        auto found_hostport_listener = m_listeners.find(hostport);
-        if (found_hostport_listener == m_listeners.end())
+        try
         {
-            found_hostport_listener = m_listeners.insert(
-                std::make_pair(hostport, utility::details::make_unique<details::hostport_listener>(this, hostport))).first;
+            m_registered_listeners[listener] = utility::details::make_unique<pplx::extensibility::reader_writer_lock_t>();
 
-            if (m_started)
-                found_hostport_listener->second->start();
-        }
+            auto found_hostport_listener = m_listeners.find(hostport);
+            if (found_hostport_listener == m_listeners.end())
+            {
+                found_hostport_listener = m_listeners.insert(
+                    std::make_pair(hostport, utility::details::make_unique<details::hostport_listener>(this, hostport))).first;
 
-        found_hostport_listener->second->add_listener(path, listener);
+                if (m_started)
+                {
+                    found_hostport_listener->second->start();
+                }
+            }
+
+            found_hostport_listener->second->add_listener(path, listener);
+        }
+        catch (...)
+        {
+            // Future improvement - really this API should entirely be asychronously.
+            // the hostport_listener::start() method should be made to return a task
+            // throwing the exception.
+            m_registered_listeners.erase(listener);
+            m_listeners.erase(hostport);
+            throw;
+        }
     }
 
     return pplx::task_from_result();