Reverting unnecessary assertion.

deanberris · glynos · commit 5eb9b5550a10 · 2012-03-02T19:21:15.000+01:00
diff --git a/boost/network/protocol/http/client/connection/async_normal.hpp b/boost/network/protocol/http/client/connection/async_normal.hpp
@@ -199,7 +199,7 @@ namespace boost { namespace network { namespace http { namespace impl {
     }
 
     void handle_received_data(state_t state, bool get_body, body_callback_function_type callback, boost::system::error_code const & ec, std::size_t bytes_transferred) {
-      if (!ec || ec == boost::asio::error::eof) {
+        if (!ec || ec == boost::asio::error::eof) {
         logic::tribool parsed_ok;
         size_t remainder;
         switch(state) {
diff --git a/boost/network/protocol/http/client/connection/sync_base.hpp b/boost/network/protocol/http/client/connection/sync_base.hpp
@@ -132,7 +132,6 @@ namespace boost { namespace network { namespace http { namespace impl {
                     bool stopping = false;
                     do {
                         std::size_t chunk_size_line = read_until(socket_, response_buffer, "\r\n", error);
-                        std::size_t tooMuchRead = response_buffer.size() - chunk_size_line;
                         if ((chunk_size_line == 0) && (error != boost::asio::error::eof)) throw boost::system::system_error(error);
                         std::size_t chunk_size = 0;
                         string_type data;
@@ -149,8 +148,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                         } else {
                             bool stopping_inner = false;
                             do {
-                                assert( tooMuchRead <= chunk_size + 2 );
-                                std::size_t chunk_bytes_read = read(socket_, response_buffer, boost::asio::transfer_at_least(chunk_size + 2 - tooMuchRead), error);
+                                std::size_t chunk_bytes_read = read(socket_, response_buffer, boost::asio::transfer_at_least(chunk_size), error);
                                 if (chunk_bytes_read == 0) {
                                     if (error != boost::asio::error::eof) throw boost::system::system_error(error);
                                     stopping_inner = true;
diff --git a/libs/network/test/http/client_get_test.cpp b/libs/network/test/http/client_get_test.cpp
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(https_client_get_test, client, client_types) {
     typename client::response response_ = client_.get(request);
     typename net::headers_range<typename client::response>::type range = headers(response_)["Content-Type"];
     BOOST_CHECK ( boost::begin(range) != boost::end(range) );
-    BOOST_REQUIRE_NO_THROW ( BOOST_CHECK( body(response_).size() != 0 ) );
+    BOOST_CHECK( body(response_).size() != 0 );
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ namespace boost { namespace network { namespace http { namespace impl {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`void handle_received_data(state_t state, bool get_body, body_callback_function_type callback, boost::system::error_code const & ec, std::size_t bytes_transferred) {`
`202`		`- if (!ec \|\| ec == boost::asio::error::eof) {`
	`202`	`+ if (!ec \|\| ec == boost::asio::error::eof) {`
`203`	`203`	`logic::tribool parsed_ok;`
`204`	`204`	`size_t remainder;`
`205`	`205`	`switch(state) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(https_client_get_test, client, client_types) {`
`32`	`32`	`typename client::response response_ = client_.get(request);`
`33`	`33`	`typename net::headers_range<typename client::response>::type range = headers(response_)["Content-Type"];`
`34`	`34`	`BOOST_CHECK ( boost::begin(range) != boost::end(range) );`
`35`		`- BOOST_REQUIRE_NO_THROW ( BOOST_CHECK( body(response_).size() != 0 ) );`
	`35`	`+ BOOST_CHECK( body(response_).size() != 0 );`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`#endif`