Merge branch 'development' of https://github.com/Microsoft/cpprestsdk into development

Author: kavyako

Build_iOS/README.md

@@ -1,3 +1 @@
-Please consult the codeplex documentation for iOS compilation:
-
-[](https://casablanca.codeplex.com/wikipage?title=Setup%20and%20Build%20on%20IOS)
+Please consult the documentation [here](https://github.com/Microsoft/cpprestsdk/wiki/How-to-build-for-iOS) for iOS compilation.

Build_iOS/fix_boost_building_script.patch

@@ -0,0 +1,13 @@
+diff --git a/boost.sh b/boost.sh
+index 2d5c05d..5c10ee9 100644
+--- a/boost.sh
++++ b/boost.sh
+@@ -26,7 +26,7 @@
+ #
+ #===============================================================================
+ 
+-BOOST_LIBS="atomic chrono date_time exception filesystem program_options random signals system test thread"
++BOOST_LIBS="chrono filesystem random regex system thread"
+ 
+ BUILD_IOS=
+ BUILD_OSX=

Build_iOS/fix_boost_version.patch

@@ -1,13 +1,16 @@
 diff --git a/toolchain/iOS.cmake b/toolchain/iOS.cmake
-index 076a6b9..2e3291a 100644
+index 195e3fc..567a8d3 100644
 --- a/toolchain/iOS.cmake
 +++ b/toolchain/iOS.cmake
-@@ -47,8 +47,8 @@ endif (CMAKE_UNAME)
+@@ -45,10 +45,10 @@ if (CMAKE_UNAME)
+ 	string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+ endif (CMAKE_UNAME)
 
- # Force the compilers to gcc for iOS
+-# Force the compilers to gcc for iOS
++# Force the compilers to clang for iOS
  include (CMakeForceCompiler)
--CMAKE_FORCE_C_COMPILER (clang Apple)
--CMAKE_FORCE_CXX_COMPILER (clang++ Apple)
+-CMAKE_FORCE_C_COMPILER (/usr/bin/gcc Apple)
+-CMAKE_FORCE_CXX_COMPILER (/usr/bin/g++ Apple)
 +CMAKE_FORCE_C_COMPILER (/usr/bin/clang Apple)
 +CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++ Apple)
  set(CMAKE_AR ar CACHE FILEPATH "" FORCE)

Build_iOS/fix_ios_cmake_compiler.patch

@@ -22,9 +22,15 @@ adish
 LeonidCSIT
 LocutusOfBorg
 kreuzerkrieg
+evanc
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)
 
 Illumina Inc.
 Gery Vessere ([email protected])
+
+Cisco Systems
+Gergely Lukacsy (glukacsy)
+
+thomasschaub

CONTRIBUTORS.txt

@@ -0,0 +1,32 @@
+## Welcome!
+
+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.  
+
+## Getting Started
+
+Are you new to the C++ Rest SDK? To get going we recommend you start by taking a look at our [tutorial](https://github.com/Microsoft/cpprestsdk/wiki/Getting-Started-Tutorial) to use the http_client. It walks through how to setup a project to use the C++ Rest SDK and make a basic Http request. Other important information, like how to build the C++ Rest SDK from source, can be located on the [documentation](https://github.com/Microsoft/cpprestsdk/wiki) page.  
+
+## What's in the SDK:
+
+*   Features - HTTP client/server, JSON, URI, asynchronous streams, WebSockets client, oAuth
+*   PPL Tasks - A powerful model for composing asynchronous operations based on C++ 11 features
+*   Platforms - Windows desktop, Windows Store, Windows Phone, Ubuntu, OS X, iOS, and Android
+*   Support for Visual Studio 2012, 2013, and 2015 with debugger visualizers
+*   NuGet package with binaries for Windows and Android platforms
+
+## Contribute Back!
+
+Is there a feature missing that you'd like to see, or found a bug that you have a fix for? Or do you have an idea or just interest in helping out in building the library? Let us know and we'd love to work with you. For a good starting point on where we are headed and feature ideas, take a look at our [requested features and bugs](https://github.com/Microsoft/cpprestsdk/issues).  
+
+Big or small we'd like to take your [contributions](https://github.com/Microsoft/cpprestsdk/wiki/Make-a-contribution-and-report-issues) back to help improve the C++ Rest SDK for everyone. If interested contact us askcasablanca at Microsoft dot com.  
+
+## Having Trouble?
+
+We'd love to get your review score, whether good or bad, but even more than that, we want to fix your problem. If you submit your issue as a Review, we won't be able to respond to your problem and ask any follow-up questions that may be necessary. The most efficient way to do that is to open a an issue in our [issue tracker](https://github.com/Microsoft/cpprestsdk/issues).  
+
+### Quick Links
+
+*   [FAQ](https://github.com/Microsoft/cpprestsdk/wiki/FAQ)
+*   [Documentation](https://github.com/Microsoft/cpprestsdk/wiki)
+*   [Issue Tracker](https://github.com/Microsoft/cpprestsdk/issues)
+*   Directly contact us: <[email protected]>

README.md

@@ -174,9 +174,9 @@ if(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
   include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
   include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
   message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
-  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
 else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
-  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
   message("-- websocketpp not found, using the embedded version")
 endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
 

Release/CMakeLists.txt

@@ -446,6 +446,24 @@ class oauth2_config
     /// Default: "access_token".
     /// </summary>
     void set_access_token_key(utility::string_t access_token_key) { m_access_token_key = std::move(access_token_key); }
+	
+	/// <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;
@@ -483,6 +501,8 @@ class oauth2_config
     utility::string_t m_scope;
     utility::string_t m_state;
 
+	web::web_proxy m_proxy;
+
     bool m_implicit_grant;
     bool m_bearer_auth;
     bool m_http_basic_auth;

Release/include/cpprest/oauth2.h

@@ -673,7 +673,7 @@ namespace Concurrency { namespace streams
             if ( !_verify_and_return_task(details::_in_stream_msg, result) ) return result;
 
             auto copy = std::make_shared<T>();
-            return helper()->m_buffer.getn((CharType*)copy.get(), sizeof(T)).then([copy](pplx::task<size_t> op) -> T
+            return helper()->m_buffer.getn((CharType*)copy.get(), sizeof(T)).then([copy](pplx::task<size_t>) -> T
             {
                 return std::move(*copy);
             });

Release/include/cpprest/streams.h

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