NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit0ba2a8d

committed

Adding explicit calls to close sockets from the client side.

1 parent2c6bc4c commit0ba2a8dCopy full SHA for 0ba2a8d

File tree

2 files changed

+27

-13

lines changed

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

2 files changed

+27

-13

lines changed

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

Lines changed: 20 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,17 +216,23 @@ namespace boost { namespace network { namespace http { namespace impl {`
`216`	`216`
`217`	`217`	`voidread_body(basic_response<Tag> & response_, boost::asio::streambuf & response_buffer) {`
`218`	`218`	`connection_base::read_body(socket_, response_, response_buffer);`
	`219`	`+typename headers_range<basic_response<Tag> >::type connection_range =`
	`220`	`+headers(response_)["Connection"];`
	`221`	`+if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(begin(connection_range)->second,"close")) {`
	`222`	`+close_socket();`
	`223`	`+ }elseif (version_major ==1 && version_minor ==0) {`
	`224`	`+close_socket();`
	`225`	`+ }`
`219`	`226`	`}`
`220`	`227`
`221`	`228`	`boolis_open() {`
`222`	`229`	`return socket_.lowest_layer().is_open();`
`223`	`230`	`}`
`224`	`231`
`225`	`232`	`voidclose_socket() {`
`226`		`-if (is_open()) {`
`227`		`- boost::system::error_code ignored;`
`228`		`- socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
`229`		`- }`
	`233`	`+ boost::system::error_code ignored;`
	`234`	`+ socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
	`235`	`+ socket_.lowest_layer().close(ignored);`
`230`	`236`	`}`
`231`	`237`
`232`	`238`	`~https_sync_connection() {`
`@@ -272,15 +278,21 @@ namespace boost { namespace network { namespace http { namespace impl {`
`272`	`278`
`273`	`279`	`voidread_body(basic_response<Tag> & response_, boost::asio::streambuf & response_buffer) {`
`274`	`280`	`connection_base::read_body(socket_, response_, response_buffer);`
	`281`	`+typename headers_range<basic_response<Tag> >::type connection_range =`
	`282`	`+headers(response_)["Connection"];`
	`283`	`+if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(begin(connection_range)->second,"close")) {`
	`284`	`+close_socket();`
	`285`	`+ }elseif (version_major ==1 && version_minor ==0) {`
	`286`	`+close_socket();`
	`287`	`+ }`
`275`	`288`	`}`
`276`	`289`
`277`	`290`	`boolis_open() {return socket_.is_open(); }`
`278`	`291`
`279`	`292`	`voidclose_socket() {`
`280`		`-if (is_open()) {`
`281`		`- boost::system::error_code ignored;`
`282`		`- socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
`283`		`- }`
	`293`	`+ boost::system::error_code ignored;`
	`294`	`+ socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);`
	`295`	`+ socket_.close(ignored);`
`284`	`296`	`}`
`285`	`297`
`286`	`298`	`~http_sync_connection() {`

`‎boost/network/protocol/http/policies/pooled_connection.hpp‎`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,13 @@ namespace boost { namespace network { namespace http {`
`88`	`88`	`pimpl->read_body(response_, response_buffer);`
`89`	`89`	`}`
`90`	`90`
	`91`	`+typename headers_range<basic_response<Tag> >::type connection_range =headers(response_)["Connection"];`
	`92`	`+if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&begin(connection_range)->second ==string_type("close")) {`
	`93`	`+ pimpl->close_socket();`
	`94`	`+ }elseif (version_major ==1 && version_minor ==0) {`
	`95`	`+ pimpl->close_socket();`
	`96`	`+ }`
	`97`	`+`
`91`	`98`	`if (connection_follow_redirect_) {`
`92`	`99`	`boost::uint16_t status = response_.status();`
`93`	`100`	`if (status >=300 && status <=307) {`
`@@ -103,11 +110,6 @@ namespace boost { namespace network { namespace http {`
`103`	`110`	`}`
`104`	`111`	`}`
`105`	`112`
`106`		`-typename headers_range<basic_response<Tag> >::type connection_range =headers(response_)["Connection"];`
`107`		`-if (!empty(connection_range) &&begin(connection_range)->second ==string_type("close")) {`
`108`		`- pimpl->close_socket();`
`109`		`- }`
`110`		`-`
`111`	`113`	`return response_;`
`112`	`114`	`}while(true);`
`113`	`115`	`}`

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!

Commit0ba2a8d

File tree

2 files changed

2 files changed

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

`‎boost/network/protocol/http/policies/pooled_connection.hpp‎`

0 commit comments