Merge branch 'georgemp-georgemp/Overwrite_http_host_header' into development

Fix build break issues in header_tests

Author: kavyako

Release/src/http/client/http_client_asio.cpp

@@ -607,7 +607,7 @@ class asio_context : public request_context, public std::enable_shared_from_this
             request_stream.imbue(std::locale::classic());
             const auto &host = base_uri.host();
 
-            request_stream << method << " " << encoded_resource << " " << "HTTP/1.1" << CRLF << "Host: " << host;
+            request_stream << method << " " << encoded_resource << " " << "HTTP/1.1" << CRLF;
 
             int port = base_uri.port();
 
@@ -616,7 +616,11 @@ class asio_context : public request_context, public std::enable_shared_from_this
                 port = (ctx->m_connection->is_ssl() ? 443 : 80);
             }
 
-            request_stream << ":" << port << CRLF;
+            // Add the Host header if user has not specified it explicitly
+            if (!m_request.headers().has(header_names::host))
+            {
+                request_stream << "Host: " << host << ":" << port << CRLF;
+            }
 
             // Extra request headers are constructed here.
             utility::string_t extra_headers;

Release/tests/functional/http/client/header_tests.cpp

@@ -382,6 +382,37 @@ TEST_FIXTURE(uri_address, parsing_content_type_redundantsemicolon_string)
     auto resp = client.request(methods::GET).get();
     VERIFY_ARE_EQUAL(resp.extract_string().get(), utility::conversions::to_string_t(body));
 }
+
+TEST_FIXTURE(uri_address, overwrite_http_header)
+{
+    test_http_server::scoped_server scoped(m_uri);
+    http_client client(m_uri);
+    
+    // Test default case of cpprestsdk setting host header as host:port
+    auto& host = m_uri.host();
+    int port = m_uri.port();
+    utility::string_t expected_default_header = host + U(":") + utility::conversions::print_string(port);
+    http_request default_host_headers_request(methods::GET);
+    scoped.server()->next_request().then([&](test_request *p_request) 
+    {
+        auto headers = p_request->m_headers;
+        VERIFY_ARE_EQUAL(expected_default_header, headers[header_names::host]);
+        p_request->reply(200);
+    });
+
+    client.request(default_host_headers_request).get();
+
+    // Test case where we overwrite the host header
+    http_request overwritten_host_headers_request(methods::GET);
+    overwritten_host_headers_request.headers().add(U("Host"), host);
+    scoped.server()->next_request().then([&](test_request *p_request)
+    {
+        auto headers = p_request->m_headers;
+        VERIFY_ARE_EQUAL(host, headers[header_names::host]);
+        p_request->reply(200);
+    });
+    client.request(overwritten_host_headers_request).get();
+}
 } // SUITE(header_tests)
 
-}}}}
+}}}}