Changing tags::http to become tags::http_default_8bit_tcp_resolve, introducing tags::http_default_8bit_udp_resolve.

deanberris · deanberris · commit 616ba6bce46b · 2009-12-14T07:16:38.000+08:00
diff --git a/boost/network/protocol/http/client.hpp b/boost/network/protocol/http/client.hpp
@@ -46,7 +46,7 @@ namespace boost { namespace network { namespace http {
 
             boost::system::error_code error = boost::asio::error::host_not_found;
 
-            tcp::resolver::iterator endpoint_iterator, end;
+            typename resolver_base::resolver_type::iterator endpoint_iterator, end;
             boost::tie(endpoint_iterator, end) = resolve(resolver_, hostname, port);
 
             while (error && endpoint_iterator != end) {
@@ -287,7 +287,7 @@ namespace boost { namespace network { namespace http {
 
     };
 
-    typedef basic_client<tags::http, 1, 0> client;
+    typedef basic_client<tags::http_default_8bit_tcp_resolve, 1, 0> client;
 
 } // namespace http
 
diff --git a/boost/network/protocol/http/client_fwd.hpp b/boost/network/protocol/http/client_fwd.hpp
@@ -19,7 +19,7 @@ namespace boost { namespace network { namespace http {
     template <class Tag, unsigned version_major, unsigned version_minor>
         class basic_client;
 
-    typedef basic_client<tags::http, 1, 0> client;
+    typedef basic_client<tags::http_default_8bit_tcp_resolve, 1, 0> client;
 
 } // namespace http
 
diff --git a/boost/network/protocol/http/errors.hpp b/boost/network/protocol/http/errors.hpp
@@ -12,7 +12,7 @@
 
 namespace boost { namespace network { namespace http { namespace errors {
 
-    template <class Tag=tags::http>
+    template <class Tag=tags::http_default_8bit_tcp_resolve>
         struct connection_timeout_exception : 
             std::runtime_error
     {
diff --git a/boost/network/protocol/http/message.hpp b/boost/network/protocol/http/message.hpp
@@ -68,7 +68,7 @@ namespace boost { namespace network { namespace http {
             static bool const base64_encode(string_type const &input, string_type & output);
     };
 
-    typedef message_impl<tags::http> message;
+    typedef message_impl<tags::http_default_8bit_tcp_resolve> message;
 
 } // namespace http
 
diff --git a/boost/network/protocol/http/policies/sync_resolver.hpp b/boost/network/protocol/http/policies/sync_resolver.hpp
@@ -8,19 +8,22 @@
 
 #include <utility>
 #include <boost/asio.hpp>
+#include <boost/network/protocol/http/traits/resolver.hpp>
 
 namespace boost { namespace network { namespace http { namespace policies {
 
     template <class Tag>
     struct sync_resolver {
 
-        typedef boost::asio::ip::tcp::resolver resolver_type;
+        typedef typename resolver<Tag>::type resolver_type;
+        typedef typename resolver_type::iterator resolver_iterator;
+        typedef typename resolver_type::query resolver_query;
 
         protected:
 
         typedef std::pair<
-            boost::asio::ip::tcp::resolver::iterator,
-            boost::asio::ip::tcp::resolver::iterator
+            resolver_iterator,
+            resolver_iterator
         > resolver_iterator_pair;
         typedef typename string<Tag>::type string_type;
         typedef std::map<string_type, resolver_iterator_pair> resolved_cache;
@@ -41,13 +44,13 @@ namespace boost { namespace network { namespace http { namespace policies {
                                         hostname,
                                         std::make_pair(
                                                 resolver_.resolve(
-                                                        boost::asio::ip::tcp::resolver::query(
+                                                        resolver_query(
                                                                 hostname,
                                                                 port,
-                                                                boost::asio::ip::tcp::resolver_query::numeric_service
+                                                                resolver_query::numeric_service
                                                                 )
                                                         )
-                                                        , boost::asio::ip::tcp::resolver::iterator()
+                                                        , resolver_iterator()
                                                 )
                                         )
                                 );
@@ -57,14 +60,14 @@ namespace boost { namespace network { namespace http { namespace policies {
 
             return std::make_pair(
                     resolver_.resolve(
-                            boost::asio::ip::tcp::resolver::query(
+                            resolver_query(
                                     hostname,
                                     port,
-                                    boost::asio::ip::tcp::resolver_query::numeric_service
+                                    resolver_query::numeric_service
                                     )
                             )
                             ,
-                            boost::asio::ip::tcp::resolver::iterator()
+                            resolver_iterator()
                     );
         };
 
diff --git a/boost/network/protocol/http/request.hpp b/boost/network/protocol/http/request.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace network { namespace http {
 
 namespace boost { namespace network { namespace http {
 
-    typedef basic_request<tags::http> request;
+    typedef basic_request<tags::http_default_8bit_tcp_resolve> request;
     typedef basic_request<tags::pod> request_pod;
 
 } // namespace http
diff --git a/boost/network/protocol/http/response.hpp b/boost/network/protocol/http/response.hpp
@@ -65,7 +65,7 @@ namespace boost { namespace network { namespace http {
             lhs.swap(rhs);
         }
 
-    typedef basic_response<tags::http> response;
+    typedef basic_response<tags::http_default_8bit_tcp_resolve> response;
 
 } // namespace http
 
diff --git a/boost/network/protocol/http/traits/impl/content.ipp b/boost/network/protocol/http/traits/impl/content.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct content<tags::http> {
+        struct content<tags::http_default_8bit_tcp_resolve> {
             static char const * const type_html() {
                 static char const * const TYPE_HTML = "text/html";
                 return TYPE_HTML;
diff --git a/boost/network/protocol/http/traits/impl/cookie_name.ipp b/boost/network/protocol/http/traits/impl/cookie_name.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct cookie_name<tags::http> {
+        struct cookie_name<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/cookie_value.ipp b/boost/network/protocol/http/traits/impl/cookie_value.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct cookie_value<tags::http> {
+        struct cookie_value<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/delimiters.ipp b/boost/network/protocol/http/traits/impl/delimiters.ipp
@@ -11,9 +11,9 @@
 
 namespace boost { namespace network { namespace http {
 
-    // specialize on the tags::http type
+    // specialize on the tags::http_default_8bit_tcp_resolve type
     template <>
-        struct delimiters<tags::http> {
+        struct delimiters<tags::http_default_8bit_tcp_resolve> {
             static char const * const string_crlf() {
                 static char const * const CRLF = "\x0D\x0A";
                 return CRLF;
diff --git a/boost/network/protocol/http/traits/impl/header_name.ipp b/boost/network/protocol/http/traits/impl/header_name.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct header_name<tags::http> {
+        struct header_name<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/header_value.ipp b/boost/network/protocol/http/traits/impl/header_value.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct header_value<tags::http> {
+        struct header_value<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/headers.ipp b/boost/network/protocol/http/traits/impl/headers.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct headers_<tags::http> {
+        struct headers_<tags::http_default_8bit_tcp_resolve> {
             static char const * const host() {
                 static char const * const HOST = "Host";
                 return HOST;
diff --git a/boost/network/protocol/http/traits/impl/headers_container.ipp b/boost/network/protocol/http/traits/impl/headers_container.ipp
@@ -16,7 +16,7 @@
 namespace boost { namespace network {
 
     template <>
-        struct headers_container<tags::http> {
+        struct headers_container<tags::http_default_8bit_tcp_resolve> {
 
             // Moving implementation from original
             // message_traits implementation by
@@ -25,15 +25,15 @@ namespace boost { namespace network {
             // returns true if str1 < str2 (ignoring case)
             struct is_less_ignore_case {
                 inline bool operator() (
-                        string<tags::http>::type const & str1, 
-                        string<tags::http>::type const & str2) const {
+                        string<tags::http_default_8bit_tcp_resolve>::type const & str1, 
+                        string<tags::http_default_8bit_tcp_resolve>::type const & str2) const {
                     return to_lower_copy(str1) < to_lower_copy(str2);
                 };
             };
 
             typedef std::multimap<
-                string<tags::http>::type,
-                string<tags::http>::type,
+                string<tags::http_default_8bit_tcp_resolve>::type,
+                string<tags::http_default_8bit_tcp_resolve>::type,
                 is_less_ignore_case> type;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/method.ipp b/boost/network/protocol/http/traits/impl/method.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct method<tags::http> {
+        struct method<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/post_content.ipp b/boost/network/protocol/http/traits/impl/post_content.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct post_content<tags::http> {
+        struct post_content<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/query_name.ipp b/boost/network/protocol/http/traits/impl/query_name.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct query_name<tags::http> {
+        struct query_name<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/query_string.ipp b/boost/network/protocol/http/traits/impl/query_string.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct query_string<tags::http> {
+        struct query_string<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/query_value.ipp b/boost/network/protocol/http/traits/impl/query_value.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct query_value<tags::http> {
+        struct query_value<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/request_methods.ipp b/boost/network/protocol/http/traits/impl/request_methods.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct request_methods<tags::http> {
+        struct request_methods<tags::http_default_8bit_tcp_resolve> {
             static char const * const head() {
                 static char const * const HEAD = "HEAD";
                 return HEAD;
diff --git a/boost/network/protocol/http/traits/impl/resource.ipp b/boost/network/protocol/http/traits/impl/resource.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct resource<tags::http> {
+        struct resource<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u * 256u;
         };
 
diff --git a/boost/network/protocol/http/traits/impl/response_code.ipp b/boost/network/protocol/http/traits/impl/response_code.ipp
@@ -12,7 +12,7 @@
 
 namespace boost { namespace network { namespace http {
 
-    /* This glob doesn't have a specialization on the tags::http
+    /* This glob doesn't have a specialization on the tags::http_default_8bit_tcp_resolve
      * yet because it doesn't need to define different behaviour/types 
      * on different message tags -- for example, it doesn't need to
      * determine the type or change the values of the data no matter
diff --git a/boost/network/protocol/http/traits/impl/response_message.ipp b/boost/network/protocol/http/traits/impl/response_message.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct response_message<tags::http> {
+        struct response_message<tags::http_default_8bit_tcp_resolve> {
             static char const * const ok() {
                 static char const * const OK = "OK";
                 return OK;
diff --git a/boost/network/protocol/http/traits/impl/status_message.ipp b/boost/network/protocol/http/traits/impl/status_message.ipp
@@ -12,7 +12,7 @@
 namespace boost { namespace network { namespace http {
 
     template <>
-        struct status_message<tags::http> {
+        struct status_message<tags::http_default_8bit_tcp_resolve> {
             static boost::uint32_t const MAX = 1024u;
         };
 
diff --git a/boost/network/protocol/http/traits/resolver.hpp b/boost/network/protocol/http/traits/resolver.hpp
@@ -0,0 +1,38 @@
+#ifndef BOOST_NETWORK_PROTOCOL_HTTP_TRAITS_RESOLVER_20091214
+#define BOOST_NETWORK_PROTOCOL_HTTP_TRAITS_RESOLVER_20091214
+
+//          Copyright Dean Michael Berris 2009.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/network/tags.hpp>
+
+namespace boost { namespace network { namespace http {
+
+    template <class Tag>
+    struct unsupported_tag;
+
+    template <class Tag>
+    struct resolver {
+        typedef unsupported_tag<Tag> type;
+    };
+
+    template <>
+    struct resolver<tags::http_default_8bit_tcp_resolve> {
+        typedef boost::asio::ip::tcp::resolver type;
+    };
+
+    template <>
+    struct resolver<tags::http_default_8bit_udp_resolve> {
+        typedef boost::asio::ip::udp::resolver type;
+    };
+
+} // namespace http
+
+} // namespace network
+
+} // namespace boost
+
+#endif // BOOST_NETWORK_PROTOCOL_HTTP_TRAITS_RESOLVER_20091214
+
diff --git a/boost/network/protocol/http/traits/resolver_policy.hpp b/boost/network/protocol/http/traits/resolver_policy.hpp
@@ -20,8 +20,13 @@ namespace boost { namespace network { namespace http {
     };
 
     template <>
-    struct resolver_policy<tags::http> {
-        typedef policies::sync_resolver<tags::http> type;
+    struct resolver_policy<tags::http_default_8bit_tcp_resolve> {
+        typedef policies::sync_resolver<tags::http_default_8bit_tcp_resolve> type;
+    };
+
+    template <>
+    struct resolver_policy<tags::http_default_8bit_udp_resolve> {
+        typedef policies::sync_resolver<tags::http_default_8bit_udp_resolve> type;
     };
 
 } // namespace http
diff --git a/boost/network/tags.hpp b/boost/network/tags.hpp
@@ -15,7 +15,8 @@ namespace tags {
 
 struct default_string;
 struct default_wstring;
-struct http;
+struct http_default_8bit_tcp_resolve;
+struct http_default_8bit_udp_resolve;
 struct pod;
 
 typedef default_string default_;
diff --git a/boost/network/traits/ostringstream.hpp b/boost/network/traits/ostringstream.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace network {
     };
 
     template <>
-    struct ostringstream<tags::http> {
+    struct ostringstream<tags::http_default_8bit_tcp_resolve> {
         typedef std::ostringstream type;
     };
 
diff --git a/boost/network/traits/string.hpp b/boost/network/traits/string.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace network {
     };
 
     template <>
-    struct string<tags::http> {
+    struct string<tags::http_default_8bit_tcp_resolve> {
         typedef std::string type;
     };
 
diff --git a/boost/network/uri.hpp b/boost/network/uri.hpp
diff --git a/boost/network/uri/http/detail/parse_specific.hpp b/boost/network/uri/http/detail/parse_specific.hpp
diff --git a/boost/network/uri/http/detail/uri_parts.hpp b/boost/network/uri/http/detail/uri_parts.hpp
diff --git a/boost/network/uri/http/uri.hpp b/boost/network/uri/http/uri.hpp

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace boost { namespace network { namespace http { namespace errors {`
`14`	`14`
`15`		`- template <class Tag=tags::http>`
	`15`	`+ template <class Tag=tags::http_default_8bit_tcp_resolve>`
`16`	`16`	`struct connection_timeout_exception :`
`17`	`17`	`std::runtime_error`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace boost { namespace network { namespace http {`
`65`	`65`	`lhs.swap(rhs);`
`66`	`66`	`}`
`67`	`67`
`68`		`- typedef basic_response<tags::http> response;`
	`68`	`+ typedef basic_response<tags::http_default_8bit_tcp_resolve> response;`
`69`	`69`
`70`	`70`	`} // namespace http`
`71`	`71`