Refactor http_client_impl.h to be internal.

jasonsandlin · Apr 8, 2016 · a0a0f8d · a0a0f8d
1 parent d3391c8
commit a0a0f8d
Show file tree

Hide file tree

Showing 12 changed files with 604 additions and 491 deletions.
diff --git a/Release/include/cpprest/details/http_client_impl.h b/Release/include/cpprest/details/http_client_impl.h
diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h
@@ -280,8 +280,7 @@ class http_client_config
     }
 #endif
 
-#ifdef _WIN32
-#if !defined(__cplusplus_winrt)
+#if defined(_WIN32) && !defined(__cplusplus_winrt)
     /// <summary>
     /// Checks if request data buffering is turned on, the default is off.
     /// </summary>
@@ -302,7 +301,6 @@ class http_client_config
     {
         m_buffer_request = buffer_request;
     }
-#endif
 #endif
 
     /// <summary>
@@ -422,7 +420,7 @@ class http_client
     /// Note the destructor doesn't necessarily close the connection and release resources.
     /// The connection is reference counted with the http_responses.
     /// </summary>
-    ~http_client() CPPREST_NOEXCEPT {}
+    _ASYNCRTIMP ~http_client() CPPREST_NOEXCEPT;
 
     /// <summary>
     /// Gets the base URI.
@@ -442,19 +440,14 @@ class http_client
     /// Adds an HTTP pipeline stage to the client.
     /// </summary>
     /// <param name="handler">A function object representing the pipeline stage.</param>
-    void add_handler(const std::function<pplx::task<http_response>(http_request, std::shared_ptr<http::http_pipeline_stage>)> &handler)
-    {
-        m_pipeline->append(std::make_shared<::web::http::details::function_pipeline_wrapper>(handler));
-    }
+    _ASYNCRTIMP void add_handler(const std::function<pplx::task<http_response>(http_request, std::shared_ptr<http::http_pipeline_stage>)> &handler);
+
 
     /// <summary>
     /// Adds an HTTP pipeline stage to the client.
     /// </summary>
     /// <param name="stage">A shared pointer to a pipeline stage.</param>
-    void add_handler(const std::shared_ptr<http::http_pipeline_stage> &stage)
-    {
-        m_pipeline->append(stage);
-    }
+    _ASYNCRTIMP void add_handler(const std::shared_ptr<http::http_pipeline_stage> &stage);
 
     /// <summary>
     /// Asynchronously sends an HTTP request.
@@ -732,6 +725,13 @@ class http_client
     std::shared_ptr<::web::http::http_pipeline> m_pipeline;
 };
 
+namespace details {
+#if defined(_WIN32)
+extern const utility::char_t * get_with_body_err_msg;
+#endif
+
+}
+
 }}}
 
 #endif
diff --git a/Release/include/cpprest/http_headers.h b/Release/include/cpprest/http_headers.h
@@ -328,4 +328,18 @@ class http_headers
     std::map<utility::string_t, utility::string_t, _case_insensitive_cmp> m_headers;
 };
 
+namespace details {
+
+    /// <summary>
+    /// Serialize the http_headers into name:value pairs separated by a carriage return and line feed.
+    /// </summary>
+    utility::string_t flatten_http_headers(const http_headers &headers);
+#if defined(_WIN32)
+    /// <summary>
+    /// Parses a string containing Http headers.
+    /// </summary>
+    void parse_headers_string(_Inout_z_ utf16char *headersStr, http_headers &headers);
+#endif
+}
+
 }}
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -4,6 +4,7 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
 endif()
 
 set(SOURCES_COMMON
+  http/client/http_client.cpp
   http/client/http_client_msg.cpp
   http/client/x509_cert_utilities.cpp
   http/common/http_helpers.cpp

diff --git a/Release/src/build/common.vcxitems b/Release/src/build/common.vcxitems
@@ -15,6 +15,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\http_client.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\http_client_msg.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\http\common\http_helpers.cpp" />
@@ -51,12 +52,11 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\basic_types.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\cpprest_compat.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\fileio.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_client_impl.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_helpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_api.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\nosal.h" />
-	<ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\resource.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\resource.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\SafeInt3.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\uri_parser.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\web_utilities.h" />
@@ -83,6 +83,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxconv.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxinterface.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxtasks.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\pch\stdafx.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Release/src/build/common.vcxitems.filters b/Release/src/build/common.vcxitems.filters
@@ -67,6 +67,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\websockets\client\ws_client.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\http_client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -87,6 +90,9 @@
     <Filter Include="Header Files\pplx">
       <UniqueIdentifier>{1c12997c-5bf5-4b60-853e-a5f9c8303760}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\private">
+      <UniqueIdentifier>{97da7aee-41c8-4948-bb0e-c31cec1bfb16}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\astreambuf.h">
@@ -152,9 +158,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\fileio.h">
       <Filter>Header Files\cpprest\details</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_client_impl.h">
-      <Filter>Header Files\cpprest\details</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_helpers.h">
       <Filter>Header Files\cpprest\details</Filter>
     </ClInclude>
@@ -209,6 +212,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\resource.h">
       <Filter>Header Files\cpprest\details</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h">
+      <Filter>Header Files\private</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_constants.dat">