boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-02 06:15:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for basic_parser::skip(true) and docs

Browse Source 
fix #742
This commit is contained in:
Vinnie Falco
2017-08-15 06:58:33 -07:00
parent f570593a01
commit 76feb4afd4
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -3,6 +3,10 @@ Version 106:
* Dynamic buffer input areas are mutable * Dynamic buffer input areas are mutable
* Add flat_static_buffer::reset * Add flat_static_buffer::reset
HTTP:
* Fix for basic_parser::skip(true) and docs
WebSocket: WebSocket:
* websocket test improvements * websocket test improvements

6
doc/qbk/05_http_examples.qbk
View File

@@ -78,7 +78,11 @@ The
[@https://tools.ietf.org/html/rfc7231#section-4.3.2 HEAD request] [@https://tools.ietf.org/html/rfc7231#section-4.3.2 HEAD request]
method indicates to the server that the client wishes to receive the method indicates to the server that the client wishes to receive the
entire header that would be delivered if the method was GET, except entire header that would be delivered if the method was GET, except
that the body is omitted. that the body is omitted. When a client wishes to receive the response
to a HEAD request, it is necessary to inform the parser not to expect
a body. This is done by calling
[link beast.ref.boost__beast__http__basic_parser.skip `basic_parser::skip`]
with the value `true`, as shown in this example:
[example_http_do_head_request] [example_http_do_head_request]

17
example/doc/http_examples.hpp
View File

@@ -411,11 +411,18 @@ do_head_request(
return {}; return {};
// Create a parser to read the response. // Create a parser to read the response.
// Responses to HEAD requests MUST NOT include // We use the `empty_body` type since
// a body, so we use the `empty_body` type and // a response to a HEAD request MUST NOT
// only attempt to read the header. // include a body.
parser<false, empty_body> p; response_parser<empty_body> p;
read_header(stream, buffer, p, ec);
// Inform the parser that there will be no body.
p.skip(true);
// Read the message. Even though fields like
// Content-Length or Transfer-Encoding may be
// set, the message will not contain a body.
read(stream, buffer, p, ec);
if(ec) if(ec)
return {}; return {};

4
include/boost/beast/http/impl/basic_parser.ipp
View File

@@ -587,10 +587,8 @@ finish_header(error_code& ec, std::false_type)
// treat the message as not having a body. // treat the message as not having a body.
// https://github.com/boostorg/beast/issues/692 // https://github.com/boostorg/beast/issues/692
state_ = state::complete; state_ = state::complete;
return;
} }
else if(f_ & flagContentLength)
if(f_ & flagContentLength)
{ {
if(len_ > body_limit_) if(len_ > body_limit_)
{ {

4
test/beast/http/basic_parser.cpp
View File

@@ -325,8 +325,8 @@ public:
"GET / HTTP/1.1\r\n" "GET / HTTP/1.1\r\n"
"f: " + s + "\r\n" "f: " + s + "\r\n"
"\r\n"; "\r\n";
parsegrind<parser<true, string_body>>(m, parsegrind<request_parser<string_body>>(m,
[&](parser<true, string_body> const& p) [&](request_parser<string_body> const& p)
{ {
BEAST_EXPECT(p.get()["f"] == value); BEAST_EXPECT(p.get()["f"] == value);
}); });

2
test/beast/http/read.cpp
View File

@@ -385,7 +385,7 @@ public:
"0\r\n\r\n"; "0\r\n\r\n";
error_code ec; error_code ec;
flat_buffer fb; flat_buffer fb;
parser<false, dynamic_body> p; response_parser<dynamic_body> p;
read(c.server, fb, p, ec); read(c.server, fb, p, ec);
BEAST_EXPECTS(! ec, ec.message()); BEAST_EXPECTS(! ec, ec.message());
} }