Update for beast changes:

* Use simplified http::headers
* Use new beast::http::message:
  - Call beast::http::prepare
  - message::method is now a string
* Remove deprecated_http
This commit is contained in:
Vinnie Falco
2016-04-29 15:55:45 -04:00
parent 76b761d8e2
commit ddb34f1ed1
26 changed files with 267 additions and 897 deletions

View File

@@ -30,7 +30,7 @@
#include <ripple/beast/asio/ssl_error.h> // for is_short_read?
#include <beast/http/read.hpp>
#include <beast/http/message.hpp>
#include <beast/http/parser.hpp>
#include <beast/http/parser_v1.hpp>
#include <beast/http/streambuf_body.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/ssl/stream.hpp>

View File

@@ -24,7 +24,7 @@
#include <ripple/protocol/BuildInfo.h>
#include <beast/websocket.hpp>
#include <beast/streambuf.hpp>
#include <beast/http/message.hpp>
#include <beast/http/message_v1.hpp>
#include <cassert>
namespace ripple {
@@ -59,7 +59,7 @@ public:
Port const& port,
Handler& handler,
endpoint_type remote_address,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
boost::asio::io_service& io_service,
beast::Journal journal);
@@ -148,7 +148,7 @@ BaseWSPeer<Impl>::BaseWSPeer(
Port const& port,
Handler& handler,
endpoint_type remote_address,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
boost::asio::io_service& io_service,
beast::Journal journal)
: BasePeer<Impl>(port, handler, remote_address,

View File

@@ -47,7 +47,7 @@ public:
Port const& port,
Handler& handler,
endpoint_type remote_address,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
socket_type&& socket,
beast::Journal journal);
@@ -63,7 +63,7 @@ PlainWSPeer::PlainWSPeer(
Port const& port,
Handler& handler,
endpoint_type remote_address,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
socket_type&& socket,
beast::Journal journal)
: BaseWSPeer(port, handler, remote_address, std::move(request),

View File

@@ -53,7 +53,7 @@ public:
Port const& port,
Handler& handler,
endpoint_type remote_endpoint,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
std::unique_ptr<
beast::asio::ssl_bundle>&& ssl_bundle,
beast::Journal journal);
@@ -73,7 +73,7 @@ SSLWSPeer::SSLWSPeer(
Port const& port,
Handler& handler,
endpoint_type remote_endpoint,
beast::http::message<true, Body, Headers>&& request,
beast::http::request_v1<Body, Headers>&& request,
std::unique_ptr<
beast::asio::ssl_bundle>&& ssl_bundle,
beast::Journal journal)

View File

@@ -22,7 +22,7 @@
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/beast/net/IPAddressConversion.h>
#include <ripple/json/json_reader.h>
#include <ripple/server/JsonWriter.h>
#include <ripple/server/json_body.h>
#include <ripple/server/make_ServerHandler.h>
#include <ripple/server/impl/JSONRPCUtil.h>
#include <ripple/server/impl/ServerHandlerImp.h>
@@ -39,6 +39,7 @@
#include <ripple/rpc/impl/Tuning.h>
#include <ripple/rpc/RPCHandler.h>
#include <beast/detail/base64.hpp>
#include <beast/http/headers.hpp>
#include <beast/http/rfc2616.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/type_traits.hpp>
@@ -203,10 +204,9 @@ Json::Output makeOutput (Session& session)
}
// HACK!
template<class Allocator>
static
std::map<std::string, std::string>
build_map(beast::http::headers<Allocator> const& h)
build_map(beast::http::headers const& h)
{
std::map <std::string, std::string> c;
for (auto const& e : h)

View File

@@ -26,7 +26,6 @@
#include <ripple/json/to_string.h>
#include <ripple/net/InfoSub.h>
#include <ripple/server/Handler.h>
#include <ripple/server/JsonWriter.h>
#include <ripple/server/ServerHandler.h>
#include <ripple/server/Session.h>
#include <ripple/server/WSSession.h>
@@ -62,7 +61,12 @@ public:
if(! sp)
return;
beast::streambuf sb;
write(sb, jv);
stream(jv,
[&](void const* data, std::size_t n)
{
sb.commit(boost::asio::buffer_copy(
sb.prepare(n), boost::asio::buffer(data, n)));
});
auto m = std::make_shared<
StreambufWSMsg<decltype(sb)>>(
std::move(sb));