feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Use field in basic_fields and call sites

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:18 -07:00
parent d5f22adeca
commit ca25eee0dd
18 changed files with 220 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/doc_http_samples.hpp
+8 -8
View File
@@ -136,7 +136,7 @@ receive_expect_100_continue(
response<empty_body> res;
res.version = 11;
res.result(status::continue_);
res.insert("Server", "test");
res.insert(field::server, "test");
write(stream, res, ec);
if(ec)
return;
@@ -198,8 +198,8 @@ send_cgi_response(
res.result(status::ok);
res.version = 11;
res.insert("Server", "Beast");
res.insert("Transfer-Encoding", "chunked");
res.insert(field::server, "Beast");
res.insert(field::transfer_encoding, "chunked");
// No data yet, but we set more = true to indicate
// that it might be coming later. Otherwise the
@@ -307,7 +307,7 @@ void do_server_head(
// Set up the response, starting with the common fields
response<string_body> res;
res.version = 11;
res.insert("Server", "test");
res.insert(field::server, "test");
// Now handle request-specific fields
switch(req.method())
@@ -319,7 +319,7 @@ void do_server_head(
// set of headers that would be sent for a GET request,
// including the Content-Length, except for the body.
res.result(status::ok);
res.insert("Content-Length", payload.size());
res.content_length(payload.size());
// For GET requests, we include the body
if(req.method() == verb::get)
@@ -337,7 +337,7 @@ void do_server_head(
// We return responses indicating an error if
// we do not recognize the request method.
res.result(status::bad_request);
res.insert("Content-Type", "text/plain");
res.insert(field::content_type, "text/plain");
res.body = "Invalid request-method '" + req.method_string().to_string() + "'";
break;
}
@@ -397,11 +397,11 @@ do_head_request(
req.version = 11;
req.method(verb::head);
req.target(target);
req.insert("User-Agent", "test");
req.insert(field::user_agent, "test");
// A client MUST send a Host header field in all HTTP/1.1 request messages.
// https://tools.ietf.org/html/rfc7230#section-5.4
req.insert("Host", "localhost");
req.insert(field::host, "localhost");
// Now send it
write(stream, req, ec);
examples/http_async_server.hpp
+6 -6
View File
@@ -236,8 +236,8 @@ private:
response<string_body> res;
res.result(status::not_found);
res.version = req_.version;
res.insert("Server", "http_async_server");
res.insert("Content-Type", "text/html");
res.insert(field::server, "http_async_server");
res.insert(field::content_type, "text/html");
res.body = "The file '" + path + "' was not found";
res.prepare();
async_write(sock_, std::move(res),
@@ -250,8 +250,8 @@ private:
resp_type res;
res.result(status::ok);
res.version = req_.version;
res.insert("Server", "http_async_server");
res.insert("Content-Type", mime_type(path));
res.insert(field::server, "http_async_server");
res.insert(field::content_type, mime_type(path));
res.body = path;
res.prepare();
async_write(sock_, std::move(res),
@@ -263,8 +263,8 @@ private:
response<string_body> res;
res.result(status::internal_server_error);
res.version = req_.version;
res.insert("Server", "http_async_server");
res.insert("Content-Type", "text/html");
res.insert(field::server, "http_async_server");
res.insert(field::content_type, "text/html");
res.body =
std::string{"An internal error occurred"} + e.what();
res.prepare();
examples/http_crawl.cpp
+2 -2
View File
@@ -40,9 +40,9 @@ int main(int, char const*[])
req.method(verb::get);
req.version = 11;
req.target("/");
req.insert("Host", host + std::string(":") +
req.insert(field::host, host + std::string(":") +
boost::lexical_cast<std::string>(ep.port()));
req.insert("User-Agent", "beast/http");
req.insert(field::user_agent, "beast/http");
req.prepare();
write(sock, req);
response<string_body> res;
examples/http_sync_server.hpp
+6 -6
View File
@@ -166,8 +166,8 @@ private:
response<string_body> res;
res.result(status::not_found);
res.version = req.version;
res.insert("Server", "http_sync_server");
res.insert("Content-Type", "text/html");
res.insert(field::server, "http_sync_server");
res.insert(field::content_type, "text/html");
res.body = "The file '" + path + "' was not found";
res.prepare();
write(sock, res, ec);
@@ -181,8 +181,8 @@ private:
res.result(status::ok);
res.reason("OK");
res.version = req.version;
res.insert("Server", "http_sync_server");
res.insert("Content-Type", mime_type(path));
res.insert(field::server, "http_sync_server");
res.insert(field::content_type, mime_type(path));
res.body = path;
res.prepare();
write(sock, res, ec);
@@ -195,8 +195,8 @@ private:
res.result(status::internal_server_error);
res.reason("Internal Error");
res.version = req.version;
res.insert("Server", "http_sync_server");
res.insert("Content-Type", "text/html");
res.insert(field::server, "http_sync_server");
res.insert(field::content_type, "text/html");
res.body =
std::string{"An internal error occurred: "} + e.what();
res.prepare();
examples/ssl/http_ssl_example.cpp
+2 -2
View File
@@ -38,9 +38,9 @@ int main()
req.method(beast::http::verb::get);
req.target("/");
req.version = 11;
req.insert("Host", host + ":" +
req.insert(beast::http::field::host, host + ":" +
boost::lexical_cast<std::string>(sock.remote_endpoint().port()));
req.insert("User-Agent", "Beast");
req.insert(beast::http::field::user_agent, "Beast");
req.prepare();
beast::http::write(stream, req);