Merge branch '0.7-devel' of git://github.com/mikhailberis/cpp-netlib into 0.7-devel

glynos · glynos · commit 0e4c86d23966 · 2010-09-23T20:03:01.000+02:00
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -21,7 +21,6 @@ namespace boost { namespace network { namespace http {
         struct async_client : 
             connection_policy<Tag,version_major,version_minor>::type
         {
-        protected:
             typedef
                 typename connection_policy<Tag,version_major,version_minor>::type
                 connection_base;
@@ -55,8 +54,6 @@ namespace boost { namespace network { namespace http {
                 lifetime_thread_.reset();
             }
 
-            friend struct basic_client_impl<Tag,version_major,version_minor>;
-
             basic_response<Tag> const request_skeleton(
                 basic_request<Tag> const & request_, 
                 string_type const & method, 
diff --git a/boost/network/protocol/http/client/pimpl.hpp b/boost/network/protocol/http/client/pimpl.hpp
@@ -30,7 +30,6 @@ namespace boost { namespace network { namespace http {
         struct sync_client :
             connection_policy<Tag, version_major, version_minor>::type
         {
-        protected:
             typedef typename string<Tag>::type string_type;
             typedef typename connection_policy<Tag,version_major,version_minor>::type connection_base;
             typedef typename resolver<Tag>::type resolver_type;
@@ -45,6 +44,8 @@ namespace boost { namespace network { namespace http {
                 resolver_(service_)
             {}
 
+            ~sync_client() {}
+
             basic_response<Tag> const request_skeleton(basic_request<Tag> const & request_, string_type method, bool get_body) {
                 typename connection_base::connection_ptr connection_;
                 connection_ = connection_base::get_connection(resolver_, request_);
@@ -80,9 +81,6 @@ namespace boost { namespace network { namespace http {
             >::value
             ));
         
-    private:
-        friend struct basic_client<Tag,version_major,version_minor>;
-        template <class T> friend inline void boost::checked_delete<T>(T*);
         typedef typename impl::client_base<Tag,version_major,version_minor>::type base_type;
         basic_client_impl(bool cache_resolved, bool follow_redirect)
             : base_type(cache_resolved, follow_redirect)
diff --git a/boost/network/protocol/http/client/sync_impl.hpp b/boost/network/protocol/http/client/sync_impl.hpp
@@ -16,7 +16,6 @@ namespace boost { namespace network { namespace http {
         struct sync_client :
             connection_policy<Tag,version_major,version_minor>::type
         {
-        protected:
             typedef 
                 typename connection_policy<Tag,version_major,version_minor>::type
                 connection_base;
@@ -30,8 +29,6 @@ namespace boost { namespace network { namespace http {
                 connection_base::cleanup();
             }
             
-            friend struct basic_client_impl<Tag,version_major,version_minor>;
-
             basic_response<Tag> const request_skeleton(basic_request<Tag> const & request_, string_type method, bool get_body) {
                 typename connection_base::connection_ptr connection_;
                 connection_ = connection_base::get_connection(resolver_, request_);
diff --git a/boost/network/protocol/http/message/directives/uri.hpp b/boost/network/protocol/http/message/directives/uri.hpp
@@ -15,28 +15,32 @@ namespace boost { namespace network { namespace http {
     template <class Tag>
     class basic_request;
 
-    template <class Tag>
-    struct uri_directive {
+    namespace impl {
+
+        template <class Tag>
+        struct uri_directive {
+
+            typedef typename string<Tag>::type string_type;
 
-        typedef typename string<Tag>::type string_type;
+            string_type uri_;
 
-        mutable string_type uri_;
+            explicit uri_directive(string_type const & uri)
+                : uri_(uri) {}
 
-        uri_directive(string_type const & uri)
-            : uri_(uri) {}
+            uri_directive(uri_directive const & other)
+                : uri_(other.uri_) {}
 
-        uri_directive(uri_directive const & other)
-            : uri_(other.uri_) {}
+            template <class T> basic_request<T> const & operator() (basic_request<T> const & request) const {
+                request.uri(uri_);
+                return request;
+            }
 
-        template <class T> basic_request<T> const & operator() (basic_request<T> const & request) const {
-            request.uri(uri_);
-            return request;
-        }
+        };
 
-    };
+    } // namespace impl
 
-    inline uri_directive<tags::default_> const uri(string<tags::default_>::type const & uri_) {
-        return uri_directive<tags::default_>(uri_);
+    inline impl::uri_directive<tags::default_> const uri(string<tags::default_>::type const & uri_) {
+        return impl::uri_directive<tags::default_>(uri_);
     }
 
 } // namespace http
diff --git a/boost/network/protocol/http/message/modifiers/uri.hpp b/boost/network/protocol/http/message/modifiers/uri.hpp
@@ -15,23 +15,9 @@ namespace boost { namespace network { namespace http {
     template <class Tag>
     class basic_request;
 
-    namespace impl {
-
-        template <class Tag, class T>
-        void uri(basic_request<Tag> & response, T const & value, mpl::false_ const &) {
-            response << boost::network::http::uri(value);
-        }
-
-        template <class Tag, class T>
-        void uri(basic_request<Tag> & response, T const & future, mpl::true_ const &) {
-            response.uri(future);
-        }
-
-    } // namespace impl
-
     template <class Tag, class T>
-    void uri(basic_request<Tag> & response, T const & value) {
-        impl::uri(response, value, is_async<Tag>());
+    void uri(basic_request<Tag> & request, T const & value) {
+        request.uri(value);
     }
 
 } // namespace http
diff --git a/boost/network/protocol/http/request.hpp b/boost/network/protocol/http/request.hpp
@@ -14,14 +14,15 @@
 #include <boost/network/message/wrappers.hpp>
 #include <boost/network/protocol/http/message/directives/uri.hpp>
 #include <boost/network/protocol/http/message/modifiers/uri.hpp>
+#include <boost/network/protocol/http/message/wrappers/uri.hpp>
+
 #include <boost/network/protocol/http/message/wrappers/host.hpp>
 #include <boost/network/protocol/http/message/wrappers/headers.hpp>
 #include <boost/network/protocol/http/message/wrappers/path.hpp>
 #include <boost/network/protocol/http/message/wrappers/port.hpp>
 #include <boost/network/protocol/http/message/wrappers/query.hpp>
 #include <boost/network/protocol/http/message/wrappers/anchor.hpp>
 #include <boost/network/protocol/http/message/wrappers/protocol.hpp>
-#include <boost/network/protocol/http/message/wrappers/uri.hpp>
 #include <boost/network/protocol/http/message/wrappers/body.hpp>
 #include <boost/network/protocol/http/message/wrappers/version.hpp>
 #include <boost/network/message/directives.hpp>
diff --git a/boost/network/protocol/http/request_concept.hpp b/boost/network/protocol/http/request_concept.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace network { namespace http {
 
             request << uri(string_type());
 
-            uri(request, string_type());
+            boost::network::http::uri(request, string_type());
 
             (void)host_;
             (void)port_;
diff --git a/boost/network/protocol/http/response.hpp b/boost/network/protocol/http/response.hpp
@@ -19,6 +19,7 @@
 #include <boost/network/protocol/http/message/directives/status.hpp>
 #include <boost/network/protocol/http/message/directives/uri.hpp>
 
+#include <boost/network/protocol/http/message/modifiers/uri.hpp>
 #include <boost/network/protocol/http/message/modifiers/version.hpp>
 #include <boost/network/protocol/http/message/modifiers/status.hpp>
 #include <boost/network/protocol/http/message/modifiers/status_message.hpp>
