Applying patch to port type issue.

deanberris · deanberris · commit 2fd6e287c620 · 2010-01-22T03:51:47.000+08:00
Fixes #3 .
diff --git a/boost/network/uri/http/uri.hpp b/boost/network/uri/http/uri.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace network { namespace uri {
                 return parts_.host;
             }
 
-            uint32_t port() const {
+            uint16_t port() const {
                 return parts_.port ? *(parts_.port) : 
                     (boost::iequals(parts_.scheme, string_type("https")) ? 443u : 80u);
             }
@@ -61,7 +61,7 @@ namespace boost { namespace network { namespace uri {
         }
 
     inline
-        uint32_t
+        uint16_t
         port(basic_uri<tags::http_default_8bit_tcp_resolve> const & uri) {
             return uri.port();
         }
diff --git a/libs/network/doc/uri.qbk b/libs/network/doc/uri.qbk
@@ -77,7 +77,7 @@ For any HTTP URI, the following expressions must be valid:
     [[Expression]   [Return Type]   [Description]]
     [[`user_info(h)`] [S]           [Retrieve the user-info part of the HTTP URI.]]
     [[`host(h)`]    [S]             [Retrieve the host part of the HTTP URI.]]
-    [[`port(h)`]    [uint32_t]      [Retrieve the port part of the HTTP URI.]]
+    [[`port(h)`]    [uint16_t]      [Retrieve the port part of the HTTP URI.]]
     [[`path(h)`]    [S]             [Retrieve the path part of the HTTP URI.]]
     [[`query(h)`]   [S]             [Retrieve the query part of the HTTP URI.]]
     [[`fragment(h)`][S]             [Retrieve the fragment part of the HTTP URI.]]
diff --git a/libs/network/test/url_test.cpp b/libs/network/test/url_test.cpp
@@ -50,7 +50,7 @@ void http_full_uri_test(Uri instance,
                         const typename Uri::string_type &rest_,
                         const typename Uri::string_type &user_info_,
                         const typename Uri::string_type &host_,
-                        boost::uint32_t port_,
+                        boost::uint16_t port_,
                         const typename Uri::string_type &path_,
                         const typename Uri::string_type &query_,
                         const typename Uri::string_type &fragment_) {
@@ -75,7 +75,7 @@ void http_simple_uri_test(Uri instance,
                           const typename Uri::string_type &rest_,
                           const typename Uri::string_type &user_info_,
                           const typename Uri::string_type &host_,
-                          boost::uint32_t port_,
+                          boost::uint16_t port_,
                           const typename Uri::string_type &path_,
                           const typename Uri::string_type &query_,
                           const typename Uri::string_type &fragment_) {
@@ -95,7 +95,7 @@ template <
     >
 void https_simple_uri_test(Uri instance,
                            const typename Uri::string_type &protocol_,
-                           boost::uint32_t port_) {
+                           boost::uint16_t port_) {
     using namespace boost::network::uri;
     
     BOOST_CHECK(protocol(instance) == protocol_);
@@ -107,7 +107,7 @@ template <
     >
 void http_with_port_test(Uri instance,
                          const typename Uri::string_type &host_,
-                         boost::uint32_t port_) {
+                         boost::uint16_t port_) {
     using namespace boost::network::uri;
 
     BOOST_CHECK(host(instance) == host_);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace boost { namespace network { namespace uri {`
`31`	`31`	`return parts_.host;`
`32`	`32`	`}`
`33`	`33`
`34`		`- uint32_t port() const {`
	`34`	`+ uint16_t port() const {`
`35`	`35`	`return parts_.port ? *(parts_.port) :`
`36`	`36`	`(boost::iequals(parts_.scheme, string_type("https")) ? 443u : 80u);`
`37`	`37`	`}`
`@@ -61,7 +61,7 @@ namespace boost { namespace network { namespace uri {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`inline`
`64`		`- uint32_t`
	`64`	`+ uint16_t`
`65`	`65`	`port(basic_uri<tags::http_default_8bit_tcp_resolve> const & uri) {`
`66`	`66`	`return uri.port();`
`67`	`67`	`}`