Async thr wait in basic_client_facade dtor

leecoder · jellevdd · commit 2691d103a8d3 · 2014-06-26T16:14:48.000+02:00
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -63,10 +63,12 @@ struct async_client
 
   ~async_client() throw() {
     sentinel_.reset();
+  }
+
+  void wait_complete() {
+    sentinel_.reset();
     if (lifetime_thread_.get()) {
-      if (lifetime_thread_->get_id() != boost::this_thread::get_id()) {
-        lifetime_thread_->join();
-      }
+      lifetime_thread_->join();
       lifetime_thread_.reset();
     }
   }
diff --git a/boost/network/protocol/http/client/facade.hpp b/boost/network/protocol/http/client/facade.hpp
@@ -37,6 +37,10 @@ struct basic_client_facade {
     init_pimpl(options);
   }
 
+  virtual ~basic_client_facade() {
+    pimpl->wait_complete();
+  }
+
   response head(request const& request) {
     return pimpl->request_skeleton(request,
                                    "HEAD",
diff --git a/boost/network/protocol/http/client/sync_impl.hpp b/boost/network/protocol/http/client/sync_impl.hpp
@@ -73,6 +73,8 @@ struct sync_client
     service_ptr.reset();
   }
 
+  void wait_complete() {}
+
   basic_response<Tag> request_skeleton(basic_request<Tag> const& request_,
                                        string_type method, bool get_body,
                                        body_callback_function_type callback,
diff --git a/libs/network/test/http/client_get_test.cpp b/libs/network/test/http/client_get_test.cpp
@@ -36,3 +36,15 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(https_client_get_test, client, client_types) {
 }
 
 #endif
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_temp_client_get_test, client, client_types) {
+    typename client::request request("http://www.google.co.kr");
+    typename client::response response;
+    BOOST_REQUIRE_NO_THROW ( response = client().get(request) );
+    typename net::headers_range<typename client::response>::type range = headers(response)["Content-Type"];
+    BOOST_CHECK ( !boost::empty(range) );
+    BOOST_REQUIRE_NO_THROW ( BOOST_CHECK ( body(response).size() != 0 ) );
+    BOOST_CHECK_EQUAL ( response.version().substr(0,7), std::string("HTTP/1.") );
+    BOOST_CHECK_EQUAL ( response.status(), 200u );
+    BOOST_CHECK_EQUAL ( response.status_message(), std::string("OK") );
+}

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ struct sync_client`
`73`	`73`	`service_ptr.reset();`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ void wait_complete() {}`
	`77`	`+`
`76`	`78`	`basic_response<Tag> request_skeleton(basic_request<Tag> const& request_,`
`77`	`79`	`string_type method, bool get_body,`
`78`	`80`	`body_callback_function_type callback,`