Merge branch 'deanberris-0.9-devel' into 0.9-devel

Author: deanberris

CMakeLists.txt

@@ -18,7 +18,7 @@ if (Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
 endif()
 enable_testing()
-add_subdirectory(libs/network/build)
+add_subdirectory(libs/network/src)
 add_subdirectory(libs/network/test)
 add_subdirectory(libs/mime/test)
 add_subdirectory(libs/network/example)

boost/network/protocol/http/impl/request.hpp

@@ -15,7 +15,7 @@
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 
-#include <boost/network/uri.hpp>
+#include <boost/network/uri/http/uri.hpp>
 #include <boost/network/traits/vector.hpp>
 
 #include <boost/network/protocol/http/message/async_message.hpp>
@@ -24,8 +24,8 @@
 
 #include <boost/cstdint.hpp>
 
-namespace boost { namespace network { 
-    
+namespace boost { namespace network {
+
     /** Specialize the traits for the http_server tag. */
     template <>
     struct headers_container<http::tags::http_server> :
@@ -50,7 +50,7 @@ namespace http {
     struct basic_request : public basic_message<Tag>
     {
 
-        mutable boost::network::uri::http::uri uri_;
+        mutable boost::network::uri::http::basic_uri<Tag> uri_;
         typedef basic_message<Tag> base_type;
 
     public:
@@ -92,7 +92,7 @@ namespace http {
         }
 
         port_type port() const {
-            return uri::port(uri_);
+            return uri::port_us(uri_);
         }
 
         string_type const path() const {
@@ -115,7 +115,7 @@ namespace http {
             uri_ = new_uri;
         }
 
-        boost::network::uri::http::uri const uri() const {
+        boost::network::uri::http::basic_uri<Tag> const & uri() const {
             return uri_;
         }
 
@@ -162,7 +162,7 @@ namespace http {
     };
 
     template <>
-    struct basic_request<tags::http_async_server> 
+    struct basic_request<tags::http_async_server>
     : not_quite_pod_request_base<tags::http_async_server>
     {};
 

boost/network/protocol/http/message/wrappers/port.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace network { namespace http {
             }
 
             operator boost::optional<boost::uint16_t> () {
-                return port(message_.uri());
+                return port_us(message_.uri());
             }
         };
 

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

@@ -9,6 +9,7 @@
 #include <utility>
 #include <boost/network/protocol/http/traits/resolver.hpp>
 #include <boost/fusion/adapted/std_pair.hpp>
+#include <boost/fusion/include/tuple.hpp>
 #include <boost/network/traits/string.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/unordered_map.hpp>

boost/network/uri.hpp

@@ -6,19 +6,20 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/tags.hpp>
 #include <boost/network/traits/string.hpp>
-#include <boost/network/uri/basic_uri.hpp>
+#include <boost/network/uri/uri.hpp>
+#include <boost/network/protocol/http/tags.hpp>
 #include <boost/network/uri/http/uri.hpp>
 
+
 namespace boost { namespace network { namespace uri {
 
-    typedef basic_uri<boost::network::tags::default_string> uri;
-    typedef basic_uri<boost::network::tags::default_wstring> wuri;
+typedef basic_uri<boost::network::tags::default_string> uri;
+typedef basic_uri<boost::network::tags::default_wstring> wuri;
 
-    namespace http {
-        typedef basic_uri<boost::network::http::tags::http_default_8bit_tcp_resolve> uri;
-    }
+namespace http {
+typedef basic_uri<boost::network::http::tags::http_default_8bit_udp_resolve> uri;
+}
 
 } // namespace uri
 } // namespace network