Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbf60c4e

Browse files
committed
Merge commit 'upstream/0.5-devel' into 0.5-devel
2 parents21ce21e +c356c16 commitbf60c4e

File tree

5 files changed

+17
-24
lines changed

5 files changed

+17
-24
lines changed

‎boost/network/uri/http/uri.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace boost { namespace network { namespace uri {
2020

2121
template<>
2222
structbasic_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_typestring_type;
2424
using uri_base<tags::http_default_8bit_tcp_resolve>::operator=;
2525
using uri_base<tags::http_default_8bit_tcp_resolve>::swap;
2626

@@ -31,7 +31,7 @@ namespace boost { namespace network { namespace uri {
3131
return parts_.host;
3232
}
3333

34-
uint32_tport()const {
34+
uint16_tport()const {
3535
return parts_.port ? *(parts_.port) :
3636
(boost::iequals(parts_.scheme,string_type("https")) ?443u :80u);
3737
}
@@ -61,7 +61,7 @@ namespace boost { namespace network { namespace uri {
6161
}
6262

6363
inline
64-
uint32_t
64+
uint16_t
6565
port(basic_uri<tags::http_default_8bit_tcp_resolve>const & uri) {
6666
return uri.port();
6767
}

‎libs/network/doc/uri.qbk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ For any HTTP URI, the following expressions must be valid:
7878
[[Expression] [Return Type] [Description]]
7979
[[`user_info(h)`] [S] [Retrieve the user-info part of the HTTP URI.]]
8080
[[`host(h)`] [S] [Retrieve the host part of the HTTP URI.]]
81-
[[`port(h)`] [uint32_t] [Retrieve the port part of the HTTP URI.]]
81+
[[`port(h)`] [uint16_t] [Retrieve the port part of the HTTP URI.]]
8282
[[`path(h)`] [S] [Retrieve the path part of the HTTP URI.]]
8383
[[`query(h)`] [S] [Retrieve the query part of the HTTP URI.]]
8484
[[`fragment(h)`][S] [Retrieve the fragment part of the HTTP URI.]]

‎libs/network/test/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ if (Boost_FOUND)
1414
add_executable(cpp-netlib-message_transform_testmessage_transform_test.cpp)
1515
add_executable(cpp-netlib-url_testurl_test.cpp)
1616
target_link_libraries(cpp-netlib-hello_world${Boost_SYSTEM_LIBRARY}${Boost_REGEX_LIBRARY}${Boost_DATE_TIME_LIBRARY}${Boost_THREAD_LIBRARY}pthread)
17-
target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}pthreadssl)
18-
target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}pthreadssl)
19-
target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}pthreadssl)
20-
target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}pthreadssl)
21-
target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}pthreadssl)
22-
target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}pthreadssl)
23-
target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}pthreadssl)
24-
target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}pthreadssl)
17+
target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}pthreadsslcrypto)
18+
target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}pthreadsslcrypto)
19+
target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}pthreadsslcrypto)
20+
target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}pthreadsslcrypto)
21+
target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}pthreadsslcrypto)
22+
target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}pthreadsslcrypto)
23+
target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}pthreadsslcrypto)
24+
target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}pthreadsslcrypto)
2525
set_target_properties(cpp-netlib-hello_worldcpp-netlib-http_1_0_testcpp-netlib-http_1_1_testcpp-netlib-message_testcpp-netlib-http_message_testcpp-netlib-message_transform_testcpp-netlib-http_localhost_testscpp-netlib-https_localhost_testscpp-netlib-url_testPROPERTIESRUNTIME_OUTPUT_DIRECTORY../../../build/tests)
2626
add_test(cpp-netlib-hello_worldpythonhttplib_acceptance.py../../../build/tests/cpp-netlib-hello_world../../../build/tests/cpp-netlib-hello_world.passed)
2727
add_test(cpp-netlib-http_1_0_test../../../build/tests/cpp-netlib-http_1_0_test)

‎libs/network/test/Jamfile.v2

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ project network_test :
2323
<source>/boost//filesystem
2424
<toolset>gcc:<linkflags>-lpthread
2525
<toolset>gcc:<linkflags>-lssl
26+
<toolset>gcc:<linkflags>-lcrypto
2627
<os>cygwin,<toolset>gcc:<define>_WIN32_WINNT=0x0501
2728
<os>cygwin,<toolset>gcc:<define>__USE_W32_SOCKETS
2829
<os>cygwin,<toolset>gcc:<library>ws2_32
@@ -35,21 +36,13 @@ project network_test :
3536
;
3637

3738
unit-test http_localhost_tests : http_localhost_tests.cpp ;
38-
3939
unit-test https_localhost_tests : https_localhost_tests.cpp ;
40-
4140
unit-test message_test : message_test.cpp ;
42-
4341
unit-test message_transform_test : message_transform_test.cpp ;
44-
4542
unit-test http_1_0_test : http_1_0_test.cpp ;
46-
4743
unit-test http_1_1_test : http_1_1_test.cpp ;
48-
4944
unit-test http_message_test : http_message_test.cpp ;
50-
5145
unit-test url_test : url_test.cpp ;
52-
5346
exe hello_world : hello_world.cpp ;
5447

5548
make httplib_acceptance.passed : httplib_acceptance.py hello_world : @python_runner ;

‎libs/network/test/url_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void http_full_uri_test(Uri instance,
5050
consttypename Uri::string_type &rest_,
5151
consttypename Uri::string_type &user_info_,
5252
consttypename Uri::string_type &host_,
53-
boost::uint32_t port_,
53+
boost::uint16_t port_,
5454
consttypename Uri::string_type &path_,
5555
consttypename Uri::string_type &query_,
5656
consttypename Uri::string_type &fragment_) {
@@ -75,7 +75,7 @@ void http_simple_uri_test(Uri instance,
7575
consttypename Uri::string_type &rest_,
7676
consttypename Uri::string_type &user_info_,
7777
consttypename Uri::string_type &host_,
78-
boost::uint32_t port_,
78+
boost::uint16_t port_,
7979
consttypename Uri::string_type &path_,
8080
consttypename Uri::string_type &query_,
8181
consttypename Uri::string_type &fragment_) {
@@ -95,7 +95,7 @@ template <
9595
>
9696
voidhttps_simple_uri_test(Uri instance,
9797
consttypename Uri::string_type &protocol_,
98-
boost::uint32_t port_) {
98+
boost::uint16_t port_) {
9999
usingnamespaceboost::network::uri;
100100

101101
BOOST_CHECK(protocol(instance) == protocol_);
@@ -107,7 +107,7 @@ template <
107107
>
108108
voidhttp_with_port_test(Uri instance,
109109
consttypename Uri::string_type &host_,
110-
boost::uint32_t port_) {
110+
boost::uint16_t port_) {
111111
usingnamespaceboost::network::uri;
112112

113113
BOOST_CHECK(host(instance) == host_);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp