Merge pull request cpp-netlib#327 from mepahoo/0.10-devel-integration

deanberris · deanberris · commit 472a4ad04b60 · 2013-11-24T06:00:34.000-08:00
fixed read timeout in chucked content response for sync keep-alive client
diff --git a/boost/network/protocol/http/client/connection/sync_base.hpp b/boost/network/protocol/http/client/connection/sync_base.hpp
@@ -168,15 +168,18 @@ struct sync_connection_base_impl {
           } else {
             bool stopping_inner = false;
             do {
-              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;
+              if (response_buffer.size() < (chunk_size+2)){
+                std::size_t bytes_to_read = (chunk_size+2) - response_buffer.size();
+                std::size_t chunk_bytes_read =
+                    read(socket_,
+                         response_buffer,
+                         boost::asio::transfer_at_least(bytes_to_read),
+                         error);
+                if (chunk_bytes_read == 0) {
+                  if (error != boost::asio::error::eof)
+                    throw boost::system::system_error(error);
+                  stopping_inner = true;
+                }
               }
 
               std::istreambuf_iterator<char> eos;
