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

Conflicts:
	Release/include/cpprest/http_msg.h

Author: stgates

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 -->

Release/include/cpprest/asyncrt_utils.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/fileio.h

@@ -34,7 +34,28 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
-#else 
+#if (_MSC_VER >= 1900)
+#include <concrt.h>
+#ifndef DEV14_EXTENSIBILITY_WRKRND
+#define DEV14_EXTENSIBILITY_WRKRND
+namespace Concurrency {
+    namespace extensibility {
+        typedef ::std::condition_variable condition_variable_t;
+        typedef ::std::mutex critical_section_t;
+        typedef ::std::unique_lock< ::std::mutex> scoped_critical_section_t;
+
+        typedef ::Concurrency::event event_t;
+        typedef ::Concurrency::reader_writer_lock reader_writer_lock_t;
+        typedef ::Concurrency::reader_writer_lock::scoped_lock scoped_rw_lock_t;
+        typedef ::Concurrency::reader_writer_lock::scoped_lock_read scoped_read_lock_t;
+
+        typedef ::Concurrency::details::_ReentrantBlockingLock recursive_lock_t;
+        typedef recursive_lock_t::_Scoped_lock scoped_recursive_lock_t;
+    }
+}
+#endif // DEV14_EXTENSIBILITY_WRKRND
+#endif // _MSC_VER >= 1900
+#else // _MSC_VER
 #include "pplx/pplxtasks.h"
 #endif
 

Release/include/cpprest/http_msg.h

@@ -35,6 +35,24 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
+#if (_MSC_VER >= 1900)
+#include <concrt.h>
+#ifndef DEV14_EXTENSIBILITY_WRKRND
+#define DEV14_EXTENSIBILITY_WRKRND
+namespace pplx = Concurrency;
+namespace Concurrency {
+    namespace extensibility {
+        typedef ::Concurrency::event event_t;
+        typedef ::Concurrency::reader_writer_lock reader_writer_lock_t;
+        typedef ::Concurrency::reader_writer_lock::scoped_lock scoped_rw_lock_t;
+        typedef ::Concurrency::reader_writer_lock::scoped_lock_read scoped_read_lock_t;
+
+        typedef ::Concurrency::details::_ReentrantBlockingLock recursive_lock_t;
+        typedef recursive_lock_t::_Scoped_lock scoped_recursive_lock_t;
+    }
+}
+#endif // DEV14_EXTENSIBILITY_WRKRND
+#endif // _MSC_VER >= 1900
 #else
 #include "pplx/pplxtasks.h"
 #endif

Release/include/cpprest/streams.h

@@ -492,10 +492,10 @@ namespace Concurrency { namespace streams
         static pplx::task<void> _skip_whitespace(streams::streambuf<CharType> buffer);
 
         // Aid in parsing input: peek at a character at a time, call type-specific code to examine, extract value when done.
-        template<typename _ParseState, typename _ReturnType>
-        static pplx::task<_ReturnType> _parse_input(streams::streambuf<CharType> buffer,
-                                                    std::function<bool(std::shared_ptr<_ParseState>, int_type)> accept_character, 
-                                                    std::function<pplx::task<_ReturnType>(std::shared_ptr<_ParseState>)> extract);
+        // <remark>AcceptFunctor should model std::function<bool(std::shared_ptr<X>, int_type)></remark>
+        // <remark>ExtractFunctor should model std::function<pplx::task<ReturnType>(std::shared_ptr<X>)></remark>
+        template<typename StateType, typename ReturnType, typename AcceptFunctor, typename ExtractFunctor>
+        static pplx::task<ReturnType> _parse_input(streams::streambuf<CharType> buffer, AcceptFunctor accept_character, ExtractFunctor extract);
     };
 
     /// <summary>
@@ -1176,13 +1176,13 @@ pplx::task<void> concurrency::streams::_type_parser_base<CharType>::_skip_whites
 }
 
 template<typename CharType>
