More fixes towards a working HTTP asynchronous client implementation.

deanberris · deanberris · commit d6f65061e7e9 · 2010-06-24T02:52:29.000+08:00
diff --git a/boost/network/protocol/http/impl/async_connection_base.hpp b/boost/network/protocol/http/impl/async_connection_base.hpp
@@ -19,19 +19,20 @@ namespace boost { namespace network { namespace http { namespace impl {
     struct async_connection_base {
         typedef typename resolver_policy<Tag>::type resolver_base;
         typedef typename resolver_base::resolver_type resolver_type;
+        typedef typename resolver_base::resolve_function resolve_function;
         typedef typename string<Tag>::type string_type;
         typedef basic_request<Tag> request;
         typedef basic_response<Tag> response;
         
-        static async_connection_base<Tag,version_major,version_minor> * new_connection(boost::shared_ptr<resolver_type> resolver, bool https) {
+        static async_connection_base<Tag,version_major,version_minor> * new_connection(resolve_function resolve, boost::shared_ptr<resolver_type> resolver, bool https) {
             if (https) {
 #ifdef BOOST_NETWORK_ENABLE_HTTPS
                 return dynamic_cast<async_connection_base<Tag,version_major,version_minor>*>(new https_async_connection<Tag,version_major,version_minor>(resolver));
 #else
                 throw std::runtime_error("HTTPS not supported.");
 #endif
             }
-            return dynamic_cast<async_connection_base<Tag,version_major,version_minor>*>(new http_async_connection<Tag,version_major,version_minor>(resolver));
+            return dynamic_cast<async_connection_base<Tag,version_major,version_minor>*>(new http_async_connection<Tag,version_major,version_minor>(resolve, resolver));
         }
 
         virtual response start(request const & request, string_type const & method, bool get_body) = 0;
diff --git a/boost/network/protocol/http/policies/async_resolver.hpp b/boost/network/protocol/http/policies/async_resolver.hpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/asio/placeholders.hpp>
 
 namespace boost { namespace network { namespace http { namespace policies {
 
@@ -41,7 +42,7 @@ namespace boost { namespace network { namespace http { namespace policies {
             if (cache_resolved_) {
                 endpoint_cache::iterator iter = 
                     endpoint_cache_.find(boost::to_lower_copy(host));
-                if (iter != resolved_map_.end()) {
+                if (iter != endpoint_cache_.end()) {
                     boost::system::error_code ignored;
                     once_resolved(ignored, iter->second);
                     return;
