ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-01 16:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to use latest beast

Browse Source
This commit is contained in:
Miguel Portilla
2017-07-10 19:09:58 -04:00
parent 61316c7f95
commit 95f107d487
29 changed files with 326 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -266,13 +266,15 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\config.hpp"> <ClInclude Include="..\..\src\beast\include\beast\config.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\async_result.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffered_read_stream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffer_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\buffer_prefix.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp">
</ClInclude> </ClInclude>
@@ -280,155 +282,183 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_cat.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffers_ref.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_concepts.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\ci_char_traits.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\clamp.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\clamp.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\config.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\get_lowest_layer.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\cpu_info.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\is_call_possible.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\in_place_init.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\prepare_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\ostream.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\static_ostream.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\sync_ostream.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\static_string.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\type_traits.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\type_traits.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\write_dynabuf.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\dynabuf_readstream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\error.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\error.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_base.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_posix.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_stdio.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_win32.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_concepts.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_helpers.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp">
</ClInclude> </ClInclude>
<None Include="..\..\src\beast\include\beast\core\impl\buffered_read_stream.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\buffer_cat.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\buffer_prefix.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\dynabuf_readstream.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\file_posix.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\file_stdio.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\file_win32.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\handler_ptr.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\handler_ptr.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\multi_buffer.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\streambuf.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\read_size.ipp">
</None> </None>
<ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp"> <None Include="..\..\src\beast\include\beast\core\impl\static_buffer.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\static_string.ipp">
</None>
<None Include="..\..\src\beast\include\beast\core\impl\string_param.ipp">
</None>
<ClInclude Include="..\..\src\beast\include\beast\core\multi_buffer.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffer.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\ostream.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\read_size.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_streambuf.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\span.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_buffer.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\streambuf.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\string.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\stream_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\string_param.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\to_string.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\type_traits.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\write_dynabuf.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_dynabuf_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\basic_parser.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_fields.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\buffer_body.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_parser_v1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parsed_list.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\chunk_encode.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\concepts.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_fields.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser_v1.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\chunk_encode.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\chunk_encode.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\rfc7230.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\rfc7230.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\type_traits.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\dynamic_body.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\error.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\field.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\fields.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\fields.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\header_parser_v1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\file_body.hpp">
</ClInclude> </ClInclude>
<None Include="..\..\src\beast\include\beast\http\impl\basic_fields.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\basic_parser.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\basic_parser_v1.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\error.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\field.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\fields.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\file_body_win32.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\message.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\message.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\parse.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\parser.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\parse_error.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\read.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\read.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\rfc7230.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\rfc7230.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\serializer.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\status.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\verb.ipp">
</None>
<None Include="..\..\src\beast\include\beast\http\impl\write.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\write.ipp">
</None> </None>
<ClInclude Include="..\..\src\beast\include\beast\http\message.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\message.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parse.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\parser.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parser_v1.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parse_error.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\read.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\read.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\reason.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\rfc7230.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\rfc7230.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\streambuf_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\serializer.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\span_body.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\status.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\type_traits.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\vector_body.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\verb.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\write.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\version.hpp"> <ClInclude Include="..\..\src\beast\include\beast\version.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\decorator.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\endian.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\frame.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\frame.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\hybi13.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\hybi13.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\invokable.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pausation.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\stream_base.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\type_traits.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp">
</ClInclude> </ClInclude>
@@ -446,6 +476,8 @@
</None> </None>
<None Include="..\..\src\beast\include\beast\websocket\impl\read.ipp"> <None Include="..\..\src\beast\include\beast\websocket\impl\read.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\websocket\impl\rfc6455.ipp">
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\ssl.ipp"> <None Include="..\..\src\beast\include\beast\websocket\impl\ssl.ipp">
</None> </None>
<None Include="..\..\src\beast\include\beast\websocket\impl\stream.ipp"> <None Include="..\..\src\beast\include\beast\websocket\impl\stream.ipp">

