Commit00b8cf8

committed

Merge branch 'canonical-0.9-devel' into 0.9-devel

2 parentsc78ca0d +05c3427 commit00b8cf8Copy full SHA for 00b8cf8

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ namespace boost { namespace network {`
`83`	`83`	`_headers.erase(key);`
`84`	`84`	`}`
`85`	`85`
`86`		`- headers_container_type &headers()const {`
	`86`	`+ headers_container_typeconst&headers()const {`
`87`	`87`	`return _headers;`
`88`	`88`	`}`
`89`	`89`
`@@ -95,7 +95,7 @@ namespace boost { namespace network {`
`95`	`95`	`_body = body_;`
`96`	`96`	`}`
`97`	`97`
`98`		`- string_typebody()const {`
	`98`	`+ string_typeconst &body()const {`
`99`	`99`	`return _body;`
`100`	`100`	`}`
`101`	`101`
`@@ -107,7 +107,7 @@ namespace boost { namespace network {`
`107`	`107`	`_source = source_;`
`108`	`108`	`}`
`109`	`109`
`110`		`- string_typesource()const {`
	`110`	`+ string_typeconst &source()const {`
`111`	`111`	`return _source;`
`112`	`112`	`}`
`113`	`113`
`@@ -119,7 +119,7 @@ namespace boost { namespace network {`
`119`	`119`	`_destination = destination_;`
`120`	`120`	`}`
`121`	`121`
`122`		`- string_typedestination()const {`
	`122`	`+ string_typeconst &destination()const {`
`123`	`123`	`return _destination;`
`124`	`124`	`}`
`125`	`125`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,7 @@ namespace boost { namespace network { namespace http {`
`148`	`148`
`149`	`149`	`~async_connection()throw () {`
`150`	`150`	`boost::system::error_code ignored;`
`151`		`- socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored);`
`152`		`- socket_.close(ignored);`
	`151`	`+ socket_.shutdown(asio::ip::tcp::socket::shutdown_receive, ignored);`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`/** Function: template <class Range> set_headers(Range headers)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,7 @@ namespace boost { namespace network { namespace http {`
`247`	`247`	`if (!ec) {`
`248`	`248`	`using boost::asio::ip::tcp;`
`249`	`249`	`boost::system::error_code ignored_ec;`
`250`		`- socket_.shutdown(tcp::socket::shutdown_both, ignored_ec);`
`251`		`- socket_.close(ignored_ec);`
	`250`	`+ socket_.shutdown(tcp::socket::shutdown_receive, ignored_ec);`
`252`	`251`	`}`
`253`	`252`	`}`
`254`	`253`

Comments

(0)