-template<typename _ParseState, typename _ReturnType>
-pplx::task<_ReturnType> concurrency::streams::_type_parser_base<CharType>::_parse_input(
+template<typename StateType, typename ReturnType, typename AcceptFunctor, typename ExtractFunctor>
+pplx::task<ReturnType> concurrency::streams::_type_parser_base<CharType>::_parse_input(
     concurrency::streams::streambuf<CharType> buffer,
-    std::function<bool(std::shared_ptr<_ParseState>, int_type)> accept_character, 
-    std::function<pplx::task<_ReturnType>(std::shared_ptr<_ParseState>)> extract)
+    AcceptFunctor accept_character,
+    ExtractFunctor extract)
 {
-    std::shared_ptr<_ParseState> state = std::make_shared<_ParseState>();
+    std::shared_ptr<StateType> state = std::make_shared<StateType>();
 
     auto update_end = [=] (pplx::task<int_type> op) -> bool { op.wait(); return true; };
 
@@ -1219,14 +1219,14 @@ pplx::task<_ReturnType> concurrency::streams::_type_parser_base<CharType>::_pars
     };
 
     auto finish = 
-        [=](pplx::task<bool> op) -> pplx::task<_ReturnType>
+        [=](pplx::task<bool> op) -> pplx::task<ReturnType>
         { 
             op.wait();
-            pplx::task<_ReturnType> result = extract(state);
+            pplx::task<ReturnType> result = extract(state);
             return result; 
         };
 
-    return _skip_whitespace(buffer).then([=](pplx::task<void> op) -> pplx::task<_ReturnType>
+    return _skip_whitespace(buffer).then([=](pplx::task<void> op) -> pplx::task<ReturnType>
         {
             op.wait();
 

Release/include/cpprest/x509_cert_utilities.h

@@ -1,7 +1,7 @@
 /***
 * ==++==
 *
-* 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
@@ -18,7 +18,7 @@
 *
 * x509_cert_utilities.h
 *
-* Contains utility functions for helping to verify server certificates in OS X/iOS.
+* Contains utility functions for helping to verify server certificates in OS X/iOS and Android.
 *
 * For the latest on this and related APIs, please see http://casablanca.codeplex.com.
 *
@@ -30,8 +30,23 @@
 #include <vector>
 #include <string>
 
+#if defined(__APPLE__) || defined(ANDROID)
+
+#include <boost/asio/ssl.hpp>
+
 namespace web { namespace http { namespace client { namespace details {
 
+/// <summary>
+/// Using platform specific APIs verifies server certificate.
+/// Currently implemented to work on iOS, Android, and OS X.
+/// </summary>
+/// <param name="verifyCtx">Boost.ASIO context get certificate chain from.</param>
+/// <param name="hostName">Host name from the URI.</param>
+/// <returns>True if verification passed and server can be trusted, false otherwise.</returns>
+bool verify_cert_chain_platform_specific(boost::asio::ssl::verify_context &verifyCtx, const std::string &hostName);
+
 bool verify_X509_cert_chain(const std::vector<std::string> &certChain, const std::string &hostName);
 
 }}}}
+
+#endif

Release/include/pplx/ioscheduler.h

@@ -149,7 +149,7 @@ class io_scheduler
     /// <summary>
     /// Get the I/O completion key to use with the scheduler.
     /// </summary>
-    DWORD get_key() const { return (((DWORD)this) & 0xFAFAFA00) + sizeof(EXTENDED_OVERLAPPED); }
+    DWORD get_key() const { return (static_cast<DWORD>((uintptr_t)this) & 0xFAFAFA00) + sizeof(EXTENDED_OVERLAPPED); }
 
     /// <summary>
     /// Get the I/O scheduler instance.

Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj

@@ -125,7 +125,7 @@
     <ClCompile Include="..\bingrequest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CasablancaSrcDir)\build\casablanca110.xp.vcxproj">
+    <ProjectReference Include="$(CasablancaSrcDir)\build\vs11.xp\casablanca110.xp.vcxproj">
       <Project>{4D9ED383-673B-4E48-A6AF-6BD9F108150E}</Project>
     </ProjectReference>
   </ItemGroup>

Release/samples/BingRequest/BingRequest110/BingRequest110.vcxproj

@@ -185,7 +185,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CasablancaSrcDir)\build\casablanca110.vcxproj">
+    <ProjectReference Include="$(CasablancaSrcDir)\build\vs11\casablanca110.vcxproj">
       <Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
     </ProjectReference>
   </ItemGroup>

Release/samples/BingRequest/BingRequest120.xp/BingRequest120.xp.vcxproj

@@ -125,7 +125,7 @@
     <ClCompile Include="..\bingrequest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CasablancaSrcDir)\build\casablanca120.xp.vcxproj">
+    <ProjectReference Include="$(CasablancaSrcDir)\build\vs12.xp\casablanca120.xp.vcxproj">
       <Project>{15f3b200-1aed-4b57-af37-b21cd67914b1}</Project>
     </ProjectReference>
   </ItemGroup>