Skip to content

Commit 616ba6b

Browse files
committed
Changing tags::http to become tags::http_default_8bit_tcp_resolve, introducing tags::http_default_8bit_udp_resolve.
1 parent ddd7889 commit 616ba6b

34 files changed

+119
-72
lines changed

boost/network/protocol/http/client.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace boost { namespace network { namespace http {
4646

4747
boost::system::error_code error = boost::asio::error::host_not_found;
4848

49-
tcp::resolver::iterator endpoint_iterator, end;
49+
typename resolver_base::resolver_type::iterator endpoint_iterator, end;
5050
boost::tie(endpoint_iterator, end) = resolve(resolver_, hostname, port);
5151

5252
while (error && endpoint_iterator != end) {
@@ -287,7 +287,7 @@ namespace boost { namespace network { namespace http {
287287

288288
};
289289

290-
typedef basic_client<tags::http, 1, 0> client;
290+
typedef basic_client<tags::http_default_8bit_tcp_resolve, 1, 0> client;
291291

292292
} // namespace http
293293

boost/network/protocol/http/client_fwd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace boost { namespace network { namespace http {
1919
template <class Tag, unsigned version_major, unsigned version_minor>
2020
class basic_client;
2121

22-
typedef basic_client<tags::http, 1, 0> client;
22+
typedef basic_client<tags::http_default_8bit_tcp_resolve, 1, 0> client;
2323

2424
} // namespace http
2525

boost/network/protocol/http/errors.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace boost { namespace network { namespace http { namespace errors {
1414

15-
template <class Tag=tags::http>
15+
template <class Tag=tags::http_default_8bit_tcp_resolve>
1616
struct connection_timeout_exception :
1717
std::runtime_error
1818
{

boost/network/protocol/http/message.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace boost { namespace network { namespace http {
6868
static bool const base64_encode(string_type const &input, string_type & output);
6969
};
7070

71-
typedef message_impl<tags::http> message;
71+
typedef message_impl<tags::http_default_8bit_tcp_resolve> message;
7272

7373
} // namespace http
7474

boost/network/protocol/http/policies/sync_resolver.hpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@
88

99
#include <utility>
1010
#include <boost/asio.hpp>
11+
#include <boost/network/protocol/http/traits/resolver.hpp>
1112

1213
namespace boost { namespace network { namespace http { namespace policies {
1314

1415
template <class Tag>
1516
struct sync_resolver {
1617

17-
typedef boost::asio::ip::tcp::resolver resolver_type;
18+
typedef typename resolver<Tag>::type resolver_type;
19+
typedef typename resolver_type::iterator resolver_iterator;
20+
typedef typename resolver_type::query resolver_query;
1821

1922
protected:
2023

2124
typedef std::pair<
22-
boost::asio::ip::tcp::resolver::iterator,
23-
boost::asio::ip::tcp::resolver::iterator
25+
resolver_iterator,
26+
resolver_iterator
2427
> resolver_iterator_pair;
2528
typedef typename string<Tag>::type string_type;
2629
typedef std::map<string_type, resolver_iterator_pair> resolved_cache;
@@ -41,13 +44,13 @@ namespace boost { namespace network { namespace http { namespace policies {
4144
hostname,
4245
std::make_pair(
4346
resolver_.resolve(
44-
boost::asio::ip::tcp::resolver::query(
47+
resolver_query(
4548
hostname,
4649
port,
47-
boost::asio::ip::tcp::resolver_query::numeric_service
50+
resolver_query::numeric_service
4851
)
4952
)
50-
, boost::asio::ip::tcp::resolver::iterator()
53+
, resolver_iterator()
5154
)
5255
)
5356
);
@@ -57,14 +60,14 @@ namespace boost { namespace network { namespace http { namespace policies {
5760

5861
return std::make_pair(
5962
resolver_.resolve(
60-
boost::asio::ip::tcp::resolver::query(
63+
resolver_query(
6164
hostname,
6265
port,
63-
boost::asio::ip::tcp::resolver_query::numeric_service
66+
resolver_query::numeric_service
6467
)
6568
)
6669
,
67-
boost::asio::ip::tcp::resolver::iterator()
70+
resolver_iterator()
6871
);
6972
};
7073

boost/network/protocol/http/request.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace boost { namespace network { namespace http {
2828

2929
namespace boost { namespace network { namespace http {
3030

31-
typedef basic_request<tags::http> request;
31+
typedef basic_request<tags::http_default_8bit_tcp_resolve> request;
3232
typedef basic_request<tags::pod> request_pod;
3333

3434
} // namespace http

boost/network/protocol/http/response.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace boost { namespace network { namespace http {
6565
lhs.swap(rhs);
6666
}
6767

68-
typedef basic_response<tags::http> response;
68+
typedef basic_response<tags::http_default_8bit_tcp_resolve> response;
6969

7070
} // namespace http
7171

boost/network/protocol/http/traits/impl/content.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace boost { namespace network { namespace http {
1313

1414
template <>
15-
struct content<tags::http> {
15+
struct content<tags::http_default_8bit_tcp_resolve> {
1616
static char const * const type_html() {
1717
static char const * const TYPE_HTML = "text/html";
1818
return TYPE_HTML;

boost/network/protocol/http/traits/impl/cookie_name.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace boost { namespace network { namespace http {
1313

1414
template <>
15-
struct cookie_name<tags::http> {
15+
struct cookie_name<tags::http_default_8bit_tcp_resolve> {
1616
static boost::uint32_t const MAX = 1024u;
1717
};
1818

boost/network/protocol/http/traits/impl/cookie_value.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace boost { namespace network { namespace http {
1313

1414
template <>
15-
struct cookie_value<tags::http> {
15+
struct cookie_value<tags::http_default_8bit_tcp_resolve> {
1616
static boost::uint32_t const MAX = 1024u * 1024u;
1717
};
1818

0 commit comments

Comments
 (0)