Merge branch 'development' into fixing#418

Build/Common.Build.settings

@@ -36,6 +36,7 @@
   <PropertyGroup>
     <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
+    <IntDir>$(BuildRoot)\Intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
     <TestRoot>$(BuildRoot)\Release\Tests</TestRoot>
     <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>

Build/Release.Product.settings

@@ -32,7 +32,6 @@
 
   <PropertyGroup>
     <InternalIncludeDir>$(CasablancaIncludeDir)</InternalIncludeDir>
-    <IntDir>$(BuildRoot)\Intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

Build/version.props

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

Build_iOS/configure.sh

@@ -12,9 +12,11 @@ git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git
 pushd OpenSSL-for-iPhone
 ./build-libssl.sh
 popd
-mkdir openssl
-mv OpenSSL-for-iPhone/include openssl
-mv OpenSSL-for-iPhone/lib openssl
+mkdir -p openssl/lib
+cp -r OpenSSL-for-iPhone/bin/iPhoneOS8.2-armv7.sdk/include openssl
+cp OpenSSL-for-iPhone/include/LICENSE openssl
+lipo -create -output openssl/lib/libssl.a OpenSSL-for-iPhone/bin/iPhone*/lib/libssl.a
+lipo -create -output openssl/lib/libcrypto.a OpenSSL-for-iPhone/bin/iPhone*/lib/libcrypto.a
 
 git clone https://github.com/cristeab/ios-cmake.git
 pushd ios-cmake

CONTRIBUTORS.txt

@@ -34,6 +34,7 @@ Gery Vessere (gery@vessere.com)
 
 Cisco Systems
 Gergely Lukacsy (glukacsy)
+Chris Deering (deeringc)
 
 Ocedo GmbH
 Henning Pfeiffer (megaposer)

Release/CMakeLists.txt

@@ -7,6 +7,8 @@ enable_testing()
 set(WARNINGS)
 set(ANDROID_STL_FLAGS)
 
