Supporting Custom Ports in Host Header for Requests

deanberris · deanberris · commit a912ab9dacf9 · 2011-01-30T18:44:19.000+08:00
This commit addresses mikhailberis/cpp-netlib#25 which puts the port as
part of the Host header in HTTP requests.
diff --git a/boost/network/protocol/http/algorithms/linearize.hpp b/boost/network/protocol/http/algorithms/linearize.hpp
@@ -13,6 +13,7 @@
 #include <boost/network/protocol/http/request_concept.hpp>
 #include <boost/network/constants.hpp>
 #include <boost/concept/requires.hpp>
+#include <boost/optional.hpp>
 #include <boost/range/algorithm/copy.hpp>
 
 namespace boost { namespace network { namespace http {
@@ -95,6 +96,12 @@ namespace boost { namespace network { namespace http {
         *oi = consts::colon_char();
         *oi = consts::space_char();
         boost::copy(request.host(), oi);
+        boost::optional<boost::uint16_t> port_ = port(request);
+        if (port_) {
+            string_type port_str = boost::lexical_cast<string_type>(*port_);
+            *oi = consts::colon_char();
+            boost::copy(port_str, oi);
+        }
         boost::copy(crlf, oi);
         boost::copy(accept, oi);
         *oi = consts::colon_char();
diff --git a/boost/network/protocol/http/message/wrappers/port.hpp b/boost/network/protocol/http/message/wrappers/port.hpp
@@ -7,6 +7,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/optional.hpp>
+
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -26,6 +28,10 @@ namespace boost { namespace network { namespace http {
             operator port_type() {
                 return message_.port();
             }
+
+            operator boost::optional<boost::uint16_t> () {
+                return port(message_.uri());
+            }
         };
 
     } // namespace impl
diff --git a/boost/network/protocol/http/message/wrappers/uri.hpp b/boost/network/protocol/http/message/wrappers/uri.hpp
@@ -7,6 +7,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/network/uri/http/uri.hpp>
+
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -22,6 +24,9 @@ namespace boost { namespace network { namespace http {
             operator string_type() {
                 return message_.uri().raw();
             }
+            operator boost::network::uri::basic_uri<tags::http_default_8bit_tcp_resolve> () {
+                return message_.uri();
+            }
         };
     }
 
