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

Fixes to rfc7230:

Browse Source 
fix #1435, fix #1438

* Example and test can be built on msvc v141 15.9.6
  using /std:c++17 and BOOST_BEAST_USE_STD_STRING_VIEW.

* changed string_view.to_string() to std:string(string_view),
  awaiting availability of Library Fundamentals TS here.

* Reactivated relevant tests to param_list. #ifdef 0 test
  exhibited same assertion failed error in debug mode.
  Now fixed in DEBUG on msvc v141 15.9.6 with
  BOOST_BEAST_USE_STD_STRING_VIEW and /std:c++17.

* Looked up http paramters (transfer-encoding, etc.)
  and changed tests as well as fixing comment to
  match specs.
This commit is contained in:
Daniel Sewtz
2019-02-07 17:37:18 -08:00
committed by Vinnie Falco
parent 55d319a9d9
commit cd28598e5b
24 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/http/server/async-ssl/http_server_async_ssl.cpp
+5 -5
View File
@@ -82,8 +82,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -122,7 +122,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -135,7 +135,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -148,7 +148,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/async/http_server_async.cpp
+5 -5
View File
@@ -78,8 +78,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -118,7 +118,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -131,7 +131,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -144,7 +144,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/coro-ssl/http_server_coro_ssl.cpp
+5 -5
View File
@@ -80,8 +80,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -120,7 +120,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -133,7 +133,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -146,7 +146,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/coro/http_server_coro.cpp
+5 -5
View File
@@ -76,8 +76,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -116,7 +116,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -129,7 +129,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -142,7 +142,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/fast/http_server_fast.cpp
+2 -2
View File
@@ -196,7 +196,7 @@ private:
// we do not recognize the request method.
send_bad_response(
http::status::bad_request,
"Invalid request-method '" + req.method_string().to_string() + "'\r\n");
"Invalid request-method '" + std::string(req.method_string()) + "'\r\n");
break;
}
}
@@ -269,7 +269,7 @@ private:
file_response_->result(http::status::ok);
file_response_->keep_alive(false);
file_response_->set(http::field::server, "Beast");
file_response_->set(http::field::content_type, mime_type(target.to_string()));
file_response_->set(http::field::content_type, mime_type(std::string(target)));
file_response_->body() = std::move(file);
file_response_->prepare_payload();
example/http/server/flex/http_server_flex.cpp
+5 -5
View File
@@ -82,8 +82,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -122,7 +122,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -135,7 +135,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -148,7 +148,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/small/http_server_small.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ private:
response_.set(http::field::content_type, "text/plain");
beast::ostream(response_.body())
<< "Invalid request-method '"
<< request_.method_string().to_string()
<< std::string(request_.method_string())
<< "'";
break;
}
example/http/server/stackless-ssl/http_server_stackless_ssl.cpp
+5 -5
View File
@@ -83,8 +83,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -123,7 +123,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -136,7 +136,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -149,7 +149,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/stackless/http_server_stackless.cpp
+5 -5
View File
@@ -79,8 +79,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -119,7 +119,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -132,7 +132,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -145,7 +145,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/sync-ssl/http_server_sync_ssl.cpp
+5 -5
View File
@@ -77,8 +77,8 @@ path_cat(
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -117,7 +117,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -130,7 +130,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -143,7 +143,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};
example/http/server/sync/http_server_sync.cpp
+6 -6
View File
@@ -74,9 +74,9 @@ path_cat(
beast::string_view base,
beast::string_view path)
{
if(base.empty())
return path.to_string();
std::string result = base.to_string();
if (base.empty())
return std::string(path);
std::string result(base);
#if BOOST_MSVC
char constexpr path_separator = '\\';
if(result.back() == path_separator)
@@ -115,7 +115,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = why.to_string();
res.body() = std::string(why);
res.prepare_payload();
return res;
};
@@ -128,7 +128,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "The resource '" + target.to_string() + "' was not found.";
res.body() = "The resource '" + std::string(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -141,7 +141,7 @@ handle_request(
res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
res.body() = "An error occurred: '" + what.to_string() + "'";
res.body() = "An error occurred: '" + std::string(what) + "'";
res.prepare_payload();
return res;
};