Merge branch 'devel-0.9' of https://github.com/Mike-ECT/cpp-netlib into 0.9-devel

deanberris · deanberris · commit 400e3e34b4e7 · 2012-02-18T12:54:48.000-08:00
diff --git a/boost/network/protocol/http/client/connection/sync_base.hpp b/boost/network/protocol/http/client/connection/sync_base.hpp
@@ -132,6 +132,7 @@ 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 body_already_read = 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;
@@ -148,7 +149,8 @@ namespace boost { namespace network { namespace http { namespace impl {
                         } else {
                             bool stopping_inner = false;
                             do {
-                                std::size_t chunk_bytes_read = read(socket_, response_buffer, boost::asio::transfer_at_least(chunk_size + 2), error);
+                                BOOST_ASSERT( body_already_read <= chunk_size + 2 );
+                                std::size_t chunk_bytes_read = read(socket_, response_buffer, boost::asio::transfer_at_least(chunk_size + 2 - body_already_read), error);
                                 if (chunk_bytes_read == 0) {
                                     if (error != boost::asio::error::eof) throw boost::system::system_error(error);
                                     stopping_inner = true;
