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

Conflicts:
	Release/include/compat/pplxtasks.h
	Release/include/cpprest/astreambuf.h
	Release/include/cpprest/details/windows_compat.h
	Release/include/cpprest/filestream.h
	Release/include/cpprest/streams.h
	Release/src/http/client/http_win7.cpp
	Release/src/http/client/http_win8.cpp
	Release/src/json/json.cpp

Author: stgates

.gitignore

@@ -44,3 +44,8 @@ obj/
 [Bb]in
 Binaries/
 Intermediate/
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+

Build/version.props

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

Build_iOS/CMakeLists.txt

@@ -35,7 +35,6 @@ execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
 add_custom_target(sim
   COMMAND ${CMAKE_COMMAND}
     --build ${SIM_BINARY_DIR}
-    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for i386 (simulator)"
   VERBATIM
@@ -45,7 +44,6 @@ add_custom_target(sim
 add_custom_target(arm
   COMMAND ${CMAKE_COMMAND}
     --build ${ARM_BINARY_DIR}
-    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for armv7, armv7s, arm64"
   VERBATIM

Build_iOS/configure.sh

@@ -1,16 +1,9 @@
 #!/bin/bash
 set -e
 
-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
 git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
 pushd boostoniphone
-sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system"}/g' -i .bak boost.sh
+git apply ../fix_boost_version.patch
 ./boost.sh
 pushd ios/framework/boost.framework/Versions/A
 mkdir Headers2
@@ -19,6 +12,15 @@ mv Headers2 Headers
 popd
 popd
 mv boostoniphone/ios/framework/boost.framework .
+
+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
+
 hg clone https://code.google.com/p/ios-cmake/
 mkdir build.ios
 pushd build.ios

Build_iOS/fix_boost_version.patch

@@ -0,0 +1,36 @@
+From e5b3bf1392d3dc04f1391c4ad60118a394b5219f Mon Sep 17 00:00:00 2001
+From: Steve Gates <[email protected]>
+Date: Thu, 30 Oct 2014 17:42:43 -0700
+Subject: [PATCH] Fixing boost.sh to use Boost version 1.56 and iOS 8.0.
+
+---
+ boost.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/boost.sh b/boost.sh
+index 8847aac..2a76aec 100755
+--- a/boost.sh
++++ b/boost.sh
+@@ -18,8 +18,8 @@
+ # same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
+ #===============================================================================
+ 
+-: ${BOOST_LIBS:="filesystem date_time system"}
+-: ${IPHONE_SDKVERSION:=7.0}
++: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
++: ${IPHONE_SDKVERSION:=8.0}
+ : ${OSX_SDKVERSION:=10.9}
+ : ${XCODE_ROOT:=`xcode-select -print-path`}
+ : ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
+@@ -84,7 +84,7 @@ updateBoost()
+ 	then
+ 		git checkout $BOOST_SRC/tools/build/v2/user-config.jam
+ 	else
+-		git clone --recursive https://github.com/boostorg/boost.git $BOOST_SRC
++		git clone --recursive --branch boost-1.56.0 https://github.com/boostorg/boost.git $BOOST_SRC
+ 		pushd $BOOST_SRC
+ 		./bootstrap.sh
+ 		./b2 headers
+-- 
+1.9.3 (Apple Git-50)
+

Build_iOS/ios_cmake_clang3.patch

@@ -71,6 +71,15 @@ elseif(UNIX) # This includes OSX
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)
   option(BUILD_SAMPLES "Build samples." ON)
+  option(CASA_INSTALL_HEADERS "Install header files." ON)
+  if(CASA_INSTALL_HEADERS)
+    file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h)
+    install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
+    file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
+    install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
+    file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h)
+    install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
+  endif()
 elseif(WIN32)
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)
@@ -169,4 +178,3 @@ endif()
 if(BUILD_SAMPLES)
   add_subdirectory(samples)
 endif()
-

Release/CMakeLists.txt

@@ -60,47 +60,64 @@ namespace concurrency = Concurrency;
 #pragma warning(disable : 4718)
 #endif
 