+option(WERROR "Threat Warnings as Errors" ON)
+
 # Platform (not compiler) specific settings
 if(IOS)
   set(IOS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Build_iOS")
@@ -73,7 +75,7 @@ elseif(ANDROID)
   set(BUILD_SAMPLES OFF)
   option(BUILD_TESTS "Build tests." ON)
 elseif(UNIX) # This includes OSX
-  find_package(Boost REQUIRED COMPONENTS random chrono system thread regex filesystem)
+  find_package(Boost 1.54 REQUIRED COMPONENTS random chrono system thread regex filesystem)
   find_package(Threads REQUIRED)
   if(APPLE AND NOT OPENSSL_ROOT_DIR)
     # Prefer a homebrew version of OpenSSL over the one in /usr/lib
@@ -189,7 +191,8 @@ else()
 endif()
 
 set(Casablanca_LIBRARY ${LIB}cpprest)
-set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
+set(Casablanca_LIBRARIES ${Casablanca_LIBRARY}
+  ${Boost_LIBRARIES})
 
 # Everything in the project needs access to the casablanca include directories
 include_directories(${Casablanca_INCLUDE_DIRS})

Release/include/cpprest/details/web_utilities.h

@@ -30,6 +30,7 @@ namespace web
 namespace http { namespace client { namespace details {
 class winhttp_client;
 class winrt_client;
+class asio_context;
 }}}
 namespace websockets { namespace client { namespace details {
 class winrt_callback_client;
@@ -124,6 +125,7 @@ class credentials
 private:
     friend class http::client::details::winhttp_client;
     friend class http::client::details::winrt_client;
+	friend class http::client::details::asio_context;
     friend class websockets::client::details::winrt_callback_client;
     friend class websockets::client::details::wspp_callback_client;
 

Release/include/cpprest/oauth1.h

@@ -28,6 +28,7 @@
 #define _CASA_OAUTH1_H
 
 #include "cpprest/http_msg.h"
+#include "cpprest/details/web_utilities.h"
 
 namespace web
 {
@@ -479,6 +480,24 @@ class oauth1_config
     /// </summary>
     void clear_parameters() { m_parameters_to_sign.clear(); }
 
+    /// <summary>
+    /// Get the web proxy object
+    /// </summary>
+    /// <returns>A reference to the web proxy object.</returns>
+    const web_proxy& proxy() const
+    {
+        return m_proxy;
+    }
+
+    /// <summary>
+    /// Set the web proxy object that will be used by token_from_code and token_from_refresh
+    /// </summary>
+    /// <param name="proxy">A reference to the web proxy object.</param>
+    void set_proxy(const web_proxy& proxy)
+    {
+        m_proxy = proxy;
+    }
+
 private:
     friend class web::http::client::http_client_config;
     friend class web::http::oauth1::details::oauth1_handler;
@@ -532,6 +551,8 @@ class oauth1_config
 
 	std::map<utility::string_t, utility::string_t> m_parameters_to_sign;
 
+    web::web_proxy m_proxy;
+
     utility::nonce_generator m_nonce_generator;
     bool m_is_authorization_completed;
 };

Release/include/cpprest/version.h

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

Release/libs/websocketpp/websocketpp/connection.hpp

@@ -161,7 +161,14 @@ typedef lib::function<void(lib::error_code const & ec)> write_frame_handler;
      * @todo Move this to configs to allow compile/runtime disabling or enabling
      * of protocol versions
      */
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4592)
+#endif
     static std::vector<int> const versions_supported = {0,7,8,13};
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 #else
     /// Helper array to get around lack of initializer lists pre C++11
     static int const helper[] = {0,7,8,13};
@@ -534,7 +541,7 @@ class connection
 
     /// Get maximum message size
     /**
-     * Get maximum message size. Maximum message size determines the point at 
+     * Get maximum message size. Maximum message size determines the point at
      * which the connection will fail with the message_too_big protocol error.
      *
      * The default is set by the endpoint that creates the connection.
@@ -544,11 +551,11 @@ class connection
     size_t get_max_message_size() const {
         return m_max_message_size;
     }
-    
+
     /// Set maximum message size
     /**
-     * Set maximum message size. Maximum message size determines the point at 
-     * which the connection will fail with the message_too_big protocol error. 
+     * Set maximum message size. Maximum message size determines the point at
+     * which the connection will fail with the message_too_big protocol error.
      * This value may be changed during the connection.
      *
      * The default is set by the endpoint that creates the connection.
@@ -563,7 +570,7 @@ class connection
             m_processor->set_max_message_size(new_value);
         }
     }
-    
+
     /// Get maximum HTTP message body size
     /**
      * Get maximum HTTP message body size. Maximum message body size determines
@@ -579,7 +586,7 @@ class connection
     size_t get_max_http_body_size() const {
         return m_request.get_max_body_size();
     }
-    
+
     /// Set maximum HTTP message body size
     /**
      * Set maximum HTTP message body size. Maximum message body size determines
@@ -683,14 +690,14 @@ class connection
      * @return An error code
      */
     lib::error_code interrupt();
-    
+
     /// Transport inturrupt callback
     void handle_interrupt();
-    
+
     /// Pause reading of new data
     /**
-     * Signals to the connection to halt reading of new data. While reading is paused, 
-     * the connection will stop reading from its associated socket. In turn this will 
+     * Signals to the connection to halt reading of new data. While reading is paused,
+     * the connection will stop reading from its associated socket. In turn this will
      * result in TCP based flow control kicking in and slowing data flow from the remote
      * endpoint.
      *
@@ -702,7 +709,7 @@ class connection
      *
      * If supported by the transport this is done asynchronously. As such reading may not
      * stop until the current read operation completes. Typically you can expect to
-     * receive no more bytes after initiating a read pause than the size of the read 
+     * receive no more bytes after initiating a read pause than the size of the read
      * buffer.
      *
      * If reading is paused for this connection already nothing is changed.
@@ -1357,7 +1364,7 @@ class connection
      * Includes: error code and message for why it was failed
      */
     void log_fail_result();
-    
+
     /// Prints information about HTTP connections
     /**
      * Includes: TODO
@@ -1506,7 +1513,7 @@ class connection
 
     /// Detailed internal error code
     lib::error_code m_ec;
-    
+
     /// A flag that gets set once it is determined that the connection is an
     /// HTTP connection and not a WebSocket one.
     bool m_is_http;

Release/src/CMakeLists.txt

@@ -53,7 +53,11 @@ if(UNIX)
   else()
     list(APPEND SOURCES pplx/pplxlinux.cpp)
   endif()
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS} -Werror -pedantic")
+
+  if(WERROR)
+      set(WARNINGS "${WARNINGS} -Werror")
+  endif()
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS} -pedantic")
 elseif(WIN32)
   set(SOURCES
     ${SOURCES_COMMON}
@@ -99,7 +103,7 @@ target_link_libraries(${Casablanca_LIBRARY}
 
 # Portions specific to cpprest binary versioning.
 set (CPPREST_VERSION_MAJOR 2)
-set (CPPREST_VERSION_MINOR 7)
+set (CPPREST_VERSION_MINOR 8)
 set (CPPREST_VERSION_REVISION 0)
 
 if(WIN32)

Release/src/build/init.ps1

@@ -5,7 +5,7 @@ function Copy-Natvis($DestFolder)
     if ((Test-Path $DestFolder) -eq $True)
     {
         # Update casablanca version for each release here.
-        $DestFile = Join-Path -path $DestFolder -childpath "cpprest2_7.natvis";
+        $DestFile = Join-Path -path $DestFolder -childpath "cpprest2_8.natvis";
 
         # Check to see if cpp rest natvis file for this version already exists
         # if not, then copy into user profile for Visual Studio to pick up

Release/src/dirs.proj

@@ -5,7 +5,6 @@
   <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
       <ProjectFile Include="build\vs12\casablanca120.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
       <ProjectFile Include="build\vs12.xp\casablanca120.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'" />
-      <ProjectFile Include="build\vs12.wod\casablanca120.wod.vcxproj" Condition="'$(Platform)'!='ARM'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
@@ -19,10 +18,9 @@
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
     <ProjectFile Include="build\vs14\casablanca140.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
-    <ProjectFile Include="build\vs14.wod\casablanca140.wod.vcxproj" Condition="'$(Platform)'!='ARM'" />
     <ProjectFile Include="build\vs14.android\casablanca140.android.vcxproj" Condition="'$(Platform)'!='x64'"/>
   </ItemGroup>
-  
+
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|140'">
       <ProjectFile Include="build\vs14.uwp\cpprestsdk140.uwp.vcxproj" />
   </ItemGroup>