Use field in basic_fields and call sites

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
+3 -3
View File
@@ -70,7 +70,7 @@ public:
req.version = 11;
req.method("POST");
req.target("/");
req.insert("User-Agent", "test");
req.insert(field::user_agent, "test");
req.body = "Hello, world!";
req.prepare();
@@ -103,7 +103,7 @@ public:
req.version = 11;
req.method("POST");
req.target("/");
req.insert("User-Agent", "test");
req.insert(field::user_agent, "test");
req.body = "Hello, world!";
req.prepare();
@@ -155,7 +155,7 @@ public:
req.version = 11;
req.method(verb::get);
req.target("/");
req.insert("User-Agent", "test");
req.insert(field::user_agent, "test");
error_code ec;
write_ostream(os, req, ec);
BEAST_EXPECTS(! ec, ec.message());
+4 -4
View File
@@ -36,8 +36,8 @@ void fxx() {
req.version = 11; // HTTP/1.1
req.method(verb::get);
req.target("/index.htm");
req.insert("Accept", "text/html");
req.insert("User-Agent", "Beast");
req.insert(field::accept, "text/html");
req.insert(field::user_agent, "Beast");
req.prepare(connection::close);
//]
@@ -49,7 +49,7 @@ void fxx() {
response<string_body> res;
res.version = 11; // HTTP/1.1
res.result(status::ok);
res.insert("Server", "Beast");
res.insert(field::server, "Beast");
res.body = "Hello, world!";
res.prepare();
@@ -101,7 +101,7 @@ void fxx() {
response<string_body> res;
res.version = 11;
res.result(status::ok);
res.insert("Server", "Beast");
res.insert(field::server, "Beast");
res.body = "Hello, world!";
write(sock, res, ec);
+2 -2
View File
@@ -115,14 +115,14 @@ public:
{
header<true, fields> h;
h.insert("User-Agent", "test");
h.insert(field::user_agent, "test");
message<true, one_arg_body, fields> m{Arg1{}, h};
BEAST_EXPECT(h["User-Agent"] == "test");
BEAST_EXPECT(m["User-Agent"] == "test");
}
{
header<true, fields> h;
h.insert("User-Agent", "test");
h.insert(field::user_agent, "test");
message<true, one_arg_body, fields> m{Arg1{}, std::move(h)};
BEAST_EXPECT(! h.exists("User-Agent"));
BEAST_EXPECT(m["User-Agent"] == "test");
+17 -17
View File
@@ -293,7 +293,7 @@ public:
m.version = 10;
m.result(status::ok);
m.reason("OK");
m.insert("Server", "test");
m.insert(field::server, "test");
m.insert("Content-Length", "5");
m.body = "*****";
error_code ec;
@@ -312,7 +312,7 @@ public:
m.version = 11;
m.result(status::ok);
m.reason("OK");
m.insert("Server", "test");
m.insert(field::server, "test");
m.insert("Transfer-Encoding", "chunked");
m.body = "*****";
error_code ec;
@@ -345,7 +345,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.insert("Content-Length", "5");
m.body = "*****";
try
@@ -376,7 +376,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.insert("Transfer-Encoding", "chunked");
m.body = "*****";
error_code ec;
@@ -409,7 +409,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.insert("Transfer-Encoding", "chunked");
m.body = "*****";
error_code ec;
@@ -442,7 +442,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.insert("Content-Length", "5");
m.body = "*****";
error_code ec;
@@ -470,7 +470,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.insert("Content-Length", "5");
m.body = "*****";
error_code ec;
@@ -499,7 +499,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare();
BEAST_EXPECT(str(m) ==
@@ -516,7 +516,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare(connection::keep_alive);
BEAST_EXPECT(str(m) ==
@@ -534,7 +534,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
try
{
@@ -552,7 +552,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 10;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare();
test::string_ostream ss(ios_);
@@ -572,7 +572,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare();
BEAST_EXPECT(str(m) ==
@@ -589,7 +589,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare(connection::close);
test::string_ostream ss(ios_);
@@ -611,7 +611,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.prepare(connection::upgrade);
BEAST_EXPECT(str(m) ==
"GET / HTTP/1.1\r\n"
@@ -626,7 +626,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
m.prepare();
test::string_ostream ss(ios_);
@@ -651,7 +651,7 @@ public:
m.method(verb::get);
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
m.insert(field::user_agent, "test");
m.body = "*";
BEAST_EXPECT(boost::lexical_cast<std::string>(m) ==
"GET / HTTP/1.1\r\nUser-Agent: test\r\n\r\n*");
@@ -785,7 +785,7 @@ public:
m0.version = 11;
m0.result(status::ok);
m0.reason("OK");
m0.insert("Server", "test");
m0.insert(field::server, "test");
m0.body.s = "Hello, world!\n";
{