-#ifndef _MS_WINDOWS
-// TFS 579628 - 1206: figure out how to avoid having this specialization for Linux (beware of 64-bit Linux)
-namespace std {
+namespace Concurrency
+{
+/// Library for asynchronous streams.
+namespace streams
+{
+    /// <summary>
+    /// Extending the standard char_traits type with one that adds values and types
+    /// that are unique to "C++ REST SDK" streams.
+    /// </summary>
+    /// <typeparam name="_CharType">
+    /// The data type of the basic element of the stream.
+    /// </typeparam>
+    template<typename _CharType>
+    struct char_traits : std::char_traits<_CharType>
+    {
+        /// <summary>
+        /// Some synchronous functions will return this value if the operation
+        /// requires an asynchronous call in a given situation.
+        /// </summary>
+        /// <returns>An <c>int_type</c> value which implies that an asynchronous call is required.</returns>
+        static typename std::char_traits<_CharType>::int_type requires_async() { return std::char_traits<_CharType>::eof()-1; }
+    };
+#if !defined(_MS_WINDOWS)
     template<>
-    struct char_traits<unsigned char> : private char_traits<char>
+    struct char_traits<unsigned char> : private std::char_traits<char>
     {
     public:
         typedef unsigned char char_type;
 
-        using char_traits<char>::eof;
-        using char_traits<char>::int_type;
-        using char_traits<char>::off_type;
-        using char_traits<char>::pos_type;
+        using std::char_traits<char>::eof;
+        using std::char_traits<char>::int_type;
+        using std::char_traits<char>::off_type;
+        using std::char_traits<char>::pos_type;
 
         static size_t length(const unsigned char* str)
         {
-            return char_traits<char>::length(reinterpret_cast<const char*>(str));
+            return std::char_traits<char>::length(reinterpret_cast<const char*>(str));
         }
 
         static void assign(unsigned char& left, const unsigned char& right) { left = right; }
         static unsigned char* assign(unsigned char* left, size_t n, unsigned char value)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::assign(reinterpret_cast<char*>(left), n, static_cast<char>(value)));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::assign(reinterpret_cast<char*>(left), n, static_cast<char>(value)));
         }
 
         static unsigned char* copy(unsigned char* left, const unsigned char* right, size_t n)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::copy(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::copy(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
         }
 
         static unsigned char* move(unsigned char* left, const unsigned char* right, size_t n)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
         }
-    };
-}
-#endif // _MS_WINDOWS
 
 namespace Concurrency
 {
-/// Library for asychronous streams.
+/// Library for asynchronous streams.
 namespace streams
 {
     /// <summary>
@@ -120,6 +137,7 @@ namespace streams
         /// <returns>An <c>int_type</c> value which implies that an asynchronous call is required.</returns>
         static typename std::char_traits<_CharType>::int_type requires_async() { return std::char_traits<_CharType>::eof()-1; }
     };
+#endif
 
     namespace details {
 
@@ -424,7 +442,7 @@ namespace streams
             }
 
             // After the flush_internal task completed, "this" object may have been destroyed,
-            // accessing the memebers is invalid, use shared_from_this to avoid access violation exception.
+            // accessing the members is invalid, use shared_from_this to avoid access violation exception.
             auto this_ptr = std::static_pointer_cast<streambuf_state_manager>(this->shared_from_this());
 
             if (mode & std::ios_base::out && can_write()) {

Release/include/compat/pplxtasks.h

@@ -250,11 +250,11 @@ namespace details
 class windows_category_impl : public std::error_category
 {
 public:
-    virtual const char *name() const _noexcept { return "windows"; }
+    virtual const char *name() const CPPREST_NOEXCEPT { return "windows"; }
 
-    _ASYNCRTIMP virtual std::string message(int errorCode) const _noexcept;
+    _ASYNCRTIMP virtual std::string message(int errorCode) const CPPREST_NOEXCEPT;
 
-    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _noexcept;
+    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const CPPREST_NOEXCEPT;
 };
 
 /// <summary>