Merge pull request #431 from eakraly/0.11-devel

deanberris · deanberris · commit 01743e2c6bd5 · 2014-09-02T12:07:45.000+10:00
Conditional async_client liftetime_thread creation and fix for URI swap bug.
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -57,8 +57,9 @@ struct async_client
         always_verify_peer_(always_verify_peer) {
     connection_base::resolver_strand_.reset(
         new boost::asio::io_service::strand(service_));
-    lifetime_thread_.reset(new boost::thread(
-        boost::bind(&boost::asio::io_service::run, &service_)));
+    if(!service)
+        lifetime_thread_.reset(new boost::thread(
+            boost::bind(&boost::asio::io_service::run, &service_)));
   }
 
   ~async_client() throw() {
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -87,7 +87,7 @@ class BOOST_URI_DECL uri {
 
     void swap(uri &other) {
         boost::swap(uri_, other.uri_);
-        boost::swap(uri_parts_, other.uri_parts_);
+	other.parse();
         boost::swap(is_valid_, other.is_valid_);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class BOOST_URI_DECL uri {`
`87`	`87`
`88`	`88`	`void swap(uri &other) {`
`89`	`89`	`boost::swap(uri_, other.uri_);`
`90`		`- boost::swap(uri_parts_, other.uri_parts_);`
	`90`	`+ other.parse();`
`91`	`91`	`boost::swap(is_valid_, other.is_valid_);`
`92`	`92`	`}`
`93`	`93`