Commit01743e2

committed

Merge pull request#431 from eakraly/0.11-devel

Conditional async_client liftetime_thread creation and fix for URI swap bug.

2 parents8d7972b +addf968 commit01743e2Copy full SHA for 01743e2

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,9 @@ struct async_client`
`57`	`57`	`always_verify_peer_(always_verify_peer) {`
`58`	`58`	`connection_base::resolver_strand_.reset(`
`59`	`59`	`newboost::asio::io_service::strand(service_));`
`60`		`- lifetime_thread_.reset(newboost::thread(`
`61`		`-boost::bind(&boost::asio::io_service::run, &service_)));`
	`60`	`+if(!service)`
	`61`	`+ lifetime_thread_.reset(newboost::thread(`
	`62`	`+boost::bind(&boost::asio::io_service::run, &service_)));`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`~async_client()throw() {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class BOOST_URI_DECL uri {`
`87`	`87`
`88`	`88`	`voidswap(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`

Comments

(0)