Fixing problem with run-over buffer reads.

deanberris · deanberris · commit 0c062a84913a · 2010-01-25T06:56:52.000+08:00
diff --git a/boost/network/protocol/http/connection.hpp b/boost/network/protocol/http/connection.hpp
@@ -132,10 +132,8 @@ namespace boost { namespace network { namespace http {
                         }
 
                         if (content_length != 0) {
-                            async_read(
-                                socket_,
+                            socket_.async_read_some(
                                 boost::asio::buffer(buffer_),
-                                boost::asio::transfer_at_least(content_length),
                                 wrapper_.wrap(
                                     bind(
                                         &connection<Tag,Handler>::handle_read_body_contents,
@@ -210,7 +208,7 @@ namespace boost { namespace network { namespace http {
                 size_t difference = bytes_to_read - bytes_transferred;
                 array<char,BOOST_HTTP_SERVER_BUFFER_SIZE>::iterator start = buffer_.begin(),
                     past_end = start;
-                std::advance(past_end, bytes_to_read);
+                std::advance(past_end, std::min(bytes_to_read,bytes_transferred));
                 request_.body.append(buffer_.begin(), past_end);
                 if (difference == 0) {
                     handler_(request_, response_);