206
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -558,16 +558,19 @@
<ClInclude Include="..\..\src\beast\include\beast\config.hpp"> <ClInclude Include="..\..\src\beast\include\beast\config.hpp">
<Filter>beast</Filter> <Filter>beast</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\async_result.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffered_read_stream.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\buffer_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\buffer_prefix.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp">
@@ -579,130 +582,145 @@
<ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_cat.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffers_ref.hpp">
<Filter>beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_concepts.hpp">
<Filter>beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\ci_char_traits.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\clamp.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\clamp.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\config.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\get_lowest_layer.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\cpu_info.hpp">
<Filter>beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\is_call_possible.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\in_place_init.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\prepare_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\ostream.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\static_ostream.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\sync_ostream.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\static_string.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\type_traits.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\detail\type_traits.hpp">
<Filter>beast\core\detail</Filter> <Filter>beast\core\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\write_dynabuf.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\error.hpp">
<Filter>beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\dynabuf_readstream.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\error.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\file.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_base.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_posix.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_stdio.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\file_win32.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_concepts.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_helpers.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<None Include="..\..\src\beast\include\beast\core\impl\buffered_read_stream.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\buffer_cat.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\buffer_prefix.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
<Filter>beast\core\impl</Filter> <Filter>beast\core\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\dynabuf_readstream.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\file_posix.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\file_stdio.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\file_win32.ipp">
<Filter>beast\core\impl</Filter> <Filter>beast\core\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\handler_ptr.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\handler_ptr.ipp">
<Filter>beast\core\impl</Filter> <Filter>beast\core\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\multi_buffer.ipp">
<Filter>beast\core\impl</Filter> <Filter>beast\core\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\core\impl\streambuf.ipp"> <None Include="..\..\src\beast\include\beast\core\impl\read_size.ipp">
<Filter>beast\core\impl</Filter> <Filter>beast\core\impl</Filter>
</None> </None>
<ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp"> <None Include="..\..\src\beast\include\beast\core\impl\static_buffer.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\static_string.ipp">
<Filter>beast\core\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\core\impl\string_param.ipp">
<Filter>beast\core\impl</Filter>
</None>
<ClInclude Include="..\..\src\beast\include\beast\core\multi_buffer.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffer.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\ostream.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffers.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\read_size.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_streambuf.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\span.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_buffer.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\streambuf.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\string.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\stream_concepts.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\string_param.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\to_string.hpp"> <ClInclude Include="..\..\src\beast\include\beast\core\type_traits.hpp">
<Filter>beast\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\write_dynabuf.hpp">
<Filter>beast\core</Filter> <Filter>beast\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http.hpp">
<Filter>beast</Filter> <Filter>beast</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_dynabuf_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\basic_parser.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_fields.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\buffer_body.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\basic_parser_v1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parsed_list.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\chunk_encode.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\concepts.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_fields.hpp">
<Filter>beast\http\detail</Filter> <Filter>beast\http\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser_v1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser.hpp">
<Filter>beast\http\detail</Filter> <Filter>beast\http\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\chunk_encode.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\chunk_encode.hpp">
@@ -711,28 +729,46 @@
<ClInclude Include="..\..\src\beast\include\beast\http\detail\rfc7230.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\detail\rfc7230.hpp">
<Filter>beast\http\detail</Filter> <Filter>beast\http\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\type_traits.hpp">
<Filter>beast\http\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\dynamic_body.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\error.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\field.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\fields.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\fields.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\header_parser_v1.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\file_body.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<None Include="..\..\src\beast\include\beast\http\impl\basic_fields.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\basic_parser.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\basic_parser_v1.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\error.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\field.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\fields.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\file_body_win32.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\message.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\message.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\parse.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\parser.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\parse_error.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\read.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\read.ipp">
@@ -741,36 +777,51 @@
<None Include="..\..\src\beast\include\beast\http\impl\rfc7230.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\rfc7230.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\http\impl\serializer.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\status.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\verb.ipp">
<Filter>beast\http\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\http\impl\write.ipp"> <None Include="..\..\src\beast\include\beast\http\impl\write.ipp">
<Filter>beast\http\impl</Filter> <Filter>beast\http\impl</Filter>
</None> </None>
<ClInclude Include="..\..\src\beast\include\beast\http\message.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\message.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parse.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\parser.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parser_v1.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\parse_error.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\read.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\read.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\reason.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\rfc7230.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\rfc7230.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\streambuf_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\serializer.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\span_body.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\status.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\type_traits.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\vector_body.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\verb.hpp">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\write.hpp"> <ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
<Filter>beast\http</Filter> <Filter>beast\http</Filter>
</ClInclude> </ClInclude>
@@ -780,28 +831,22 @@
<ClInclude Include="..\..\src\beast\include\beast\websocket.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket.hpp">
<Filter>beast</Filter> <Filter>beast</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\decorator.hpp">
<Filter>beast\websocket\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\endian.hpp">
<Filter>beast\websocket\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\frame.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\frame.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\hybi13.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\hybi13.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\invokable.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pausation.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\stream_base.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\type_traits.hpp">
<Filter>beast\websocket\detail</Filter> <Filter>beast\websocket\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp"> <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp">
@@ -828,6 +873,9 @@
<None Include="..\..\src\beast\include\beast\websocket\impl\read.ipp"> <None Include="..\..\src\beast\include\beast\websocket\impl\read.ipp">
<Filter>beast\websocket\impl</Filter> <Filter>beast\websocket\impl</Filter>
</None> </None>
<None Include="..\..\src\beast\include\beast\websocket\impl\rfc6455.ipp">
<Filter>beast\websocket\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\ssl.ipp"> <None Include="..\..\src\beast\include\beast\websocket\impl\ssl.ipp">
<Filter>beast\websocket\impl</Filter> <Filter>beast\websocket\impl</Filter>
</None> </None>

2
src/ripple/app/main/Application.cpp
View File

@@ -1571,7 +1571,7 @@ bool ApplicationImp::loadOldLedger (
} }
} }
} }
else if (ledgerID.empty () || beast::detail::ci_equal(ledgerID, "latest")) else if (ledgerID.empty () || beast::detail::iequals(ledgerID, "latest"))
{ {
loadLedger = getLastFullLedger (); loadLedger = getLastFullLedger ();
} }

6
src/ripple/app/misc/detail/WorkBase.h
View File

@@ -180,10 +180,10 @@ WorkBase<Impl>::onStart()
req_.method(beast::http::verb::get); req_.method(beast::http::verb::get);
req_.target(path_.empty() ? "/" : path_); req_.target(path_.empty() ? "/" : path_);
req_.version = 11; req_.version = 11;
req_.replace ( req_.set (
"Host", host_ + ":" + port_); "Host", host_ + ":" + port_);
req_.replace ("User-Agent", BuildInfo::getFullVersionString()); req_.set ("User-Agent", BuildInfo::getFullVersionString());
req_.prepare(); req_.prepare_payload();
beast::http::async_write(impl().stream(), req_, beast::http::async_write(impl().stream(), req_,
strand_.wrap (std::bind (&WorkBase::onRequest, strand_.wrap (std::bind (&WorkBase::onRequest,
impl().shared_from_this(), std::placeholders::_1))); impl().shared_from_this(), std::placeholders::_1)));

