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

Refactor prepare (API Change)

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:18 -07:00
parent 2af19481a9
commit 2df6783468
26 changed files with 543 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/http/doc_http_samples.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ public:
req.target("/");
req.insert("User-Agent", "test");
req.body = "Hello, world!";
prepare(req);
req.prepare();
error_code ec;
send_expect_100_continue(
@@ -105,7 +105,7 @@ public:
req.target("/");
req.insert("User-Agent", "test");
req.body = "Hello, world!";
prepare(req);
req.prepare();
test::pipe downstream{ios_};
downstream.server.read_size(3);
test/http/message.cpp
+1 -45
View File
@@ -205,7 +205,7 @@ public:
m.insert("Upgrade", "test");
BEAST_EXPECT(! is_upgrade(m));
prepare(m, connection::upgrade);
m.prepare(connection::upgrade);
BEAST_EXPECT(is_upgrade(m));
BEAST_EXPECT(m["Connection"] == "upgrade");
@@ -214,49 +214,6 @@ public:
}
}
void
testPrepare()
{
request<string_body> m;
m.version = 10;
BEAST_EXPECT(! is_upgrade(m));
m.insert("Transfer-Encoding", "chunked");
try
{
prepare(m);
fail();
}
catch(std::exception const&)
{
}
m.erase("Transfer-Encoding");
m.insert("Content-Length", "0");
try
{
prepare(m);
fail();
}
catch(std::exception const&)
{
pass();
}
m.erase("Content-Length");
m.insert("Connection", "keep-alive");
try
{
prepare(m);
fail();
}
catch(std::exception const&)
{
pass();
}
m.version = 11;
m.erase("Connection");
m.insert("Connection", "close");
BEAST_EXPECT(! is_keep_alive(m));
}
void
testSwap()
{
@@ -357,7 +314,6 @@ public:
testMessage();
testHeaders();
testFreeFunctions();
testPrepare();
testSwap();
testSpecialMembers();
testMethod();
test/http/write.cpp
+11 -14
View File
@@ -55,9 +55,8 @@ public:
}
void
init(error_code& ec)
init(error_code&)
{
beast::detail::ignore_unused(ec);
}
boost::optional<std::pair<const_buffers_type, bool>>
@@ -502,7 +501,7 @@ public:
m.version = 10;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m);
m.prepare();
BEAST_EXPECT(str(m) ==
"GET / HTTP/1.0\r\n"
"User-Agent: test\r\n"
@@ -519,12 +518,12 @@ public:
m.version = 10;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m, connection::keep_alive);
m.prepare(connection::keep_alive);
BEAST_EXPECT(str(m) ==
"GET / HTTP/1.0\r\n"
"User-Agent: test\r\n"
"Content-Length: 1\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 1\r\n"
"\r\n"
"*"
);
@@ -539,7 +538,7 @@ public:
m.body = "*";
try
{
prepare(m, connection::upgrade);
m.prepare( connection::upgrade);
fail();
}
catch(std::exception const&)
@@ -555,7 +554,7 @@ public:
m.version = 10;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m);
m.prepare();
test::string_ostream ss(ios_);
error_code ec;
write(ss, m, ec);
@@ -575,7 +574,7 @@ public:
m.version = 11;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m);
m.prepare();
BEAST_EXPECT(str(m) ==
"GET / HTTP/1.1\r\n"
"User-Agent: test\r\n"
@@ -592,7 +591,7 @@ public:
m.version = 11;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m, connection::close);
m.prepare(connection::close);
test::string_ostream ss(ios_);
error_code ec;
write(ss, m, ec);
@@ -600,8 +599,8 @@ public:
BEAST_EXPECT(ss.str ==
"GET / HTTP/1.1\r\n"
"User-Agent: test\r\n"
"Content-Length: 1\r\n"
"Connection: close\r\n"
"Content-Length: 1\r\n"
"\r\n"
"*"
);
@@ -613,7 +612,7 @@ public:
m.target("/");
m.version = 11;
m.insert("User-Agent", "test");
prepare(m, connection::upgrade);
m.prepare(connection::upgrade);
BEAST_EXPECT(str(m) ==
"GET / HTTP/1.1\r\n"
"User-Agent: test\r\n"
@@ -629,7 +628,7 @@ public:
m.version = 11;
m.insert("User-Agent", "test");
m.body = "*";
prepare(m);
m.prepare();
test::string_ostream ss(ios_);
error_code ec;
write(ss, m, ec);
@@ -656,8 +655,6 @@ public:
m.body = "*";
BEAST_EXPECT(boost::lexical_cast<std::string>(m) ==
"GET / HTTP/1.1\r\nUser-Agent: test\r\n\r\n*");
BEAST_EXPECT(boost::lexical_cast<std::string>(m.base()) ==
"GET / HTTP/1.1\r\nUser-Agent: test\r\n\r\n");
}
// Ensure completion handlers are not leaked