wip

Author: ras0219-msft

Release/CMakeLists.txt

@@ -75,7 +75,7 @@ elseif(ANDROID)
   option(BUILD_SHARED_LIBS "Build shared Libraries." OFF)
   set(BUILD_SAMPLES OFF)
 elseif(UNIX) # This includes OSX
-  find_package(Boost 1.54 REQUIRED COMPONENTS random chrono system thread regex filesystem)
+  find_package(Boost REQUIRED COMPONENTS random chrono system thread regex filesystem)
   find_package(Threads REQUIRED)
   if(APPLE AND NOT OPENSSL_ROOT_DIR)
     # Prefer a homebrew version of OpenSSL over the one in /usr/lib
@@ -88,6 +88,18 @@ elseif(UNIX) # This includes OSX
   find_package(OpenSSL 1.0.0 REQUIRED)
 
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
+
+  # Prefer the homebrew version of zlib
+  find_library(ZLIB_LIBRARIES NAMES libz.a PATHS /usr/local/Cellar/zlib/1.2.8/lib NO_DEFAULT_PATH)
+  find_path(ZLIB_INCLUDE_DIRS NAMES zlib.h PATHS /usr/local/Cellar/zlib/1.2.8/include NO_DEFAULT_PATH)
+
+  if(NOT ZLIB_LIBRARIES OR NOT ZLIB_INCLUDE_DIRS)
+    find_package(ZLIB)
+      if(NOT ZLIB_FOUND)
+        option(CPPREST_EXCLUDE_COMPRESSION "Exclude compression functionality." ON)
+      endif()
+  endif()
+
   option(BUILD_SAMPLES "Build samples." ON)
   option(CASA_INSTALL_HEADERS "Install header files." ON)
   if(CASA_INSTALL_HEADERS)
@@ -198,6 +210,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set(Casablanca_SYSTEM_INCLUDE_DIRS)
 if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
   find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
                         HINTS /usr/lib/cmake/websocketpp)
@@ -207,15 +220,15 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
     include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
     include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
     message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
