Commit770858b

committed

Merge pull request#405 from leecoder/0.11-devel

Another fix for#358: async thr wait in basic_client_facade dtor

2 parents65713d8 +c355924 commit770858bCopy full SHA for 770858b

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,12 @@ struct async_client`
`63`	`63`
`64`	`64`	`~async_client()throw() {`
`65`	`65`	`sentinel_.reset();`
	`66`	`+ }`
	`67`	`+`
	`68`	`+voidwait_complete() {`
	`69`	`+ sentinel_.reset();`
`66`	`70`	`if (lifetime_thread_.get()) {`
`67`		`-if (lifetime_thread_->get_id() !=boost::this_thread::get_id()) {`
`68`		`- lifetime_thread_->join();`
`69`		`- }`
	`71`	`+ lifetime_thread_->join();`
`70`	`72`	`lifetime_thread_.reset();`
`71`	`73`	`}`
`72`	`74`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ struct basic_client_facade {`
`37`	`37`	`init_pimpl(options);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+~basic_client_facade() {`
	`41`	`+ pimpl->wait_complete();`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`responsehead(requestconst& request) {`
`41`	`45`	`return pimpl->request_skeleton(request,`
`42`	`46`	`"HEAD",`

Lines changed: 2 additions & 0 deletions

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`	`+voidwait_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,`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,15 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(https_client_get_test, client, client_types) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`#endif`
	`39`	`+`
	`40`	`+BOOST_AUTO_TEST_CASE_TEMPLATE(http_temp_client_get_test, client, client_types) {`
	`41`	`+typename client::requestrequest("http://www.google.co.kr");`
	`42`	`+typename client::response response;`
	`43`	`+BOOST_REQUIRE_NO_THROW ( response =client().get(request) );`
	`44`	`+typename net::headers_range<typename client::response>::type range =headers(response)["Content-Type"];`
	`45`	`+BOOST_CHECK ( !boost::empty(range) );`
	`46`	`+BOOST_REQUIRE_NO_THROW (BOOST_CHECK (body(response).size() !=0 ) );`
	`47`	`+BOOST_CHECK_EQUAL ( response.version().substr(0,7),std::string("HTTP/1.") );`
	`48`	`+BOOST_CHECK_EQUAL ( response.status(),200u );`
	`49`	`+BOOST_CHECK_EQUAL ( response.status_message(),std::string("OK") );`
	`50`	`+}`

Comments

(0)