Adding explicit calls to close sockets from the client side.

deanberris · deanberris · commit 16a66279907f · 2010-01-30T07:10:13.000+08:00
diff --git a/boost/network/protocol/http/impl/sync_connection_base.hpp b/boost/network/protocol/http/impl/sync_connection_base.hpp
@@ -216,17 +216,23 @@ namespace boost { namespace network { namespace http { namespace impl {
 
         void read_body(basic_response<Tag> & response_, boost::asio::streambuf & response_buffer) {
             connection_base::read_body(socket_, response_, response_buffer);    
+            typename headers_range<basic_response<Tag> >::type connection_range =
+                headers(response_)["Connection"];
+            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(begin(connection_range)->second, "close")) {
+                close_socket();
+            } else if (version_major == 1 && version_minor == 0) {
+                close_socket();
+            }
         }
 
         bool is_open() { 
             return socket_.lowest_layer().is_open(); 
         }
 
         void close_socket() { 
-            if (is_open()) {
-                boost::system::error_code ignored;
-                socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);
-            } 
+            boost::system::error_code ignored;
+            socket_.lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);
+            socket_.lowest_layer().close(ignored);
         }
 
         ~https_sync_connection() {
@@ -272,15 +278,21 @@ namespace boost { namespace network { namespace http { namespace impl {
 
         void read_body(basic_response<Tag> & response_, boost::asio::streambuf & response_buffer) {
             connection_base::read_body(socket_, response_, response_buffer);
+            typename headers_range<basic_response<Tag> >::type connection_range =
+                headers(response_)["Connection"];
+            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(begin(connection_range)->second, "close")) {
+                close_socket();
+            } else if (version_major == 1 && version_minor == 0) {
+                close_socket();
+            }
         }
 
         bool is_open() { return socket_.is_open(); }
 
         void close_socket() {
-            if (is_open()) {
-                boost::system::error_code ignored;
-                socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);
-            }
+            boost::system::error_code ignored;
+            socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored);
+            socket_.close(ignored);
         }
 
         ~http_sync_connection() {
diff --git a/boost/network/protocol/http/policies/pooled_connection.hpp b/boost/network/protocol/http/policies/pooled_connection.hpp
@@ -88,6 +88,13 @@ namespace boost { namespace network { namespace http {
                         pimpl->read_body(response_, response_buffer);
                     }
 
+                    typename headers_range<basic_response<Tag> >::type connection_range = headers(response_)["Connection"];
+                    if (version_major == 1 && version_minor == 1 && !empty(connection_range) && begin(connection_range)->second == string_type("close")) {
+                        pimpl->close_socket();
+                    } else if (version_major == 1 && version_minor == 0) {
+                        pimpl->close_socket();
+                    }
+
                     if (connection_follow_redirect_) {
                         boost::uint16_t status = response_.status();
                         if (status >= 300 && status <= 307) {
@@ -103,11 +110,6 @@ namespace boost { namespace network { namespace http {
                         }
                     }
 
-                    typename headers_range<basic_response<Tag> >::type connection_range = headers(response_)["Connection"];
-                    if (!empty(connection_range) && begin(connection_range)->second == string_type("close")) {
-                        pimpl->close_socket();
-                    }
-
                     return response_;
                 } while(true);
             }

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`	`+ } else if (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`	`}`