-    set(Casablanca_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
+    list(APPEND Casablanca_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
   else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
-    set(Casablanca_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+    list(APPEND Casablanca_SYSTEM_INCLUDE_DIRS ${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)
 endif()
 
 set(Casablanca_LIBRARY cpprest)
-set(Casablanca_LIBRARIES cpprest ${Boost_LIBRARIES})
+set(Casablanca_LIBRARIES cpprest ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
 set(Casablanca_LIBRARIES ${Casablanca_LIBRARIES} PARENT_SCOPE)
 
 # Everything in the project needs access to the casablanca include directories

Release/include/cpprest/details/http_helpers.h

@@ -29,6 +29,18 @@
 
 #include "cpprest/details/basic_types.h"
 
+#if __APPLE__
+     #include "TargetConditionals.h"
+#endif
+
+// CPPREST_EXCLUDE_COMPRESSION is set if we're on a platform that supports compression but we want to explicitly disable it.
+// CPPREST_EXCLUDE_WEBSOCKETS is a flag that now essentially means "no external dependencies". TODO: Rename
+#if (defined(_WIN32) || defined(TARGET_OS_MAC)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS) && !defined(CPPREST_EXCLUDE_COMPRESSION)
+#define CPPREST_HTTP_COMPRESSION
+#endif
+
+#include "cpprest/http_msg.h"
+
 namespace web { namespace http
 {
 namespace details
@@ -61,4 +73,82 @@ namespace details
         _ASYNCRTIMP size_t __cdecl add_chunked_delimiters(_Out_writes_(buffer_size) uint8_t *data, _In_ size_t buffer_size, size_t bytes_read);
     }
 
+    namespace compression
+    {
+        enum class compression_algorithm : int 
+        { 
+            deflate = 15,
+            gzip = 31,
+            invalid = 9999
+        };
+
+        using data_buffer = std::vector<uint8_t>;
+
+        class stream_decompressor
+        {
+        public:
+
+            static compression_algorithm to_compression_algorithm(const utility::string_t& alg)
+            {
+                if (U("gzip") == alg)
+                {
+                    return compression_algorithm::gzip;
+                }
+                else if (U("deflate") == alg)
+                {
+                    return compression_algorithm::deflate;
+                }
+
+                return compression_algorithm::invalid;
+            }
+
+            static bool is_supported()
+            {
+#if !defined(CPPREST_HTTP_COMPRESSION) 
+                return false;
+#else
+                return true;
+#endif
+            }
+
+            _ASYNCRTIMP stream_decompressor(compression_algorithm alg);
+
+            _ASYNCRTIMP data_buffer decompress(const data_buffer& input);
+
+            _ASYNCRTIMP data_buffer decompress(const uint8_t* input, size_t input_size);
+
+            _ASYNCRTIMP bool has_error() const;
+
+        private:
+            class stream_decompressor_impl;
+            std::shared_ptr<stream_decompressor_impl> m_pimpl;
+        };
+
+        class stream_compressor
+        {
+        public:
+
+            static bool is_supported()
+            {
+#if !defined(CPPREST_HTTP_COMPRESSION) 
+                return false;
+#else
+                return true;
+#endif
+            }
+
+            _ASYNCRTIMP stream_compressor(compression_algorithm alg);
+
+            _ASYNCRTIMP data_buffer compress(const data_buffer& input, bool finish);
+
+            _ASYNCRTIMP data_buffer compress(const uint8_t* input, size_t input_size, bool finish);
+
+            _ASYNCRTIMP bool has_error() const;
+
+        private:
+            class stream_compressor_impl;
+            std::shared_ptr<stream_compressor_impl> m_pimpl;
+        };
+
+    }
 }}}

Release/include/cpprest/http_client.h

@@ -94,7 +94,8 @@ class http_client_config
     http_client_config() :
         m_guarantee_order(false),
         m_timeout(std::chrono::seconds(30)),
-        m_chunksize(0)
+        m_chunksize(0),
+        m_request_compressed(false)
 #if !defined(__cplusplus_winrt)
         , m_validate_certificates(true)
 #endif
@@ -258,6 +259,27 @@ class http_client_config
         return m_chunksize == 0;
     }
 
+    /// <summary>
+    /// Checks if requesting a compressed response is turned on, the default is off.
+    /// </summary>
+    /// <returns>True if compressed response is enabled, false otherwise</returns>
+    bool request_compressed_response() const
+    {
+        return m_request_compressed;
+    }
+
+    /// <summary>
+    /// Request that the server responds with a compressed body.
+    /// If true, in cases where the server does not support compression, this will have no effect.
+    /// The response body is internally decompressed before the consumer receives the data.
+    /// </summary>
+    /// <param name="request_compressed">True to turn on response body compression, false otherwise.</param>
+    /// <remarks>Please note there is a performance cost due to copying the request data. Currently only supported on Windows and OSX.</remarks>
+    void set_request_compressed_response(bool request_compressed)
+    {
+        m_request_compressed = request_compressed;
+    }
+
 #if !defined(__cplusplus_winrt)
     /// <summary>
     /// Gets the server certificate validation property.
@@ -379,6 +401,7 @@ class http_client_config
 
     std::chrono::microseconds m_timeout;
     size_t m_chunksize;
+    bool m_request_compressed;
 
 #if !defined(__cplusplus_winrt)
     // IXmlHttpRequest2 doesn't allow configuration of certificate verification.

Release/src/CMakeLists.txt

@@ -128,6 +128,7 @@ target_link_libraries(cpprest
   ${OPENSSL_LIBRARIES}
   ${COREFOUNDATION}
   ${ANDROID_STL_FLAGS}
+  ${ZLIB_LIBRARIES}
   )
 
 # Portions specific to cpprest binary versioning.

Release/src/build/vs14.wod/casablanca140.wod.vcxproj

@@ -21,14 +21,17 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\packages\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\..\..\..\packages\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
   </ImportGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugFileSuffix>d</DebugFileSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <TargetName>$(CppRestBaseFileName)140$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix).wod</TargetName>
-    <NuGetPackageImportStamp>57c5697d</NuGetPackageImportStamp>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>CPPREST_EXCLUDE_WEBSOCKETS;_ASYNCRT_EXPORT;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -47,4 +50,10 @@
   <Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
   <Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+  </Target>
 </Project>