NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit01313fb

committed

Making socket shutdown explicit.

We want to make sure that while connections are still open to remoteservers, we shut the socket down before closing it when the socketobject is destroyed.

1 parenta947e52 commit01313fbCopy full SHA for 01313fb

File tree

1 file changed

+15

-6

lines changed

boost/network/protocol/http/impl
- sync_connection_base.hpp

1 file changed

+15

-6

lines changed

`‎boost/network/protocol/http/impl/sync_connection_base.hpp`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,12 +224,14 @@ namespace boost { namespace network { namespace http { namespace impl {`
`224`	`224`
`225`	`225`	`voidclose_socket() {`
`226`	`226`	`if (is_open()) {`
`227`		`-socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both);`
`228`		`- socket_.lowest_layer().close();`
	`227`	`+ boost::system::error_code ignored;`
	`228`	`+ socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
`232`		`-~https_sync_connection() {}`
	`232`	`+~https_sync_connection() {`
	`233`	`+close_socket();`
	`234`	`+ }`
`233`	`235`
`234`	`236`	`private:`
`235`	`237`	`resolver_type & resolver_;`
`@@ -250,8 +252,6 @@ namespace boost { namespace network { namespace http { namespace impl {`
`250`	`252`	`http_sync_connection(resolver_type & resolver, resolver_function_type resolve)`
`251`	`253`	`: connection_base(), resolver_(resolver), resolve_(resolve), socket_(resolver.io_service()) { }`
`252`	`254`
`253`		`-~http_sync_connection() {}`
`254`		`-`
`255`	`255`	`voidinit_socket(string_typeconst & hostname, string_typeconst & port) {`
`256`	`256`	`connection_base::init_socket(socket_, resolver_, hostname, port, resolve_);`
`257`	`257`	`}`
`@@ -276,7 +276,16 @@ namespace boost { namespace network { namespace http { namespace impl {`
`276`	`276`
`277`	`277`	`boolis_open() {return socket_.is_open(); }`
`278`	`278`
`279`		`-voidclose_socket() {if (is_open()) { socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both); socket_.close(); } }`
	`279`	`+voidclose_socket() {`
	`280`	`+if (is_open()) {`
	`281`	`+ boost::system::error_code ignored;`
	`282`	`+ socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
	`283`	`+ }`
	`284`	`+ }`
	`285`	`+`
	`286`	`+~http_sync_connection() {`
	`287`	`+close_socket();`
	`288`	`+ }`
`280`	`289`
`281`	`290`	`private:`
`282`	`291`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit01313fb

File tree

1 file changed

1 file changed

`‎boost/network/protocol/http/impl/sync_connection_base.hpp`

0 commit comments