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

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/Common.Build.settings

@@ -38,6 +38,7 @@
     <TargetsPath>$(BuildRoot)\Build</TargetsPath>
     <OsVersion>$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@CurrentVersion)</OsVersion>
     <!--If Dev11 and Dev12 are both installed, the default is to build Dev12. This can be overridden by setting the DevToolsVersion variable in powershell-->
+	<DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS140COMNTOOLS)' != ''">140</DevToolsVersion>
 	<DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS120COMNTOOLS)' != ''">120</DevToolsVersion>
     <DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS110COMNTOOLS)' != ''">110</DevToolsVersion>
     <!-- ARM tools are installed in $(FrameworkSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.desktop.arm.props -->

Build_iOS/configure.sh

@@ -1,16 +1,10 @@
 #!/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
+sed -e 's/\${IPHONE_SDKVERSION:=7.0}/\${IPHONE_SDKVERSION:=8.0}/' -i .bak boost.sh
+sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system date_time"}/g' -i .bak boost.sh
 ./boost.sh
 pushd ios/framework/boost.framework/Versions/A
 mkdir Headers2
@@ -19,6 +13,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

Release/CMakeLists.txt

@@ -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/include/compat/pplxtasks.h

@@ -60,66 +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 asychronous 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.
-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; }
+        static int_type requires_async() { return eof()-1; }
     };
+#endif
 
     namespace details {
 

Release/include/cpprest/astreambuf.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved. 
+* Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * http://www.apache.org/licenses/LICENSE-2.0
-* 
+*
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
-#else 
+#else
 #include "pplx/pplxtasks.h"
 #endif
 
@@ -250,11 +250,11 @@ namespace details
 class windows_category_impl : public std::error_category
 {
 public:
-    virtual const char *name() const { return "windows"; }
+    virtual const char *name() const _noexcept { return "windows"; }
 
-    _ASYNCRTIMP virtual std::string message(int errorCode) const;
+    _ASYNCRTIMP virtual std::string message(int errorCode) const _noexcept;
 
-    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const;
+    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _noexcept;
 };
 
 /// <summary>

Release/include/cpprest/asyncrt_utils.h

@@ -40,7 +40,7 @@
 #include <cstdint>
 #endif
 
-#include "compat/SafeInt3.hpp"
+#include "cpprest/details/SafeInt3.hpp"
 typedef SafeInt<size_t> SafeSize;
 
 namespace utility
@@ -99,3 +99,29 @@ typedef std::stringstream stringstream_t;
 #endif // !_TURN_OFF_PLATFORM_STRING
 
 }// namespace utility
+
+typedef char utf8char;
+typedef std::string utf8string;
+typedef std::stringstream utf8stringstream;
+typedef std::ostringstream utf8ostringstream;
+typedef std::ostream utf8ostream;
+typedef std::istream utf8istream;
+typedef std::istringstream utf8istringstream;
+
+#ifdef _UTF16_STRINGS
+typedef wchar_t utf16char;
+typedef std::wstring utf16string;
+typedef std::wstringstream utf16stringstream;
+typedef std::wostringstream utf16ostringstream;
+typedef std::wostream utf16ostream;
+typedef std::wistream utf16istream;
+typedef std::wistringstream utf16istringstream;
+#else
+typedef char16_t utf16char;
+typedef std::u16string utf16string;
+typedef std::basic_stringstream<utf16char> utf16stringstream;
+typedef std::basic_ostringstream<utf16char> utf16ostringstream;
+typedef std::basic_ostream<utf16char> utf16ostream;
+typedef std::basic_istream<utf16char> utf16istream;
+typedef std::basic_istringstream<utf16char> utf16istringstream;
+#endif

Release/include/cpprest/basic_types.h

@@ -325,9 +325,9 @@ namespace Concurrency { namespace streams {
         {
             pos_type beg(0);
 
-            // Inorder to support relative seeking from the end postion we need to fix an end position.
+            // In order to support relative seeking from the end position we need to fix an end position.
             // Technically, there is no end for the stream buffer as new writes would just expand the buffer.
-            // For now, we assume that the current write_end is the end of the buffer. We use this aritifical
+            // For now, we assume that the current write_end is the end of the buffer. We use this artificial
             // end to restrict the read head from seeking beyond what is available.
 
             pos_type end(m_size);