Merge commit 'upstream/0.5-devel' into 0.5-devel

glynos · glynos · commit bf60c4edb49a · 2010-01-22T20:56:43.000+01:00
diff --git a/boost/network/uri/http/uri.hpp b/boost/network/uri/http/uri.hpp
@@ -20,7 +20,7 @@ namespace boost { namespace network { namespace uri {
 
     template <>
         struct basic_uri<tags::http_default_8bit_tcp_resolve> : uri_base<tags::http_default_8bit_tcp_resolve> {
-            using uri_base<tags::http_default_8bit_tcp_resolve>::string_type;
+            typedef uri_base<tags::http_default_8bit_tcp_resolve>::string_type string_type;
             using uri_base<tags::http_default_8bit_tcp_resolve>::operator=;
             using uri_base<tags::http_default_8bit_tcp_resolve>::swap;
 
@@ -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
@@ -78,7 +78,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/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -14,14 +14,14 @@ if (Boost_FOUND)
     add_executable(cpp-netlib-message_transform_test message_transform_test.cpp)
     add_executable(cpp-netlib-url_test url_test.cpp)
     target_link_libraries(cpp-netlib-hello_world ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_THREAD_LIBRARY} pthread)
-    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} pthread ssl)
+    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} pthread ssl crypto)
     set_target_properties(cpp-netlib-hello_world cpp-netlib-http_1_0_test cpp-netlib-http_1_1_test cpp-netlib-message_test cpp-netlib-http_message_test cpp-netlib-message_transform_test cpp-netlib-http_localhost_tests cpp-netlib-https_localhost_tests cpp-netlib-url_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../../../build/tests)
     add_test(cpp-netlib-hello_world python httplib_acceptance.py ../../../build/tests/cpp-netlib-hello_world ../../../build/tests/cpp-netlib-hello_world.passed)
     add_test(cpp-netlib-http_1_0_test ../../../build/tests/cpp-netlib-http_1_0_test)
diff --git a/libs/network/test/Jamfile.v2 b/libs/network/test/Jamfile.v2
@@ -23,6 +23,7 @@ project network_test :
         <source>/boost//filesystem
         <toolset>gcc:<linkflags>-lpthread
         <toolset>gcc:<linkflags>-lssl
+        <toolset>gcc:<linkflags>-lcrypto
         <os>cygwin,<toolset>gcc:<define>_WIN32_WINNT=0x0501
         <os>cygwin,<toolset>gcc:<define>__USE_W32_SOCKETS
         <os>cygwin,<toolset>gcc:<library>ws2_32
@@ -35,21 +36,13 @@ project network_test :
     ;
 
 unit-test http_localhost_tests : http_localhost_tests.cpp ;
-
 unit-test https_localhost_tests : https_localhost_tests.cpp ;
-
 unit-test message_test : message_test.cpp ;
-
 unit-test message_transform_test : message_transform_test.cpp ;
-
 unit-test http_1_0_test : http_1_0_test.cpp ;
-
 unit-test http_1_1_test : http_1_1_test.cpp ;
-
 unit-test http_message_test : http_message_test.cpp ;
-
 unit-test url_test : url_test.cpp ;
-
 exe hello_world : hello_world.cpp ;
 
 make httplib_acceptance.passed : httplib_acceptance.py hello_world : @python_runner ;
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
`@@ -20,7 +20,7 @@ namespace boost { namespace network { namespace uri {`
`20`	`20`
`21`	`21`	`template <>`
`22`	`22`	`struct basic_uri<tags::http_default_8bit_tcp_resolve> : uri_base<tags::http_default_8bit_tcp_resolve> {`
`23`		`- using uri_base<tags::http_default_8bit_tcp_resolve>::string_type;`
	`23`	`+ typedef uri_base<tags::http_default_8bit_tcp_resolve>::string_type string_type;`
`24`	`24`	`using uri_base<tags::http_default_8bit_tcp_resolve>::operator=;`
`25`	`25`	`using uri_base<tags::http_default_8bit_tcp_resolve>::swap;`
`26`	`26`
`@@ -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`	`}`