Add port to the Host header

Author: garethsb

Development/nmos/client_utils.cpp

@@ -258,18 +258,22 @@ namespace nmos
 
     namespace details
     {
-        // make a client for the specified base_uri and config, with Host header sneakily stashed in user info
+        // make a client for the specified base_uri and config, with host name for the Host header sneakily stashed in user info
         std::unique_ptr<web::http::client::http_client> make_http_client(const web::uri& base_uri, const web::http::client::http_client_config& client_config)
         {
-            // unstash the Host header
+            // unstash the host name for the Host header
             // cf. nmos::details::resolve_service
-            const auto& host_name = base_uri.user_info();
             std::unique_ptr<web::http::client::http_client> client(new web::http::client::http_client(web::uri_builder(base_uri).set_user_info({}).to_uri(), client_config));
-            if (!host_name.empty())
+            if (!base_uri.user_info().empty())
             {
-                client->add_handler([host_name](web::http::http_request request, std::shared_ptr<web::http::http_pipeline_stage> next_stage) -> pplx::task<web::http::http_response>
+                auto host = base_uri.user_info();
+                if (base_uri.port() > 0)
                 {
-                    request.headers().add(web::http::header_names::host, host_name);
+                    host.append(U(":")).append(utility::conversions::details::to_string_t(base_uri.port()));
+                }
+                client->add_handler([host](web::http::http_request request, std::shared_ptr<web::http::http_pipeline_stage> next_stage) -> pplx::task<web::http::http_response>
+                {
+                    request.headers().add(web::http::header_names::host, host);
                     return next_stage->propagate(request);
                 });
             }

Development/nmos/client_utils.h

@@ -33,7 +33,7 @@ namespace nmos
 
     namespace details
     {
-        // make a client for the specified base_uri and config, with Host header sneakily stashed in user info
+        // make a client for the specified base_uri and config, with host name for the Host header sneakily stashed in user info
         std::unique_ptr<web::http::client::http_client> make_http_client(const web::uri& base_uri_with_host_name_in_user_info, const web::http::client::http_client_config& client_config);
     }
 

Development/nmos/mdns.cpp

@@ -561,7 +561,7 @@ namespace nmos
 
                         for (const auto& ip_address : resolved.ip_addresses)
                         {
-                            // sneakily stash the Host header in user info
+                            // sneakily stash the host name for the Host header in user info
                             // cf. nmos::details::make_http_client
                             results->push_back({ { *resolved_ver, resolved_pri }, resolved_uri
                                 .set_user_info(host_name)