6
src/ripple/basics/BasicConfig.h
View File

@@ -22,7 +22,7 @@
#include <ripple/basics/contract.h> #include <ripple/basics/contract.h>
#include <beast/unit_test/detail/const_container.hpp> #include <beast/unit_test/detail/const_container.hpp>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <map> #include <map>
@@ -41,7 +41,7 @@ using IniFileSections = std::map<std::string, std::vector<std::string>>;
*/ */
class Section class Section
: public beast::unit_test::detail::const_container < : public beast::unit_test::detail::const_container <
std::map <std::string, std::string, beast::detail::ci_less>> std::map <std::string, std::string, beast::iless>>
{ {
private: private:
std::string name_; std::string name_;
@@ -173,7 +173,7 @@ public:
class BasicConfig class BasicConfig
{ {
private: private:
std::map <std::string, Section, beast::detail::ci_less> map_; std::map <std::string, Section, beast::iless> map_;
public: public:
/** Returns `true` if a section with the given name exists. */ /** Returns `true` if a section with the given name exists. */

4
src/ripple/basics/Log.h
View File

@@ -21,7 +21,7 @@
#define RIPPLE_BASICS_LOG_H_INCLUDED #define RIPPLE_BASICS_LOG_H_INCLUDED
#include <ripple/basics/UnorderedContainers.h> #include <ripple/basics/UnorderedContainers.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <ripple/beast/utility/Journal.h> #include <ripple/beast/utility/Journal.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <map> #include <map>
@@ -148,7 +148,7 @@ private:
std::mutex mutable mutex_; std::mutex mutable mutex_;
std::map <std::string, std::map <std::string,
std::unique_ptr<beast::Journal::Sink>, std::unique_ptr<beast::Journal::Sink>,
beast::detail::ci_less> sinks_; beast::iless> sinks_;
beast::severities::Severity thresh_; beast::severities::Severity thresh_;
File file_; File file_;
bool silent_ = false; bool silent_ = false;

5
src/ripple/basics/impl/make_SSLContext.cpp
View File

@@ -220,11 +220,15 @@ static
void void
info_handler (SSL const* ssl, int event, int) info_handler (SSL const* ssl, int event, int)
{ {
#if OPENSSL_VERSION_NUMBER < 0x10100000L
if ((ssl->s3) && (event & SSL_CB_HANDSHAKE_START)) if ((ssl->s3) && (event & SSL_CB_HANDSHAKE_START))
{ {
if (disallowRenegotiation (ssl, SSL_in_before (ssl))) if (disallowRenegotiation (ssl, SSL_in_before (ssl)))
ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS; ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
} }
#else
// empty, flag removed in OpenSSL 1.1
#endif
} }
#endif #endif
@@ -448,4 +452,3 @@ make_SSLContextAuthed (
} }
} // ripple } // ripple

2
src/ripple/beast/rfc2616.h
View File

@@ -279,7 +279,7 @@ split_commas(FwdIt first, FwdIt last)
template <class Result = std::vector<std::string>> template <class Result = std::vector<std::string>>
Result Result
split_commas(boost::string_ref const& s) split_commas(beast::string_view const& s)
{ {
return split_commas(s.begin(), s.end()); return split_commas(s.begin(), s.end());
} }

2
src/ripple/core/Config.h
View File

@@ -24,7 +24,7 @@
#include <ripple/basics/base_uint.h> #include <ripple/basics/base_uint.h>
#include <ripple/protocol/SystemParameters.h> // VFALCO Breaks levelization #include <ripple/protocol/SystemParameters.h> // VFALCO Breaks levelization
#include <ripple/beast/net/IPEndpoint.h> #include <ripple/beast/net/IPEndpoint.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <ripple/beast/utility/Journal.h> #include <ripple/beast/utility/Journal.h>
#include <boost/asio/ip/tcp.hpp> // VFALCO FIX: This include should not be here #include <boost/asio/ip/tcp.hpp> // VFALCO FIX: This include should not be here
#include <boost/filesystem.hpp> // VFALCO FIX: This include should not be here #include <boost/filesystem.hpp> // VFALCO FIX: This include should not be here

20
src/ripple/core/impl/Config.cpp
View File

@@ -27,7 +27,7 @@
#include <ripple/protocol/SystemParameters.h> #include <ripple/protocol/SystemParameters.h>
#include <ripple/net/HTTPClient.h> #include <ripple/net/HTTPClient.h>
#include <ripple/beast/core/LexicalCast.h> #include <ripple/beast/core/LexicalCast.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
@@ -325,15 +325,15 @@ void Config::loadFromString (std::string const& fileContents)
if (getSingleSection (secConfig, SECTION_NODE_SIZE, strTemp, j_)) if (getSingleSection (secConfig, SECTION_NODE_SIZE, strTemp, j_))
{ {
if (beast::detail::ci_equal(strTemp, "tiny")) if (beast::detail::iequals(strTemp, "tiny"))
NODE_SIZE = 0; NODE_SIZE = 0;
else if (beast::detail::ci_equal(strTemp, "small")) else if (beast::detail::iequals(strTemp, "small"))
NODE_SIZE = 1; NODE_SIZE = 1;
else if (beast::detail::ci_equal(strTemp, "medium")) else if (beast::detail::iequals(strTemp, "medium"))
NODE_SIZE = 2; NODE_SIZE = 2;
else if (beast::detail::ci_equal(strTemp, "large")) else if (beast::detail::iequals(strTemp, "large"))
NODE_SIZE = 3; NODE_SIZE = 3;
else if (beast::detail::ci_equal(strTemp, "huge")) else if (beast::detail::iequals(strTemp, "huge"))
NODE_SIZE = 4; NODE_SIZE = 4;
else else
{ {
@@ -380,9 +380,9 @@ void Config::loadFromString (std::string const& fileContents)
if (getSingleSection (secConfig, SECTION_LEDGER_HISTORY, strTemp, j_)) if (getSingleSection (secConfig, SECTION_LEDGER_HISTORY, strTemp, j_))
{ {
if (beast::detail::ci_equal(strTemp, "full")) if (beast::detail::iequals(strTemp, "full"))
LEDGER_HISTORY = 1000000000u; LEDGER_HISTORY = 1000000000u;
else if (beast::detail::ci_equal(strTemp, "none")) else if (beast::detail::iequals(strTemp, "none"))
LEDGER_HISTORY = 0; LEDGER_HISTORY = 0;
else else
LEDGER_HISTORY = beast::lexicalCastThrow <std::uint32_t> (strTemp); LEDGER_HISTORY = beast::lexicalCastThrow <std::uint32_t> (strTemp);
@@ -390,9 +390,9 @@ void Config::loadFromString (std::string const& fileContents)
if (getSingleSection (secConfig, SECTION_FETCH_DEPTH, strTemp, j_)) if (getSingleSection (secConfig, SECTION_FETCH_DEPTH, strTemp, j_))
{ {
if (beast::detail::ci_equal(strTemp, "none")) if (beast::detail::iequals(strTemp, "none"))
FETCH_DEPTH = 0; FETCH_DEPTH = 0;
else if (beast::detail::ci_equal(strTemp, "full")) else if (beast::detail::iequals(strTemp, "full"))
FETCH_DEPTH = 1000000000u; FETCH_DEPTH = 1000000000u;
else else
FETCH_DEPTH = beast::lexicalCastThrow <std::uint32_t> (strTemp); FETCH_DEPTH = beast::lexicalCastThrow <std::uint32_t> (strTemp);

6
src/ripple/json/Output.h
View File

@@ -20,19 +20,19 @@
#ifndef RIPPLE_JSON_OUTPUT_H_INCLUDED #ifndef RIPPLE_JSON_OUTPUT_H_INCLUDED
#define RIPPLE_JSON_OUTPUT_H_INCLUDED #define RIPPLE_JSON_OUTPUT_H_INCLUDED
#include <boost/utility/string_ref.hpp> #include <beast/core/string.hpp>
#include <functional> #include <functional>
namespace Json { namespace Json {
class Value; class Value;
using Output = std::function <void (boost::string_ref const&)>; using Output = std::function <void (beast::string_view const&)>;
inline inline
Output stringOutput (std::string& s) Output stringOutput (std::string& s)
{ {
return [&](boost::string_ref const& b) { s.append (b.data(), b.size()); }; return [&](beast::string_view const& b) { s.append (b.data(), b.size()); };
} }
/** Writes a minimal representation of a Json value to an Output in O(n) time. /** Writes a minimal representation of a Json value to an Output in O(n) time.

4
src/ripple/json/impl/Writer.cpp
View File

@@ -93,13 +93,13 @@ public:
stack_.top().type = ct; stack_.top().type = ct;
} }
void output (boost::string_ref const& bytes) void output (beast::string_view const& bytes)
{ {
markStarted (); markStarted ();
output_ (bytes); output_ (bytes);
} }
void stringOutput (boost::string_ref const& bytes) void stringOutput (beast::string_view const& bytes)
{ {
markStarted (); markStarted ();
std::size_t position = 0, writtenUntil = 0; std::size_t position = 0, writtenUntil = 0;

6
src/ripple/net/impl/RPCCall.cpp
View File

@@ -35,7 +35,7 @@
#include <ripple/protocol/types.h> #include <ripple/protocol/types.h>
#include <ripple/rpc/ServerHandler.h> #include <ripple/rpc/ServerHandler.h>
#include <ripple/beast/core/LexicalCast.h> #include <ripple/beast/core/LexicalCast.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <boost/asio/streambuf.hpp> #include <boost/asio/streambuf.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <array> #include <array>
@@ -423,9 +423,9 @@ private:
// This may look reversed, but it's intentional: jss::vetoed // This may look reversed, but it's intentional: jss::vetoed
// determines whether an amendment is vetoed - so "reject" means // determines whether an amendment is vetoed - so "reject" means
// that jss::vetoed is true. // that jss::vetoed is true.
if (beast::detail::ci_equal(action, "reject")) if (beast::detail::iequals(action, "reject"))
jvRequest[jss::vetoed] = Json::Value (true); jvRequest[jss::vetoed] = Json::Value (true);
else if (beast::detail::ci_equal(action, "accept")) else if (beast::detail::iequals(action, "accept"))
jvRequest[jss::vetoed] = Json::Value (false); jvRequest[jss::vetoed] = Json::Value (false);
else else
return rpcError (rpcINVALID_PARAMS); return rpcError (rpcINVALID_PARAMS);

4
src/ripple/nodestore/backend/MemoryFactory.cpp
View File

@@ -21,7 +21,7 @@
#include <ripple/basics/contract.h> #include <ripple/basics/contract.h>
#include <ripple/nodestore/Factory.h> #include <ripple/nodestore/Factory.h>
#include <ripple/nodestore/Manager.h> #include <ripple/nodestore/Manager.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@@ -40,7 +40,7 @@ class MemoryFactory : public Factory
{ {
private: private:
std::mutex mutex_; std::mutex mutex_;
std::map <std::string, MemoryDB, beast::detail::ci_less> map_; std::map <std::string, MemoryDB, beast::iless> map_;
public: public:
MemoryFactory(); MemoryFactory();

2
src/ripple/nodestore/impl/ManagerImp.cpp
View File

@@ -128,7 +128,7 @@ ManagerImp::find (std::string const& name)
auto const iter = std::find_if(list_.begin(), list_.end(), auto const iter = std::find_if(list_.begin(), list_.end(),
[&name](Factory* other) [&name](Factory* other)
{ {
return beast::detail::ci_equal(name, other->getName()); return beast::detail::iequals(name, other->getName());
} ); } );
if (iter == list_.end()) if (iter == list_.end())
return nullptr; return nullptr;

37
src/ripple/overlay/impl/OverlayImpl.cpp
View File

@@ -33,14 +33,13 @@
#include <ripple/overlay/impl/ConnectAttempt.h> #include <ripple/overlay/impl/ConnectAttempt.h>
#include <ripple/overlay/impl/OverlayImpl.h> #include <ripple/overlay/impl/OverlayImpl.h>
#include <ripple/overlay/impl/PeerImp.h> #include <ripple/overlay/impl/PeerImp.h>
#include <ripple/overlay/impl/TMHello.h>
#include <ripple/peerfinder/make_Manager.h> #include <ripple/peerfinder/make_Manager.h>
#include <ripple/protocol/STExchange.h> #include <ripple/protocol/STExchange.h>
#include <ripple/beast/core/ByteOrder.h> #include <ripple/beast/core/ByteOrder.h>
#include <beast/core/detail/base64.hpp> #include <beast/core/detail/base64.hpp>
#include <ripple/beast/core/LexicalCast.h> #include <ripple/beast/core/LexicalCast.h>
#include <beast/http.hpp> #include <beast/http.hpp>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <ripple/beast/utility/WrappedSink.h> #include <ripple/beast/utility/WrappedSink.h>
#include <boost/utility/in_place_factory.hpp> #include <boost/utility/in_place_factory.hpp>
@@ -223,7 +222,7 @@ OverlayImpl::onHandoff (std::unique_ptr <beast::asio::ssl_bundle>&& ssl_bundle,
if (std::find_if(types.begin(), types.end(), if (std::find_if(types.begin(), types.end(),
[](std::string const& s) [](std::string const& s)
{ {
return beast::detail::ci_equal(s, "peer"); return beast::detail::iequals(s, "peer");
}) == types.end()) }) == types.end())
{ {
handoff.moved = false; handoff.moved = false;
@@ -313,32 +312,6 @@ OverlayImpl::onHandoff (std::unique_ptr <beast::asio::ssl_bundle>&& ssl_bundle,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
template<class Fields>
static
bool
is_upgrade(beast::http::header<true, Fields> const& req)
{
if(req.version < 11)
return false;
if(req.method() != beast::http::verb::get)
return false;
if(! beast::http::token_list{req["Connection"]}.exists("upgrade"))
return false;
return true;
}
template<class Fields>
static
bool
is_upgrade(beast::http::header<false, Fields> const& req)
{
if(req.version < 11)
return false;
if(! beast::http::token_list{req["Connection"]}.exists("upgrade"))
return false;
return true;
}
bool bool
OverlayImpl::isPeerUpgrade(http_request_type const& request) OverlayImpl::isPeerUpgrade(http_request_type const& request)
{ {
@@ -377,7 +350,7 @@ OverlayImpl::makeRedirectResponse (PeerFinder::Slot::ptr const& slot,
for (auto const& _ : m_peerFinder->redirect(slot)) for (auto const& _ : m_peerFinder->redirect(slot))
ips.append(_.address.to_string()); ips.append(_.address.to_string());
} }
msg.prepare(); msg.prepare_payload();
return std::make_shared<SimpleWriter>(msg); return std::make_shared<SimpleWriter>(msg);
} }
@@ -394,7 +367,7 @@ OverlayImpl::makeErrorResponse (PeerFinder::Slot::ptr const& slot,
msg.insert("Remote-Address", remote_address.to_string()); msg.insert("Remote-Address", remote_address.to_string());
msg.insert(beast::http::field::connection, "close"); msg.insert(beast::http::field::connection, "close");
msg.body = text; msg.body = text;
msg.prepare(); msg.prepare_payload();
return std::make_shared<SimpleWriter>(msg); return std::make_shared<SimpleWriter>(msg);
} }
@@ -849,7 +822,7 @@ OverlayImpl::processRequest (http_request_type const& req,
msg.insert("Content-Type", "application/json"); msg.insert("Content-Type", "application/json");
msg.insert("Connection", "close"); msg.insert("Connection", "close");
msg.body["overlay"] = crawl(); msg.body["overlay"] = crawl();
msg.prepare(); msg.prepare_payload();
handoff.response = std::make_shared<SimpleWriter>(msg); handoff.response = std::make_shared<SimpleWriter>(msg);
return true; return true;
} }

27
src/ripple/overlay/impl/OverlayImpl.h
View File

@@ -29,6 +29,7 @@
#include <ripple/basics/Resolver.h> #include <ripple/basics/Resolver.h>
#include <ripple/basics/chrono.h> #include <ripple/basics/chrono.h>
#include <ripple/basics/UnorderedContainers.h> #include <ripple/basics/UnorderedContainers.h>
#include <ripple/overlay/impl/TMHello.h>
#include <ripple/peerfinder/PeerfinderManager.h> #include <ripple/peerfinder/PeerfinderManager.h>
#include <ripple/resource/ResourceManager.h> #include <ripple/resource/ResourceManager.h>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
@@ -264,6 +265,32 @@ public:
return true; return true;
} }
template<class Fields>
static
bool
is_upgrade(beast::http::header<true, Fields> const& req)
{
if(req.version < 11)
return false;
if(req.method() != beast::http::verb::get)
return false;
if(! beast::http::token_list{req["Connection"]}.exists("upgrade"))
return false;
return true;
}
template<class Fields>
static
bool
is_upgrade(beast::http::header<false, Fields> const& req)
{
if(req.version < 11)
return false;
if(! beast::http::token_list{req["Connection"]}.exists("upgrade"))
return false;
return true;
}
static static
std::string std::string
makePrefix (std::uint32_t id); makePrefix (std::uint32_t id);

2
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -249,7 +249,7 @@ PeerImp::crawl() const
auto const iter = headers_.find("Crawl"); auto const iter = headers_.find("Crawl");
if (iter == headers_.end()) if (iter == headers_.end())
return false; return false;
return beast::detail::ci_equal(iter->value(), "public"); return beast::detail::iequals(iter->value(), "public");
} }
std::string std::string

2
src/ripple/overlay/impl/TMHello.cpp
View File

@@ -188,7 +188,7 @@ appendHello (beast::http::fields& h,
} }
std::vector<ProtocolVersion> std::vector<ProtocolVersion>
parse_ProtocolVersions(boost::string_ref const& value) parse_ProtocolVersions(beast::string_view const& value)
{ {
static boost::regex re ( static boost::regex re (
"^" // start of line "^" // start of line

2
src/ripple/overlay/impl/TMHello.h
View File

@@ -84,7 +84,7 @@ verifyHello (protocol::TMHello const& h, uint256 const& sharedValue,
excluded from the result set. excluded from the result set.
*/ */
std::vector<ProtocolVersion> std::vector<ProtocolVersion>
parse_ProtocolVersions(boost::string_ref const& s); parse_ProtocolVersions(beast::string_view const& s);
} }

6
src/ripple/rpc/impl/ServerHandlerImp.cpp
View File

@@ -78,7 +78,7 @@ unauthorizedResponse(
msg.insert("Content-Type", "text/html"); msg.insert("Content-Type", "text/html");
msg.insert("Connection", "close"); msg.insert("Connection", "close");
msg.body = "Invalid protocol."; msg.body = "Invalid protocol.";
msg.prepare(); msg.prepare_payload();
handoff.response = std::make_shared<SimpleWriter>(msg); handoff.response = std::make_shared<SimpleWriter>(msg);
return handoff; return handoff;
} }
@@ -251,7 +251,7 @@ ServerHandlerImp::onHandoff (Session& session,
static inline static inline
Json::Output makeOutput (Session& session) Json::Output makeOutput (Session& session)
{ {
return [&](boost::string_ref const& b) return [&](beast::string_view const& b)
{ {
session.write (b.data(), b.size()); session.write (b.data(), b.size());
}; };
@@ -744,7 +744,7 @@ ServerHandlerImp::statusResponse(
msg.insert("Server", BuildInfo::getFullVersionString()); msg.insert("Server", BuildInfo::getFullVersionString());
msg.insert("Content-Type", "text/html"); msg.insert("Content-Type", "text/html");
msg.insert("Connection", "close"); msg.insert("Connection", "close");
msg.prepare(); msg.prepare_payload();
handoff.response = std::make_shared<SimpleWriter>(msg); handoff.response = std::make_shared<SimpleWriter>(msg);
return handoff; return handoff;
} }

6
src/ripple/server/Port.h
View File

@@ -22,7 +22,7 @@
#include <ripple/basics/BasicConfig.h> #include <ripple/basics/BasicConfig.h>
#include <ripple/beast/net/IPEndpoint.h> #include <ripple/beast/net/IPEndpoint.h>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <beast/websocket/option.hpp> #include <beast/websocket/option.hpp>
#include <boost/asio/ip/address.hpp> #include <boost/asio/ip/address.hpp>
#include <cstdint> #include <cstdint>
@@ -40,7 +40,7 @@ struct Port
std::string name; std::string name;
boost::asio::ip::address ip; boost::asio::ip::address ip;
std::uint16_t port = 0; std::uint16_t port = 0;
std::set<std::string, beast::detail::ci_less> protocol; std::set<std::string, beast::iless> protocol;
std::vector<beast::IP::Address> admin_ip; std::vector<beast::IP::Address> admin_ip;
std::vector<beast::IP::Address> secure_gateway_ip; std::vector<beast::IP::Address> secure_gateway_ip;
std::string user; std::string user;
@@ -79,7 +79,7 @@ operator<< (std::ostream& os, Port const& p);
struct ParsedPort struct ParsedPort
{ {
std::string name; std::string name;
std::set<std::string, beast::detail::ci_less> protocol; std::set<std::string, beast::iless> protocol;
std::string user; std::string user;
std::string password; std::string password;
std::string admin_user; std::string admin_user;

1
src/ripple/server/impl/BaseHTTPPeer.h
View File

@@ -359,7 +359,6 @@ on_write(error_code const& ec,
for(auto const& b : wq2_) for(auto const& b : wq2_)
v.emplace_back(b.data.get(), b.bytes); v.emplace_back(b.data.get(), b.bytes);
start_timer(); start_timer();
using namespace beast::asio;
return boost::asio::async_write(impl().stream_, v, return boost::asio::async_write(impl().stream_, v,
strand_.wrap(std::bind(&BaseHTTPPeer::on_write, strand_.wrap(std::bind(&BaseHTTPPeer::on_write,
impl().shared_from_this(), std::placeholders::_1, impl().shared_from_this(), std::placeholders::_1,

20
src/ripple/server/impl/BaseWSPeer.h
View File

@@ -141,8 +141,8 @@ protected:
on_ping(error_code const& ec); on_ping(error_code const& ec);
void void
on_ping_pong(bool is_pong, on_ping_pong(beast::websocket::frame_type kind,
beast::websocket::ping_data const& payload); beast::string_view payload);
void void
on_timer(error_code ec); on_timer(error_code ec);
@@ -180,16 +180,15 @@ run()
return strand_.post(std::bind( return strand_.post(std::bind(
&BaseWSPeer::run, impl().shared_from_this())); &BaseWSPeer::run, impl().shared_from_this()));
impl().ws_.set_option(port().pmd_options); impl().ws_.set_option(port().pmd_options);
impl().ws_.ping_callback( impl().ws_.control_callback(
std::bind(&BaseWSPeer::on_ping_pong, this, std::bind(&BaseWSPeer::on_ping_pong, this,
std::placeholders::_1, std::placeholders::_2)); std::placeholders::_1, std::placeholders::_2));
using namespace beast::asio;
start_timer(); start_timer();
close_on_timer_ = true; close_on_timer_ = true;
impl().ws_.async_accept_ex(request_, impl().ws_.async_accept_ex(request_,
[](auto & res) [](auto & res)
{ {
res.replace(beast::http::field::server, res.set(beast::http::field::server,
BuildInfo::getFullVersionString()); BuildInfo::getFullVersionString());
}, },
strand_.wrap(std::bind(&BaseWSPeer::on_ws_handshake, strand_.wrap(std::bind(&BaseWSPeer::on_ws_handshake,
@@ -278,7 +277,6 @@ on_write(error_code const& ec)
if(ec) if(ec)
return fail(ec, "write"); return fail(ec, "write");
auto& w = *wq_.front(); auto& w = *wq_.front();
using namespace beast::asio;
auto const result = w.prepare(65536, auto const result = w.prepare(65536,
std::bind(&BaseWSPeer::do_write, std::bind(&BaseWSPeer::do_write,
impl().shared_from_this())); impl().shared_from_this()));
@@ -321,7 +319,6 @@ do_read()
if(! strand_.running_in_this_thread()) if(! strand_.running_in_this_thread())
return strand_.post(std::bind( return strand_.post(std::bind(
&BaseWSPeer::do_read, impl().shared_from_this())); &BaseWSPeer::do_read, impl().shared_from_this()));
using namespace beast::asio;
impl().ws_.async_read(rb_, strand_.wrap( impl().ws_.async_read(rb_, strand_.wrap(
std::bind(&BaseWSPeer::on_read, std::bind(&BaseWSPeer::on_read,
impl().shared_from_this(), std::placeholders::_1))); impl().shared_from_this(), std::placeholders::_1)));
@@ -398,12 +395,13 @@ on_ping(error_code const& ec)
template<class Handler, class Impl> template<class Handler, class Impl>
void void
BaseWSPeer<Handler, Impl>:: BaseWSPeer<Handler, Impl>::
on_ping_pong(bool is_pong, on_ping_pong(beast::websocket::frame_type kind,
beast::websocket::ping_data const& payload) beast::string_view payload)
{ {
if(is_pong) if(kind == beast::websocket::frame_type::pong)
{ {
if(payload == payload_) beast::string_view p(payload_.begin());
if(payload == p)
{ {
close_on_timer_ = false; close_on_timer_ = false;
JLOG(this->j_.trace()) << JLOG(this->j_.trace()) <<

2
src/ripple/server/impl/Port.cpp
View File

@@ -188,7 +188,7 @@ parse_Port (ParsedPort& port, Section const& section, std::ostream& log)
{ {
auto const lim = get (section, "limit", "unlimited"); auto const lim = get (section, "limit", "unlimited");
if (!beast::detail::ci_equal (lim, "unlimited")) if (!beast::detail::iequals (lim, "unlimited"))
{ {
try try
{ {

6
src/test/app/ValidatorSite_test.cpp
View File

@@ -157,7 +157,7 @@ private:
res.insert("Server", "http_sync_server"); res.insert("Server", "http_sync_server");
res.insert("Content-Type", "text/html"); res.insert("Content-Type", "text/html");
res.body = "The file '" + path + "' was not found"; res.body = "The file '" + path + "' was not found";
res.prepare(); res.prepare_payload();
write(sock, res, ec); write(sock, res, ec);
if(ec) if(ec)
break; break;
@@ -171,7 +171,7 @@ private:
res.body = list_; res.body = list_;
try try
{ {
res.prepare(); res.prepare_payload();
} }
catch(std::exception const& e) catch(std::exception const& e)
{ {
@@ -182,7 +182,7 @@ private:
res.insert("Content-Type", "text/html"); res.insert("Content-Type", "text/html");
res.body = res.body =
std::string{"An internal error occurred"} + e.what(); std::string{"An internal error occurred"} + e.what();
res.prepare(); res.prepare_payload();
} }
write(sock, res, ec); write(sock, res, ec);
if(ec) if(ec)

2
src/test/jtx/impl/JSONRPCClient.cpp
View File

@@ -130,7 +130,7 @@ public:
} }
req.body = to_string(jr); req.body = to_string(jr);
} }
req.prepare(); req.prepare_payload();
write(stream_, req); write(stream_, req);
response<dynamic_body> res; response<dynamic_body> res;

6
src/test/nodestore/import_test.cpp
View File

@@ -27,7 +27,7 @@
#include <nudb/create.hpp> #include <nudb/create.hpp>
#include <nudb/detail/format.hpp> #include <nudb/detail/format.hpp>
#include <nudb/xxhasher.hpp> #include <nudb/xxhasher.hpp>
#include <beast/core/detail/ci_char_traits.hpp> #include <beast/core/string.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
@@ -258,7 +258,7 @@ public:
} }
}; };
std::map <std::string, std::string, beast::detail::ci_less> std::map <std::string, std::string, beast::iless>
parse_args(std::string const& s) parse_args(std::string const& s)
{ {
// <key> '=' <value> // <key> '=' <value>
@@ -274,7 +274,7 @@ parse_args(std::string const& s)
, boost::regex_constants::optimize , boost::regex_constants::optimize
); );
std::map <std::string, std::map <std::string,
std::string, beast::detail::ci_less> map; std::string, beast::iless> map;
auto const v = beast::rfc2616::split( auto const v = beast::rfc2616::split(
s.begin(), s.end(), ','); s.begin(), s.end(), ',');
for (auto const& kv : v) for (auto const& kv : v)

16
src/test/server/ServerStatus_test.cpp
View File

@@ -123,7 +123,7 @@ class ServerStatus_test :
req.insert("Content-Type", "application/json; charset=UTF-8"); req.insert("Content-Type", "application/json; charset=UTF-8");
req.body = body; req.body = body;
} }
req.prepare(); req.prepare_payload();
return req; return req;
} }
@@ -131,7 +131,7 @@ class ServerStatus_test :
void void
doRequest( doRequest(
boost::asio::yield_context& yield, boost::asio::yield_context& yield,
beast::http::request<beast::http::string_body> const& req, beast::http::request<beast::http::string_body>& req,
std::string const& host, std::string const& host,
uint16_t port, uint16_t port,
bool secure, bool secure,
@@ -161,7 +161,7 @@ class ServerStatus_test :
ss.async_handshake(ssl::stream_base::client, yield[ec]); ss.async_handshake(ssl::stream_base::client, yield[ec]);
if(ec) if(ec)
return; return;
async_write(ss, req, yield[ec]); beast::http::async_write(ss, req, yield[ec]);
if(ec) if(ec)
return; return;
async_read(ss, sb, resp, yield[ec]); async_read(ss, sb, resp, yield[ec]);
@@ -174,7 +174,7 @@ class ServerStatus_test :
async_connect(sock, it, yield[ec]); async_connect(sock, it, yield[ec]);
if(ec) if(ec)
return; return;
async_write(sock, req, yield[ec]); beast::http::async_write(sock, req, yield[ec]);
if(ec) if(ec)
return; return;
async_read(sock, sb, resp, yield[ec]); async_read(sock, sb, resp, yield[ec]);
@@ -195,10 +195,11 @@ class ServerStatus_test :
{ {
auto const port = env.app().config()["port_ws"]. auto const port = env.app().config()["port_ws"].
get<std::uint16_t>("port"); get<std::uint16_t>("port");
auto const ip = env.app().config()["port_ws"]. auto ip = env.app().config()["port_ws"].
get<std::string>("ip"); get<std::string>("ip");
auto req = makeWSUpgrade(*ip, *port);
doRequest( doRequest(
yield, makeWSUpgrade(*ip, *port), *ip, *port, secure, resp, ec); yield, req, *ip, *port, secure, resp, ec);
return; return;
} }
@@ -215,9 +216,10 @@ class ServerStatus_test :
get<std::uint16_t>("port"); get<std::uint16_t>("port");
auto const ip = env.app().config()["port_rpc"]. auto const ip = env.app().config()["port_rpc"].
get<std::string>("ip"); get<std::string>("ip");
auto req = makeHTTPRequest(*ip, *port, body);
doRequest( doRequest(
yield, yield,
makeHTTPRequest(*ip, *port, body), req,
*ip, *ip,
*port, *port,
secure, secure,