Fixing bugs with HTTP Server implementation.

deanberris · deanberris · commit 3562f2787271 · 2010-01-25T05:56:52.000+08:00
diff --git a/boost/network/protocol/http/connection.hpp b/boost/network/protocol/http/connection.hpp
@@ -210,7 +210,10 @@ namespace boost { namespace network { namespace http {
         void handle_read_body_contents(boost::system::error_code const & ec, size_t bytes_to_read, size_t bytes_transferred) {
             if (!ec) {
                 size_t difference = bytes_to_read - bytes_transferred;
-                request_.body.append(buffer_.begin(), buffer_.end());
+                array<char,BOOST_HTTP_SERVER_BUFFER_SIZE>::iterator start = buffer_.begin(),
+                    past_end = start;
+                std::advance(past_end, bytes_to_read);
+                request_.body.append(buffer_.begin(), past_end);
                 if (difference == 0) {
                     handler_(request_, response_);
                     boost::asio::async_write(
@@ -246,6 +249,7 @@ namespace boost { namespace network { namespace http {
             if (!ec) {
                 boost::system::error_code ignored_ec;
                 socket_.shutdown(tcp::socket::shutdown_both, ignored_ec);
+                socket_.close(ignored_ec);
             }
         }
 
diff --git a/boost/network/protocol/http/impl/request.hpp b/boost/network/protocol/http/impl/request.hpp
@@ -34,6 +34,7 @@ namespace boost { namespace network { namespace http {
         boost::network::uri::http::uri uri_;
 
     public:
+        typedef Tag tag;
         typedef typename string<Tag>::type string_type;
 
         explicit basic_request(string_type const & uri_)
@@ -100,6 +101,7 @@ namespace boost { namespace network { namespace http {
      */
     template <>
     struct basic_request<tags::http_server> {
+        typedef tags::http_server tag;
         typedef string<tags::http_server>::type string_type;
         typedef vector<tags::http_server>::apply<request_header>::type vector_type;
         string_type method;
