Merge from TFS 1254697

Author: ras0219-msft

Release/include/cpprest/fileio.h

@@ -40,7 +40,7 @@ namespace pplx = Concurrency;
 
 #include "cpprest/xxpublic.h"
 
-#ifdef WIN32
+#ifdef _MS_WINDOWS
 #include <cstdint>
 #endif
 

Release/include/cpprest/http_client.h

@@ -66,10 +66,11 @@ namespace http
 namespace client
 {
 
-// credentials class has been moved from web::http::client namespace to web namespace.
+// credentials and web_proxy class has been moved from web::http::client namespace to web namespace.
 // The below using declarations ensure we dont break existing code.
-// Please use the web::credentials class going forward.
+// Please use the web::credentials and web::web_proxy class going forward.
 using web::credentials;
+using web::web_proxy;
 
 #ifdef _MS_WINDOWS
 namespace details {
@@ -81,87 +82,6 @@ namespace details {
 }  
 #endif // _MS_WINDOWS
 
-/// <summary>
-/// web_proxy represents the concept of the web proxy, which can be auto-discovered,
-/// disabled, or specified explicitly by the user
-/// </summary>
-class web_proxy
-{
-    enum web_proxy_mode_internal{ use_default_, use_auto_discovery_, disabled_, user_provided_ };
-public:
-    enum web_proxy_mode{ use_default = use_default_, use_auto_discovery = use_auto_discovery_, disabled  = disabled_};
-
-    /// <summary>
-    /// Constructs a proxy with the default settings.
-    /// </summary>
-    web_proxy() : m_address(_XPLATSTR("")), m_mode(use_default_) {}
-    
-    /// <summary>
-    /// Creates a proxy with specified mode.
-    /// </summary>
-    /// <param name="mode">Mode to use.</param>
-    web_proxy( web_proxy_mode mode ) : m_address(_XPLATSTR("")), m_mode(static_cast<web_proxy_mode_internal>(mode)) {}
-    
-    /// <summary>
-    /// Creates a proxy explicitly with provided address.
-    /// </summary>
-    /// <param name="address">Proxy URI to use.</param>
-    web_proxy( http::uri address ) : m_address(address), m_mode(user_provided_) {}
-
-    /// <summary>
-    /// Gets this proxy's URI address. Returns an empty URI if not explicitly set by user.
-    /// </summary>
-    /// <returns>A reference to this proxy's URI.</returns>
-    const http::uri& address() const { return m_address; }
-
-    /// <summary>
-    /// Gets the credentials used for authentication with this proxy.
-    /// </summary>
-    /// <returns>Credentials to for this proxy.</returns>
-    const http::client::credentials& credentials() const { return m_credentials; }
-    
-    /// <summary>
-    /// Sets the credentials to use for authentication with this proxy.
-    /// </summary>
-    /// <param name="cred">Credentials to use for this proxy.</param>
-    void set_credentials(http::client::credentials cred) {
-        if( m_mode == disabled_ )
-        {
-            throw std::invalid_argument("Cannot attach credentials to a disabled proxy");
-        }
-        m_credentials = std::move(cred);
-    }
-
-    /// <summary>
-    /// Checks if this proxy was constructed with default settings.
-    /// </summary>
-    /// <returns>True if default, false otherwise.</param>
-    bool is_default() const { return m_mode == use_default_; }
-
-    /// <summary>
-    /// Checks if using a proxy is disabled.
-    /// </summary>
-    /// <returns>True if disabled, false otherwise.</returns>
-    bool is_disabled() const { return m_mode == disabled_; }
-
-    /// <summary>
-    /// Checks if the auto discovery protocol, WPAD, is to be used.
-    /// </summary>
-    /// <returns>True if auto discovery enabled, false otherwise.</returns>
-    bool is_auto_discovery() const { return m_mode == use_auto_discovery_; }
-    
-    /// <summary>
-    /// Checks if a proxy address is explicitly specified by the user.
-    /// </summary>
-    /// <returns>True if a proxy address was explicitly specified, false otherwise.</returns> 
-    bool is_specified() const { return m_mode == user_provided_; }
-
-private:
-    http::uri m_address;
-    web_proxy_mode_internal m_mode;
-    http::client::credentials m_credentials;
-};
-
 /// <summary>
 /// HTTP client configuration class, used to set the possible configuration options
 /// used to create an http_client instance.

Release/include/cpprest/http_msg.h

@@ -47,6 +47,10 @@ namespace pplx = Concurrency;
 #include "cpprest/streams.h"
 #include "cpprest/containerstream.h"
 
+#ifndef _MS_WINDOWS
+#include <boost/algorithm/string/predicate.hpp>
+#endif
+
 namespace web {
 
 /// <summary>

Release/include/cpprest/targetver.h

@@ -31,7 +31,7 @@
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifdef CPPREST_TARGET_XP
 #include <winsdkver.h>
 #ifndef _WIN32_WINNT

Release/include/cpprest/web_utilities.h

@@ -32,8 +32,8 @@
 
 namespace web
 {
-namespace http { namespace client {
     class web_proxy;
+namespace http { namespace client {
     class http_client_config;
 }}
 
@@ -73,7 +73,7 @@ class credentials
     bool is_set() const { return m_is_set; }
 
 private:
-    friend class web::http::client::web_proxy;
+    friend class web::web_proxy;
     friend class web::http::client::http_client_config;
     friend class web::experimental::web_sockets::client::websocket_client_config;
 
@@ -83,6 +83,88 @@ class credentials
     utility::string_t m_password;
     bool m_is_set;
 };
+
+/// <summary>
+/// web_proxy represents the concept of the web proxy, which can be auto-discovered,
+/// disabled, or specified explicitly by the user
+/// </summary>
+class web_proxy
+{
+    enum web_proxy_mode_internal{ use_default_, use_auto_discovery_, disabled_, user_provided_ };
+public:
+    enum web_proxy_mode{ use_default = use_default_, use_auto_discovery = use_auto_discovery_, disabled  = disabled_};
+
+    /// <summary>
+    /// Constructs a proxy with the default settings.
+    /// </summary>
+    web_proxy() : m_address(_XPLATSTR("")), m_mode(use_default_) {}
+    
+    /// <summary>
+    /// Creates a proxy with specified mode.
+    /// </summary>
+    /// <param name="mode">Mode to use.</param>
+    web_proxy( web_proxy_mode mode ) : m_address(_XPLATSTR("")), m_mode(static_cast<web_proxy_mode_internal>(mode)) {}
+    
+    /// <summary>
+    /// Creates a proxy explicitly with provided address.
+    /// </summary>
+    /// <param name="address">Proxy URI to use.</param>
+    web_proxy( uri address ) : m_address(address), m_mode(user_provided_) {}
+
+    /// <summary>
+    /// Gets this proxy's URI address. Returns an empty URI if not explicitly set by user.
+    /// </summary>
+    /// <returns>A reference to this proxy's URI.</returns>
+    const uri& address() const { return m_address; }
+
+    /// <summary>
+    /// Gets the credentials used for authentication with this proxy.
+    /// </summary>
+    /// <returns>Credentials to for this proxy.</returns>
+    const credentials& credentials() const { return m_credentials; }
+    
+    /// <summary>
+    /// Sets the credentials to use for authentication with this proxy.
+    /// </summary>
+    /// <param name="cred">Credentials to use for this proxy.</param>
+    void set_credentials(web::credentials cred) {
+        if( m_mode == disabled_ )
+        {
+            throw std::invalid_argument("Cannot attach credentials to a disabled proxy");
+        }
+        m_credentials = std::move(cred);
+    }
+
+    /// <summary>
+    /// Checks if this proxy was constructed with default settings.
+    /// </summary>
+    /// <returns>True if default, false otherwise.</param>
+    bool is_default() const { return m_mode == use_default_; }
+
+    /// <summary>
+    /// Checks if using a proxy is disabled.
+    /// </summary>
+    /// <returns>True if disabled, false otherwise.</returns>
+    bool is_disabled() const { return m_mode == disabled_; }
+
+    /// <summary>
+    /// Checks if the auto discovery protocol, WPAD, is to be used.
+    /// </summary>
+    /// <returns>True if auto discovery enabled, false otherwise.</returns>
+    bool is_auto_discovery() const { return m_mode == use_auto_discovery_; }
+    
+    /// <summary>
+    /// Checks if a proxy address is explicitly specified by the user.
+    /// </summary>
+    /// <returns>True if a proxy address was explicitly specified, false otherwise.</returns> 
+    bool is_specified() const { return m_mode == user_provided_; }
+
+private:
+    uri m_address;
+    web_proxy_mode_internal m_mode;
+    web::credentials m_credentials;
+};
+
 }
 
 #endif

Release/include/cpprest/ws_client.h

@@ -82,6 +82,24 @@ class websocket_client_config
     websocket_client_config()
     {}
 
+    /// <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
+    /// </summary>
+    /// <param name="proxy">The web proxy object.</param>
+    void set_proxy(web_proxy proxy)
+    {
+        m_proxy = std::move(proxy);
+    }
+
     /// <summary>
     /// Get the client credentials
     /// </summary>
@@ -116,6 +134,7 @@ class websocket_client_config
     const web::http::http_headers &headers() const { return m_headers; }
 
 private:
+    web::web_proxy m_proxy;
     web::credentials m_credentials;
     web::http::http_headers m_headers;
 };

Release/include/cpprest/ws_msg.h

@@ -84,24 +84,14 @@ class _websocket_message
     _ASYNCRTIMP void set_body(concurrency::streams::istream instream);
 
     /// <summary>
-    /// Set the stream through which the message body could be read
+    /// Get the streambuf for the message
     /// </summary>
-    void set_instream(concurrency::streams::istream instream)  { m_inStream = instream; }
+    concurrency::streams::streambuf<uint8_t>& streambuf() { return m_buf; }
 
     /// <summary>
-    /// Get the stream through which the message body could be read
+    /// Set the streambuf for the message
     /// </summary>
-    concurrency::streams::istream instream() const { return m_inStream; }
-
-    /// <summary>
-    /// Set the stream through which the message body could be written
-    /// </summary>
-    void set_outstream(concurrency::streams::ostream outstream)  { m_outStream = outstream;  }
-
-    /// <summary>
-    /// Get the stream through which the message body could be written
-    /// </summary>
-    concurrency::streams::ostream outstream() const { return m_outStream; }
+    void set_streambuf(concurrency::streams::streambuf<uint8_t> buf) { m_buf = buf; }
 
     void set_msg_type(websocket_message_type msg_type) { m_msg_type = msg_type; }
 
@@ -124,15 +114,7 @@ class _websocket_message
 
 protected:
 
-    /// <summary>
-    /// Stream to read the message body.
-    /// </summary>
-    concurrency::streams::istream m_inStream;
-
-    /// <summary>
-    /// Stream to write the message body.
-    /// </summary>
-    concurrency::streams::ostream m_outStream;
+    concurrency::streams::streambuf<uint8_t> m_buf;
 
     websocket_message_type m_msg_type;
 
@@ -254,7 +236,7 @@ class websocket_incoming_message
     /// </remarks>
     concurrency::streams::istream body() const
     {
-        return _m_impl->instream();
+        return _m_impl->streambuf().create_istream();
     }
 
     /// <summary>

Release/include/cpprest/xxpublic.h

@@ -29,7 +29,7 @@
 #pragma once
 
 #ifndef _MS_WINDOWS
-#if defined(WIN32) || defined(__cplusplus_winrt)
+#if defined(_WIN32) || defined(__cplusplus_winrt)
 #define _MS_WINDOWS
 #endif
 #endif // _MS_WINDOWS

Release/include/pplx/pplx.h

@@ -35,7 +35,7 @@
 #endif
 
 #ifndef _MS_WINDOWS
-#if defined(WIN32) || defined(__cplusplus_winrt)
+#if defined(_WIN32) || defined(__cplusplus_winrt)
 #define _MS_WINDOWS
 #endif
 #endif // _MS_WINDOWS

Release/samples/BingRequest/BingRequest110/BingRequest110.vcxproj

@@ -76,7 +76,17 @@
 	<PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
+
+  <!-- Normally these settings would be include by Release.Product.Settings,
+       however they aren't to cover the case of a project without WIN32 defined -->
+  <PropertyGroup>
+    <BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot> 
+    <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
+    <OutDir>$(OutputPath)</OutDir>
+    <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
+    <CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
+  </PropertyGroup>
+  
   <ImportGroup Label="ExtensionSettings" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>