diff --git a/.drone/drone.bat b/.drone/drone.bat index 0db571c2..b310d140 100644 --- a/.drone/drone.bat +++ b/.drone/drone.bat @@ -47,7 +47,7 @@ pushd !BOOST_ROOT!\libs git clone https://github.com/cppalliance/capy -b !BOOST_BRANCH! --depth 1 popd pushd !BOOST_ROOT!\libs -git clone https://github.com/cppalliance/http_proto -b !BOOST_BRANCH! --depth 1 +git clone https://github.com/cppalliance/http -b !BOOST_BRANCH! --depth 1 popd echo '==================================> COMPILE' diff --git a/.drone/drone.sh b/.drone/drone.sh index 23732c17..2a249e5b 100644 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -47,9 +47,9 @@ common_install () { popd fi - if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then + if [ ! -d "$BOOST_ROOT/libs/http" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1 popd fi } @@ -139,9 +139,9 @@ if [ ! -d "$BOOST_ROOT/libs/capy" ]; then popd fi -if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then +if [ ! -d "$BOOST_ROOT/libs/http" ]; then pushd $BOOST_ROOT/libs - git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1 + git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1 popd fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a85b42df..1110c661 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -694,7 +694,7 @@ jobs: - name: Clone Boost.Http.Proto uses: actions/checkout@v3 with: - repository: cppalliance/http_proto + repository: cppalliance/http path: http-proto-root ref: develop @@ -745,7 +745,7 @@ jobs: capy-root scan-modules-ignore: | beast2 - http_proto + http buffers capy @@ -822,7 +822,7 @@ jobs: # Patch boost-root with workspace module cp -r "$workspace_root"/http-io-root "libs/$module" - cp -r "$workspace_root"/http-proto-root libs/http_proto + cp -r "$workspace_root"/http-proto-root libs/http cp -r "$workspace_root"/buffers-root libs/buffers cp -r "$workspace_root"/capy-root libs/capy @@ -846,7 +846,7 @@ jobs: cxxflags: ${{ (matrix.asan && '-fsanitize=pointer-subtract') || '' }} user-config: ${{ ((startsWith(matrix.runs-on, 'windows') || startsWith(matrix.runs-on, 'macOS')) && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }} stop-on-error: true - extra-args: "libs/beast2/example" # https://github.com/ashtum/cpp-actions/issues/23 + extra-args: "libs/beast2/example" - name: Boost CMake Workflow uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0 @@ -1041,7 +1041,7 @@ jobs: - name: Clone Boost.Http.Proto uses: actions/checkout@v3 with: - repository: cppalliance/http_proto + repository: cppalliance/http path: http-proto-root ref: develop @@ -1073,7 +1073,7 @@ jobs: capy-root scan-modules-ignore: | beast2 - http_proto + http buffers capy @@ -1108,7 +1108,7 @@ jobs: # Patch boost-root with workspace module cp -r "$workspace_root"/http-io-root "libs/$module" - cp -r "$workspace_root"/http-proto-root libs/http_proto + cp -r "$workspace_root"/http-proto-root libs/http cp -r "$workspace_root"/buffers-root libs/buffers cp -r "$workspace_root"/capy-root libs/capy diff --git a/CMakeLists.txt b/CMakeLists.txt index 15e3eba8..1bb2fe8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,15 +63,14 @@ set(BOOST_BEAST2_DEPENDENCIES Boost::core Boost::describe Boost::endian - Boost::http_proto + Boost::http Boost::json Boost::mp11 Boost::static_assert Boost::system Boost::throw_exception Boost::url - Boost::variant2 - ) + Boost::variant2) foreach (BOOST_BEAST2_DEPENDENCY ${BOOST_BEAST2_DEPENDENCIES}) if (BOOST_BEAST2_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$") @@ -125,7 +124,7 @@ if (BOOST_BEAST2_IS_ROOT) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BOOST_SRC_DIR}/tools/cmake/include") else () # From Boost Package - find_package(Boost REQUIRED COMPONENTS buffers capy http_proto json program_options scope system url) + find_package(Boost REQUIRED COMPONENTS buffers capy http json program_options scope system url) foreach (BOOST_INCLUDE_LIBRARY ${BOOST_INCLUDE_LIBRARIES}) if (NOT TARGET Boost::${BOOST_INCLUDE_LIBRARY}) add_library(Boost::${BOOST_INCLUDE_LIBRARY} ALIAS Boost::headers) diff --git a/build/Jamfile b/build/Jamfile index af54ac18..6b2a3763 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -47,11 +47,11 @@ explicit beast2_sources ; lib boost_beast2 : beast2_sources : requirements - /boost//http_proto + /boost//http ../ BOOST_BEAST2_SOURCE : usage-requirements - /boost//http_proto + /boost//http ; boost-install boost_beast2 ; diff --git a/doc/antora.yml b/doc/antora.yml index 6dcc0082..6f547189 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -13,8 +13,8 @@ ext: config: doc/mrdocs.yml cpp-tagfiles: files: - - file: ./doc/tagfiles/boost-http_proto-doxygen.tag.xml + - file: ./doc/tagfiles/boost-http-doxygen.tag.xml base_url: 'xref:reference:' using-namespaces: - boost::beast2 - - boost::http_proto + - boost::http diff --git a/doc/tagfiles/boost-http_proto-doxygen.tag.xml b/doc/tagfiles/boost-http-doxygen.tag.xml similarity index 55% rename from doc/tagfiles/boost-http_proto-doxygen.tag.xml rename to doc/tagfiles/boost-http-doxygen.tag.xml index 88ccc858..48273eab 100644 --- a/doc/tagfiles/boost-http_proto-doxygen.tag.xml +++ b/doc/tagfiles/boost-http-doxygen.tag.xml @@ -1,2545 +1,2705 @@ - boost::http_proto - boost/http_proto.adoc - boost::http_proto::grammar - boost::http_proto::is_sink - boost::http_proto::is_source - boost::http_proto::fields - boost::http_proto::fields_base - boost::http_proto::file - boost::http_proto::file_sink - boost::http_proto::file_source - boost::http_proto::header_limits - boost::http_proto::message_base - boost::http_proto::metadata - boost::http_proto::parameter - boost::http_proto::parser - boost::http_proto::quoted_token_view - boost::http_proto::request - boost::http_proto::request_base - boost::http_proto::request_parser - boost::http_proto::response - boost::http_proto::response_base - boost::http_proto::response_parser - boost::http_proto::serializer - boost::http_proto::sink - boost::http_proto::source - boost::http_proto::static_request - boost::http_proto::static_response - boost::http_proto::string_body - boost::http_proto::upgrade_protocol - boost::http_proto::condition - boost::http_proto::content_coding - boost::http_proto::error - boost::http_proto::field - boost::http_proto::file_mode - boost::http_proto::method - boost::http_proto::payload - boost::http_proto::status - boost::http_proto::status_class - boost::http_proto::version - boost::http_proto::swap - boost::http_proto::to_status_class - boost::http_proto::to_string - boost::http_proto::operator<< - boost::http_proto::parameter_rule - boost::http_proto::quoted_token_rule - boost::http_proto::tchars - boost::http_proto::token_rule - boost::http_proto::upgrade_protocol_rule - boost::http_proto::upgrade_rule + boost::http + boost/http.adoc + boost::http::grammar + boost::http::is_sink + boost::http::is_source + boost::http::route_result + boost::http::router + boost::http::acceptor_config + boost::http::any_router + boost::http::basic_router + boost::http::cors + boost::http::cors_options + boost::http::fields + boost::http::fields_base + boost::http::file_sink + boost::http::file_source + boost::http::header_limits + boost::http::message_base + boost::http::metadata + boost::http::parameter + boost::http::parser + boost::http::quoted_token_view + boost::http::request + boost::http::request_base + boost::http::request_parser + boost::http::response + boost::http::response_base + boost::http::response_parser + boost::http::resumer + boost::http::route_params + boost::http::route_params_base + boost::http::router_options + boost::http::serializer + boost::http::sink + boost::http::source + boost::http::static_request + boost::http::static_response + boost::http::string_body + boost::http::suspender + boost::http::upgrade_protocol + boost::http::condition + boost::http::content_coding + boost::http::error + boost::http::field + boost::http::method + boost::http::payload + boost::http::route + boost::http::status + boost::http::status_class + boost::http::version + boost::http::swap + boost::http::to_status_class + boost::http::to_string + boost::http::operator<< + boost::http::parameter_rule + boost::http::quoted_token_rule + boost::http::tchars + boost::http::token_rule + boost::http::upgrade_protocol_rule + boost::http::upgrade_rule + + auto + co_route + boost/http/co_route.adoc + + (std::function<capy::task<route_result>(route_params&)> f) + core::string_view combine_field_values - boost/http_proto/combine_field_values.adoc + boost/http/combine_field_values.adoc (const fields_base::subrange& vr, grammar::recycled_ptr<std::string>& temp) void install_parser_service - boost/http_proto/install_parser_service.adoc + boost/http/install_parser_service.adoc - (rts::context& ctx, const parser::config_base& cfg) + (capy::polystore& ctx, const parser::config_base& cfg) void install_serializer_service - boost/http_proto/install_serializer_service.adoc + boost/http/install_serializer_service.adoc - (rts::context& ctx, const serializer::config& cfg) + (capy::polystore& ctx, const serializer::config& cfg) status int_to_status - boost/http_proto/int_to_status.adoc + boost/http/int_to_status.adoc (unsigned int v) - implementation_defined::list_rule_t<Rule> - list_rule - boost/http_proto/list_rule.adoc + bool + is_route_result + boost/http/is_route_result.adoc - (const Rule& r, std::size_t n, std::size_t m) + (route_result rv) - system::error_code - make_error_code - boost/http_proto/make_error_code.adoc + implementation_defined::list_rule_t<Rule> + list_rule + boost/http/list_rule.adoc - (error ev) + (const Rule& r, std::size_t n, std::size_t m) system::error_condition make_error_condition - boost/http_proto/make_error_condition.adoc + boost/http/make_error_condition.adoc (condition c) - - core::string_view - obsolete_reason - boost/http_proto/obsolete_reason.adoc - - (status v) - boost::optional<field> string_to_field - boost/http_proto/string_to_field.adoc + boost/http/string_to_field.adoc (core::string_view s) method string_to_method - boost/http_proto/string_to_method.adoc + boost/http/string_to_method.adoc (core::string_view s) - boost::http_proto::grammar - boost/http_proto/grammar.adoc + boost::http::grammar + boost/http/grammar.adoc + + + boost::http::is_sink + boost/http/is_sink.adoc + + + boost::http::is_source + boost/http/is_source.adoc + + + boost::http::route_result + boost/http/route_result.adoc + + + boost::http::router + boost/http/router.adoc + + + boost::http::acceptor_config + boost/http/acceptor_config.adoc + + + boost::http::any_router + boost/http/any_router.adoc + + void + ~any_router + boost/http/any_router/2destructor.adoc + + () + + + std::size_t + count + boost/http/any_router/count.adoc + + () + + + route_result + do_dispatch + boost/http/any_router/do_dispatch.adoc + + (route_params_base&) + + + layer& + new_layer + boost/http/any_router/new_layer.adoc + + (core::string_view pattern) + + + route_result + resume_impl + boost/http/any_router/resume_impl.adoc + + (route_params_base&, route_result ec) + + + + boost::http::basic_router + boost/http/basic_router.adoc + + void + all + boost/http/basic_router/all.adoc + + (core::string_view pattern, H1&& h1, ...HN...&& hn) + + + route_result + resume + boost/http/basic_router/resume.adoc + + (Params& p, const route_result& rv) + + + fluent_route + route + boost/http/basic_router/route.adoc + + (core::string_view pattern) + - boost::http_proto::is_sink - boost/http_proto/is_sink.adoc + boost::http::cors + boost/http/cors.adoc + + void + cors + boost/http/cors/2constructor.adoc + + (cors_options options) + + + route_result + operator() + boost/http/cors/operator_call.adoc + + (route_params& p) + - boost::http_proto::is_source - boost/http_proto/is_source.adoc + boost::http::cors_options + boost/http/cors_options.adoc - boost::http_proto::fields - boost/http_proto/fields.adoc + boost::http::fields + boost/http/fields.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () void swap - boost/http_proto/fields/swap.adoc + boost/http/fields/swap.adoc (fields& other) std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::fields_base - boost/http_proto/fields_base.adoc + boost::http::fields_base + boost/http/fields_base.adoc void ~fields_base - boost/http_proto/fields_base/2destructor.adoc + boost/http/fields_base/2destructor.adoc () iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc - - () - - - - boost::http_proto::file - boost/http_proto/file.adoc - - void - ~file - boost/http_proto/file/2destructor.adoc - - () - - - file& - operator= - boost/http_proto/file/operator_assign.adoc - - (file&& other) - - - bool - is_open - boost/http_proto/file/is_open.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::file_sink - boost/http_proto/file_sink.adoc + boost::http::file_sink + boost/http/file_sink.adoc void ~file_sink - boost/http_proto/file_sink/2destructor.adoc + boost/http/file_sink/2destructor.adoc () results write - boost/http_proto/sink/write.adoc + boost/http/sink/write.adoc (const ConstBufferSequence& bs, bool more) - boost::http_proto::file_source - boost/http_proto/file_source.adoc + boost::http::file_source + boost/http/file_source.adoc void ~file_source - boost/http_proto/file_source/2destructor.adoc + boost/http/file_source/2destructor.adoc () results read - boost/http_proto/source/read.adoc + boost/http/source/read.adoc (const MutableBufferSequence& bs) - boost::http_proto::header_limits - boost/http_proto/header_limits.adoc + boost::http::header_limits + boost/http/header_limits.adoc std::size_t valid_space_needed - boost/http_proto/header_limits/valid_space_needed.adoc + boost/http/header_limits/valid_space_needed.adoc () - boost::http_proto::message_base - boost/http_proto/message_base.adoc + boost::http::message_base + boost/http/message_base.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::metadata - boost/http_proto/metadata.adoc + boost::http::metadata + boost/http/metadata.adoc void metadata - boost/http_proto/metadata/2constructor.adoc + boost/http/metadata/2constructor.adoc () - boost::http_proto::parameter - boost/http_proto/parameter.adoc + boost::http::parameter + boost/http/parameter.adoc - boost::http_proto::parser - boost/http_proto/parser.adoc + boost::http::parser + boost/http/parser.adoc core::string_view body - boost/http_proto/parser/body.adoc + boost/http/parser/body.adoc () void commit - boost/http_proto/parser/commit.adoc + boost/http/parser/commit.adoc (std::size_t n) void commit_eof - boost/http_proto/parser/commit_eof.adoc + boost/http/parser/commit_eof.adoc () void consume_body - boost/http_proto/parser/consume_body.adoc + boost/http/parser/consume_body.adoc (std::size_t n) bool got_header - boost/http_proto/parser/got_header.adoc + boost/http/parser/got_header.adoc + + () + + + bool + is_body_set + boost/http/parser/is_body_set.adoc () bool is_complete - boost/http_proto/parser/is_complete.adoc + boost/http/parser/is_complete.adoc () void parse - boost/http_proto/parser/parse.adoc + boost/http/parser/parse.adoc (system::error_code& ec) mutable_buffers_type prepare - boost/http_proto/parser/prepare.adoc + boost/http/parser/prepare.adoc () const_buffers_type pull_body - boost/http_proto/parser/pull_body.adoc + boost/http/parser/pull_body.adoc () core::string_view release_buffered_data - boost/http_proto/parser/release_buffered_data.adoc + boost/http/parser/release_buffered_data.adoc () void reset - boost/http_proto/parser/reset.adoc + boost/http/parser/reset.adoc () void set_body_limit - boost/http_proto/parser/set_body_limit.adoc + boost/http/parser/set_body_limit.adoc (uint64_t n) void start - boost/http_proto/parser/start.adoc + boost/http/parser/start.adoc () void ~parser - boost/http_proto/parser/2destructor.adoc + boost/http/parser/2destructor.adoc () - bool - is_body_set - boost/http_proto/parser/is_body_set.adoc + void + assign + boost/http/parser/assign.adoc - () + (parser&& other) const static_request& safe_get_request - boost/http_proto/parser/safe_get_request.adoc + boost/http/parser/safe_get_request.adoc () const static_response& safe_get_response - boost/http_proto/parser/safe_get_response.adoc + boost/http/parser/safe_get_response.adoc () void start_impl - boost/http_proto/parser/start_impl.adoc + boost/http/parser/start_impl.adoc - (bool ) + (bool) detail::workspace& ws - boost/http_proto/parser/ws.adoc + boost/http/parser/ws.adoc () - boost::http_proto::quoted_token_view - boost/http_proto/quoted_token_view.adoc + boost::http::quoted_token_view + boost/http/quoted_token_view.adoc quoted_token_view& operator= - boost/http_proto/quoted_token_view/operator_assign-07.adoc + boost/http/quoted_token_view/operator_assign-0e.adoc (const quoted_token_view& other) const_reference at - boost/http_proto/quoted_token_view/at.adoc + boost/http/quoted_token_view/at.adoc (size_type pos) const_reference back - boost/http_proto/quoted_token_view/back.adoc + boost/http/quoted_token_view/back.adoc () const_iterator begin - boost/http_proto/quoted_token_view/begin.adoc + boost/http/quoted_token_view/begin.adoc () const_iterator cbegin - boost/http_proto/quoted_token_view/cbegin.adoc + boost/http/quoted_token_view/cbegin.adoc () const_iterator cend - boost/http_proto/quoted_token_view/cend.adoc + boost/http/quoted_token_view/cend.adoc () size_type copy - boost/http_proto/quoted_token_view/copy.adoc + boost/http/quoted_token_view/copy.adoc (char* s, size_type n, size_type pos) const_reverse_iterator crbegin - boost/http_proto/quoted_token_view/crbegin.adoc + boost/http/quoted_token_view/crbegin.adoc () const_reverse_iterator crend - boost/http_proto/quoted_token_view/crend.adoc + boost/http/quoted_token_view/crend.adoc () const_pointer data - boost/http_proto/quoted_token_view/data.adoc + boost/http/quoted_token_view/data.adoc () bool empty - boost/http_proto/quoted_token_view/empty.adoc + boost/http/quoted_token_view/empty.adoc () const_iterator end - boost/http_proto/quoted_token_view/end.adoc + boost/http/quoted_token_view/end.adoc () const_reference front - boost/http_proto/quoted_token_view/front.adoc + boost/http/quoted_token_view/front.adoc () bool has_escapes - boost/http_proto/quoted_token_view/has_escapes.adoc + boost/http/quoted_token_view/has_escapes.adoc () size_type length - boost/http_proto/quoted_token_view/length.adoc + boost/http/quoted_token_view/length.adoc () size_type max_size - boost/http_proto/quoted_token_view/max_size.adoc + boost/http/quoted_token_view/max_size.adoc () const_reference operator[] - boost/http_proto/quoted_token_view/operator_subs.adoc + boost/http/quoted_token_view/operator_subs.adoc (size_type pos) const_reverse_iterator rbegin - boost/http_proto/quoted_token_view/rbegin.adoc + boost/http/quoted_token_view/rbegin.adoc () const_reverse_iterator rend - boost/http_proto/quoted_token_view/rend.adoc + boost/http/quoted_token_view/rend.adoc () size_type size - boost/http_proto/quoted_token_view/size.adoc + boost/http/quoted_token_view/size.adoc () core::string_view substr - boost/http_proto/quoted_token_view/substr.adoc + boost/http/quoted_token_view/substr.adoc (size_type pos, size_type n) std::size_t unescaped_size - boost/http_proto/quoted_token_view/unescaped_size.adoc + boost/http/quoted_token_view/unescaped_size.adoc () std::string operator basic_string<char> - boost/http_proto/quoted_token_view/2conversion-042.adoc + boost/http/quoted_token_view/2conversion-08.adoc () std::string_view operator basic_string_view<char> - boost/http_proto/quoted_token_view/2conversion-04e.adoc + boost/http/quoted_token_view/2conversion-04.adoc () string_view_base& operator= - boost/http_proto/quoted_token_view/operator_assign-0e.adoc + boost/http/quoted_token_view/operator_assign-07.adoc (const string_view_base& other) void swap - boost/http_proto/quoted_token_view/swap.adoc + boost/http/quoted_token_view/swap.adoc (string_view_base& s) - boost::http_proto::request - boost/http_proto/request.adoc + boost::http::request + boost/http/request.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::method + http::method method - boost/http_proto/request_base/method.adoc + boost/http/request_base/method.adoc () core::string_view method_text - boost/http_proto/request_base/method_text.adoc + boost/http/request_base/method_text.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_expect_100_continue - boost/http_proto/request_base/set_expect_100_continue.adoc + boost/http/request_base/set_expect_100_continue.adoc (bool b) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) void set_target - boost/http_proto/request_base/set_target.adoc + boost/http/request_base/set_target.adoc (core::string_view s) void set_version - boost/http_proto/request_base/set_version.adoc + boost/http/request_base/set_version.adoc - (http_proto::version v) + (http::version v) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () void swap - boost/http_proto/request/swap.adoc + boost/http/request/swap.adoc (request& other) core::string_view target - boost/http_proto/request_base/target.adoc + boost/http/request_base/target.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::request_base - boost/http_proto/request_base.adoc + boost::http::request_base + boost/http/request_base.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::method + http::method method - boost/http_proto/request_base/method.adoc + boost/http/request_base/method.adoc () core::string_view method_text - boost/http_proto/request_base/method_text.adoc + boost/http/request_base/method_text.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_expect_100_continue - boost/http_proto/request_base/set_expect_100_continue.adoc + boost/http/request_base/set_expect_100_continue.adoc (bool b) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) void set_target - boost/http_proto/request_base/set_target.adoc + boost/http/request_base/set_target.adoc (core::string_view s) void set_version - boost/http_proto/request_base/set_version.adoc + boost/http/request_base/set_version.adoc - (http_proto::version v) + (http::version v) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () core::string_view target - boost/http_proto/request_base/target.adoc + boost/http/request_base/target.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () void set_start_line_impl - boost/http_proto/request_base/set_start_line_impl.adoc + boost/http/request_base/set_start_line_impl.adoc - (http_proto::method m, core::string_view ms, core::string_view t, http_proto::version v) + (http::method m, core::string_view ms, core::string_view t, http::version v) - boost::http_proto::request_parser - boost/http_proto/request_parser.adoc + boost::http::request_parser + boost/http/request_parser.adoc void ~request_parser - boost/http_proto/request_parser/2destructor.adoc + boost/http/request_parser/2destructor.adoc () + + request_parser& + operator= + boost/http/request_parser/operator_assign.adoc + + (request_parser&& other) + core::string_view body - boost/http_proto/parser/body.adoc + boost/http/parser/body.adoc () void commit - boost/http_proto/parser/commit.adoc + boost/http/parser/commit.adoc (std::size_t n) void commit_eof - boost/http_proto/parser/commit_eof.adoc + boost/http/parser/commit_eof.adoc () void consume_body - boost/http_proto/parser/consume_body.adoc + boost/http/parser/consume_body.adoc (std::size_t n) const static_request& get - boost/http_proto/request_parser/get.adoc + boost/http/request_parser/get.adoc () bool got_header - boost/http_proto/parser/got_header.adoc + boost/http/parser/got_header.adoc + + () + + + bool + is_body_set + boost/http/parser/is_body_set.adoc () bool is_complete - boost/http_proto/parser/is_complete.adoc + boost/http/parser/is_complete.adoc () void parse - boost/http_proto/parser/parse.adoc + boost/http/parser/parse.adoc (system::error_code& ec) mutable_buffers_type prepare - boost/http_proto/parser/prepare.adoc + boost/http/parser/prepare.adoc () const_buffers_type pull_body - boost/http_proto/parser/pull_body.adoc + boost/http/parser/pull_body.adoc () core::string_view release_buffered_data - boost/http_proto/parser/release_buffered_data.adoc + boost/http/parser/release_buffered_data.adoc () void reset - boost/http_proto/parser/reset.adoc + boost/http/parser/reset.adoc () void set_body_limit - boost/http_proto/parser/set_body_limit.adoc + boost/http/parser/set_body_limit.adoc (uint64_t n) void start - boost/http_proto/parser/start.adoc + boost/http/parser/start.adoc () - boost::http_proto::response - boost/http_proto/response.adoc + boost::http::response + boost/http/response.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () core::string_view reason - boost/http_proto/response_base/reason.adoc + boost/http/response_base/reason.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) + + void + set_status + boost/http/response_base/set_status.adoc + + (http::status sc) + + + void + set_version + boost/http/response_base/set_version.adoc + + (http::version v) + void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () - http_proto::status + http::status status - boost/http_proto/response_base/status.adoc + boost/http/response_base/status.adoc () unsigned short status_int - boost/http_proto/response_base/status_int.adoc + boost/http/response_base/status_int.adoc () void swap - boost/http_proto/response/swap.adoc + boost/http/response/swap.adoc (response& other) - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::response_base - boost/http_proto/response_base.adoc + boost::http::response_base + boost/http/response_base.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () core::string_view reason - boost/http_proto/response_base/reason.adoc + boost/http/response_base/reason.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) + + void + set_status + boost/http/response_base/set_status.adoc + + (http::status sc) + + + void + set_version + boost/http/response_base/set_version.adoc + + (http::version v) + void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () - http_proto::status + http::status status - boost/http_proto/response_base/status.adoc + boost/http/response_base/status.adoc () unsigned short status_int - boost/http_proto/response_base/status_int.adoc + boost/http/response_base/status_int.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () void set_start_line_impl - boost/http_proto/response_base/set_start_line_impl.adoc + boost/http/response_base/set_start_line_impl.adoc - (http_proto::status sc, unsigned short si, core::string_view reason, http_proto::version v) + (http::status sc, unsigned short si, core::string_view reason, http::version v) - boost::http_proto::response_parser - boost/http_proto/response_parser.adoc - - void - ~response_parser - boost/http_proto/response_parser/2destructor.adoc - - () - - - core::string_view - body - boost/http_proto/parser/body.adoc - - () - + boost::http::response_parser + boost/http/response_parser.adoc + + + boost::http::resumer + boost/http/resumer.adoc - void - commit - boost/http_proto/parser/commit.adoc + resumer& + operator= + boost/http/resumer/operator_assign.adoc - (std::size_t n) + (const resumer& other) + + + boost::http::route_params + boost/http/route_params.adoc void - commit_eof - boost/http_proto/parser/commit_eof.adoc + ~route_params + boost/http/route_params/2destructor.adoc () - void - consume_body - boost/http_proto/parser/consume_body.adoc - - (std::size_t n) - - - const static_response& - get - boost/http_proto/response_parser/get.adoc + route_result + read_body + boost/http/route_params/read_body.adoc - () + (ValueSink&& sink, Callback&& callback) - bool - got_header - boost/http_proto/parser/got_header.adoc + void + reset + boost/http/route_params/reset.adoc () - bool - is_complete - boost/http_proto/parser/is_complete.adoc + route_params& + set_body + boost/http/route_params/set_body.adoc - () + (std::string s) - void - parse - boost/http_proto/parser/parse.adoc + route_result + spawn + boost/http/route_params/spawn.adoc - (system::error_code& ec) + (capy::task<route_result> coro) - mutable_buffers_type - prepare - boost/http_proto/parser/prepare.adoc - - () - - - const_buffers_type - pull_body - boost/http_proto/parser/pull_body.adoc + route_params& + status + boost/http/route_params/status.adoc - () + (http::status code) + + + boost::http::route_params_base + boost/http/route_params_base.adoc - core::string_view - release_buffered_data - boost/http_proto/parser/release_buffered_data.adoc + route_params_base& + operator= + boost/http/route_params_base/operator_assign.adoc - () + (const route_params_base&) + + + boost::http::router_options + boost/http/router_options.adoc void - reset - boost/http_proto/parser/reset.adoc + router_options + boost/http/router_options/2constructor.adoc () - void - set_body_limit - boost/http_proto/parser/set_body_limit.adoc + router_options& + case_sensitive + boost/http/router_options/case_sensitive.adoc - (uint64_t n) + (bool value) - void - start - boost/http_proto/parser/start.adoc + router_options& + merge_params + boost/http/router_options/merge_params.adoc - () + (bool value) - void - start_head_response - boost/http_proto/response_parser/start_head_response.adoc + router_options& + strict + boost/http/router_options/strict.adoc - () + (bool value) - boost::http_proto::serializer - boost/http_proto/serializer.adoc + boost::http::serializer + boost/http/serializer.adoc void ~serializer - boost/http_proto/serializer/2destructor.adoc + boost/http/serializer/2destructor.adoc () + + serializer& + operator= + boost/http/serializer/operator_assign.adoc + + (serializer&& other) + void consume - boost/http_proto/serializer/consume.adoc + boost/http/serializer/consume.adoc (std::size_t n) bool is_done - boost/http_proto/serializer/is_done.adoc + boost/http/serializer/is_done.adoc () system::result<const_buffers_type> prepare - boost/http_proto/serializer/prepare.adoc + boost/http/serializer/prepare.adoc () void reset - boost/http_proto/serializer/reset.adoc + boost/http/serializer/reset.adoc () stream start_stream - boost/http_proto/serializer/start_stream.adoc + boost/http/serializer/start_stream.adoc (const message_base& m) void start_buffers - boost/http_proto/serializer/start_buffers.adoc + boost/http/serializer/start_buffers.adoc - (const message_base& , cbs_gen& ) + (const message_base&, cbs_gen&) void start_init - boost/http_proto/serializer/start_init.adoc + boost/http/serializer/start_init.adoc - (const message_base& ) + (const message_base&) void start_source - boost/http_proto/serializer/start_source.adoc + boost/http/serializer/start_source.adoc - (const message_base& , source& ) + (const message_base&, source&) detail::workspace& ws - boost/http_proto/serializer/ws.adoc + boost/http/serializer/ws.adoc () - boost::http_proto::sink - boost/http_proto/sink.adoc + boost::http::sink + boost/http/sink.adoc results write - boost/http_proto/sink/write.adoc + boost/http/sink/write.adoc (const ConstBufferSequence& bs, bool more) - boost::http_proto::source - boost/http_proto/source.adoc + boost::http::source + boost/http/source.adoc results read - boost/http_proto/source/read.adoc + boost/http/source/read.adoc (const MutableBufferSequence& bs) - boost::http_proto::static_request - boost/http_proto/static_request.adoc + boost::http::static_request + boost/http/static_request.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::method + http::method method - boost/http_proto/request_base/method.adoc + boost/http/request_base/method.adoc () core::string_view method_text - boost/http_proto/request_base/method_text.adoc + boost/http/request_base/method_text.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_expect_100_continue - boost/http_proto/request_base/set_expect_100_continue.adoc + boost/http/request_base/set_expect_100_continue.adoc (bool b) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) void set_target - boost/http_proto/request_base/set_target.adoc + boost/http/request_base/set_target.adoc (core::string_view s) void set_version - boost/http_proto/request_base/set_version.adoc + boost/http/request_base/set_version.adoc - (http_proto::version v) + (http::version v) void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () core::string_view target - boost/http_proto/request_base/target.adoc + boost/http/request_base/target.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::static_response - boost/http_proto/static_response.adoc + boost::http::static_response + boost/http/static_response.adoc iterator begin - boost/http_proto/fields_base/begin.adoc + boost/http/fields_base/begin.adoc () core::string_view buffer - boost/http_proto/fields_base/buffer.adoc + boost/http/fields_base/buffer.adoc () std::size_t capacity_in_bytes - boost/http_proto/fields_base/capacity_in_bytes.adoc + boost/http/fields_base/capacity_in_bytes.adoc () bool chunked - boost/http_proto/message_base/chunked.adoc + boost/http/message_base/chunked.adoc () void clear - boost/http_proto/fields_base/clear.adoc + boost/http/fields_base/clear.adoc () iterator end - boost/http_proto/fields_base/end.adoc + boost/http/fields_base/end.adoc () bool keep_alive - boost/http_proto/message_base/keep_alive.adoc + boost/http/message_base/keep_alive.adoc () std::size_t max_capacity_in_bytes - boost/http_proto/fields_base/max_capacity_in_bytes.adoc + boost/http/fields_base/max_capacity_in_bytes.adoc () - const http_proto::metadata& + const http::metadata& metadata - boost/http_proto/message_base/metadata.adoc + boost/http/message_base/metadata.adoc () - http_proto::payload + http::payload payload - boost/http_proto/message_base/payload.adoc + boost/http/message_base/payload.adoc () uint64_t payload_size - boost/http_proto/message_base/payload_size.adoc + boost/http/message_base/payload_size.adoc () reverse_iterator rbegin - boost/http_proto/fields_base/rbegin.adoc + boost/http/fields_base/rbegin.adoc () core::string_view reason - boost/http_proto/response_base/reason.adoc + boost/http/response_base/reason.adoc () reverse_iterator rend - boost/http_proto/fields_base/rend.adoc + boost/http/fields_base/rend.adoc () void reserve_bytes - boost/http_proto/fields_base/reserve_bytes.adoc + boost/http/fields_base/reserve_bytes.adoc (std::size_t n) void set_chunked - boost/http_proto/message_base/set_chunked.adoc + boost/http/message_base/set_chunked.adoc (bool value) void set_content_length - boost/http_proto/message_base/set_content_length.adoc + boost/http/message_base/set_content_length.adoc (uint64_t n) void set_keep_alive - boost/http_proto/message_base/set_keep_alive.adoc + boost/http/message_base/set_keep_alive.adoc (bool value) void set_max_capacity_in_bytes - boost/http_proto/fields_base/set_max_capacity_in_bytes.adoc + boost/http/fields_base/set_max_capacity_in_bytes.adoc (std::size_t n) void set_payload_size - boost/http_proto/message_base/set_payload_size.adoc + boost/http/message_base/set_payload_size.adoc (uint64_t n) + + void + set_status + boost/http/response_base/set_status.adoc + + (http::status sc) + + + void + set_version + boost/http/response_base/set_version.adoc + + (http::version v) + void shrink_to_fit - boost/http_proto/fields_base/shrink_to_fit.adoc + boost/http/fields_base/shrink_to_fit.adoc () std::size_t size - boost/http_proto/fields_base/size.adoc + boost/http/fields_base/size.adoc () - http_proto::status + http::status status - boost/http_proto/response_base/status.adoc + boost/http/response_base/status.adoc () unsigned short status_int - boost/http_proto/response_base/status_int.adoc + boost/http/response_base/status_int.adoc () - http_proto::version + http::version version - boost/http_proto/message_base/version.adoc + boost/http/message_base/version.adoc () std::size_t max_size - boost/http_proto/fields_base/max_size.adoc + boost/http/fields_base/max_size.adoc () - boost::http_proto::string_body - boost/http_proto/string_body.adoc + boost::http::string_body + boost/http/string_body.adoc const_iterator begin - boost/http_proto/string_body/begin.adoc + boost/http/string_body/begin.adoc () const_iterator end - boost/http_proto/string_body/end.adoc + boost/http/string_body/end.adoc () - boost::http_proto::upgrade_protocol - boost/http_proto/upgrade_protocol.adoc + boost::http::suspender + boost/http/suspender.adoc + + suspender& + operator= + boost/http/suspender/operator_assign.adoc + + (const suspender& other) + + + route_result + operator() + boost/http/suspender/operator_call.adoc + + (F&& f) + + + + boost::http::upgrade_protocol + boost/http/upgrade_protocol.adoc - boost::http_proto::condition - boost/http_proto/condition.adoc + boost::http::condition + boost/http/condition.adoc - boost::http_proto::content_coding - boost/http_proto/content_coding.adoc + boost::http::content_coding + boost/http/content_coding.adoc - boost::http_proto::error - boost/http_proto/error.adoc + boost::http::error + boost/http/error.adoc - boost::http_proto::field - boost/http_proto/field.adoc + boost::http::field + boost/http/field.adoc - boost::http_proto::file_mode - boost/http_proto/file_mode.adoc + boost::http::method + boost/http/method.adoc - boost::http_proto::method - boost/http_proto/method.adoc + boost::http::payload + boost/http/payload.adoc - boost::http_proto::payload - boost/http_proto/payload.adoc + boost::http::route + boost/http/route.adoc - boost::http_proto::status - boost/http_proto/status.adoc + boost::http::status + boost/http/status.adoc - boost::http_proto::status_class - boost/http_proto/status_class.adoc + boost::http::status_class + boost/http/status_class.adoc - boost::http_proto::version - boost/http_proto/version.adoc + boost::http::version + boost/http/version.adoc - boost::http_proto::swap - boost/http_proto/swap-0e.adoc + boost::http::swap + boost/http/swap-0b.adoc - boost::http_proto::to_status_class - boost/http_proto/to_status_class-08.adoc + boost::http::to_status_class + boost/http/to_status_class-03.adoc - boost::http_proto::to_string - boost/http_proto/to_string-0078.adoc + boost::http::to_string + boost/http/to_string-082.adoc - boost::http_proto::operator<< - boost/http_proto/operator_lshift-0f.adoc + boost::http::operator<< + boost/http/operator_lshift-0d.adoc - boost::http_proto::parameter_rule - boost/http_proto/parameter_rule.adoc + boost::http::parameter_rule + boost/http/parameter_rule.adoc - boost::http_proto::quoted_token_rule - boost/http_proto/quoted_token_rule.adoc + boost::http::quoted_token_rule + boost/http/quoted_token_rule.adoc - boost::http_proto::tchars - boost/http_proto/tchars.adoc + boost::http::tchars + boost/http/tchars.adoc - boost::http_proto::token_rule - boost/http_proto/token_rule.adoc + boost::http::token_rule + boost/http/token_rule.adoc - boost::http_proto::upgrade_protocol_rule - boost/http_proto/upgrade_protocol_rule.adoc + boost::http::upgrade_protocol_rule + boost/http/upgrade_protocol_rule.adoc - boost::http_proto::upgrade_rule - boost/http_proto/upgrade_rule.adoc + boost::http::upgrade_rule + boost/http/upgrade_rule.adoc diff --git a/example/client/burl/any_stream.hpp b/example/client/burl/any_stream.hpp index 62d348fe..3f247675 100644 --- a/example/client/burl/any_stream.hpp +++ b/example/client/burl/any_stream.hpp @@ -18,19 +18,19 @@ #include #include #include -#include -#include +#include +#include namespace asio = boost::asio; namespace buffers = boost::buffers; -namespace http_proto = boost::http_proto; +namespace http = boost::http; using error_code = boost::system::error_code; class any_stream { public: - using const_buffers_type = http_proto::serializer::const_buffers_type; - using mutable_buffers_type = http_proto::parser::mutable_buffers_type; + using const_buffers_type = http::serializer::const_buffers_type; + using mutable_buffers_type = http::parser::mutable_buffers_type; using executor_type = asio::any_io_executor; template diff --git a/example/client/burl/connect.cpp b/example/client/burl/connect.cpp index 7ed265ba..b9855d17 100644 --- a/example/client/burl/connect.cpp +++ b/example/client/burl/connect.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include namespace core = boost::core; @@ -166,8 +166,8 @@ connect_http_proxy( // Connect to the proxy server co_await asio::async_connect(stream, rresults); - using field = http_proto::field; - auto request = http_proto::request{}; + using field = http::field; + auto request = http::request{}; auto host_port = [&]() { auto rs = url.encoded_host().decode(); @@ -176,7 +176,7 @@ connect_http_proxy( return rs; }(); - request.set_method(http_proto::method::connect); + request.set_method(http::method::connect); request.set_target(host_port); request.set(field::host, host_port); request.set(field::proxy_connection, "keep-alive"); @@ -190,8 +190,8 @@ connect_http_proxy( request.set(field::proxy_authorization, basic_auth); } - auto serializer = http_proto::serializer{ capy_ctx }; - auto parser = http_proto::response_parser{ capy_ctx }; + auto serializer = http::serializer{ capy_ctx }; + auto parser = http::response_parser{ capy_ctx }; serializer.start(request); co_await beast2::async_write(stream, serializer); @@ -200,7 +200,7 @@ connect_http_proxy( parser.start(); co_await beast2::async_read_header(stream, parser); - if(parser.get().status() != http_proto::status::ok) + if(parser.get().status() != http::status::ok) throw std::runtime_error{ "Proxy server rejected the connection" }; } diff --git a/example/client/burl/main.cpp b/example/client/burl/main.cpp index 54139594..e5efc919 100644 --- a/example/client/burl/main.cpp +++ b/example/client/burl/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ constexpr bool capy_has_brotli = false; void set_target( const operation_config& oc, - http_proto::request& request, + http::request& request, const urls::url_view& url) { if(oc.request_target) @@ -78,21 +78,21 @@ struct is_redirect_result }; is_redirect_result -is_redirect(const operation_config& oc, http_proto::status status) noexcept +is_redirect(const operation_config& oc, http::status status) noexcept { // The specifications do not intend for 301 and 302 // redirects to change the HTTP method, but most // user agents do change the method in practice. switch(status) { - case http_proto::status::moved_permanently: + case http::status::moved_permanently: return { true, !oc.post301 }; - case http_proto::status::found: + case http::status::found: return { true, !oc.post302 }; - case http_proto::status::see_other: + case http::status::see_other: return { true, !oc.post303 }; - case http_proto::status::temporary_redirect: - case http_proto::status::permanent_redirect: + case http::status::temporary_redirect: + case http::status::permanent_redirect: return { true, false }; default: return { false, false }; @@ -100,16 +100,16 @@ is_redirect(const operation_config& oc, http_proto::status status) noexcept } bool -is_transient_error(http_proto::status status) noexcept +is_transient_error(http::status status) noexcept { switch(status) { - case http_proto::status::request_timeout: - case http_proto::status::too_many_requests: - case http_proto::status::internal_server_error: - case http_proto::status::bad_gateway: - case http_proto::status::service_unavailable: - case http_proto::status::gateway_timeout: + case http::status::request_timeout: + case http::status::too_many_requests: + case http::status::internal_server_error: + case http::status::bad_gateway: + case http::status::service_unavailable: + case http::status::gateway_timeout: return true; default: return false; @@ -118,14 +118,14 @@ is_transient_error(http_proto::status status) noexcept bool can_reuse_connection( - http_proto::response_base const& response, + http::response_base const& response, const urls::url_view& a, const urls::url_view& b) noexcept { if(a.encoded_origin() != b.encoded_origin()) return false; - if(response.version() != http_proto::version::http_1_1) + if(response.version() != http::version::http_1_1) return false; if(response.metadata().connection.close) @@ -137,28 +137,28 @@ can_reuse_connection( bool should_ignore_body( const operation_config& oc, - http_proto::response_base const& response) noexcept + http::response_base const& response) noexcept { - if(oc.resume_from && !response.count(http_proto::field::content_range)) + if(oc.resume_from && !response.count(http::field::content_range)) return true; return false; } boost::optional -body_size(http_proto::response_base const& response) +body_size(http::response_base const& response) { - if(response.payload() == http_proto::payload::size) + if(response.payload() == http::payload::size) return response.payload_size(); return boost::none; } urls::url redirect_url( - http_proto::response_base const& response, + http::response_base const& response, const urls::url_view& referer) { - auto it = response.find(http_proto::field::location); + auto it = response.find(http::field::location); if(it != response.end()) { auto rs = urls::parse_uri_reference(it->value); @@ -225,21 +225,21 @@ report_progress(progress_meter& pm) } } -http_proto::request +http::request create_request( const operation_config& oc, const message& msg, const urls::url_view& url) { - using field = http_proto::field; - using method = http_proto::method; - using version = http_proto::version; + using field = http::field; + using method = http::method; + using version = http::version; if(oc.disallow_username_in_url && url.has_userinfo()) throw std::runtime_error( "Credentials was passed in the URL when prohibited"); - auto request = http_proto::request{}; + auto request = http::request{}; request.set_method(oc.no_body ? method::head : method::get); @@ -308,7 +308,7 @@ create_request( return request; } -class sink : public http_proto::sink +class sink : public http::sink { progress_meter* pm_; any_ostream* os_; @@ -337,7 +337,7 @@ class sink : public http_proto::sink } }; -asio::awaitable +asio::awaitable perform_request( operation_config oc, boost::optional& header_output, @@ -348,11 +348,11 @@ perform_request( message msg, request_opt request_opt) { - using field = http_proto::field; + using field = http::field; auto executor = co_await asio::this_coro::executor; auto stream = any_stream{ asio::ip::tcp::socket{ executor } }; - auto parser = http_proto::response_parser{ capy_ctx }; - auto serializer = http_proto::serializer{ capy_ctx }; + auto parser = http::response_parser{ capy_ctx }; + auto serializer = http::serializer{ capy_ctx }; urls::url url = [&]() { @@ -440,7 +440,7 @@ perform_request( }(); if(oc.skip_existing && fs::exists(output_path)) - co_return http_proto::status::ok; + co_return http::status::ok; auto output = any_ostream{ output_path, !!oc.resume_from }; auto request = create_request(oc, msg, url); @@ -474,7 +474,7 @@ perform_request( stream.write_limit(oc.sendpersecond.value()); }; - auto stream_headers = [&](http_proto::response_base const& response) + auto stream_headers = [&](http::response_base const& response) { if(oc.show_headers) output << response.buffer(); @@ -518,7 +518,7 @@ perform_request( set_cookies(url, trusted); msg.start_serializer(serializer, request); - if(request.method() == http_proto::method::head) + if(request.method() == http::method::head) parser.start_head_response(); else parser.start(); @@ -562,9 +562,9 @@ perform_request( } // Change the method according to RFC 9110, Section 15.4.4. - if(need_method_change && request.method() != http_proto::method::head) + if(need_method_change && request.method() != http::method::head) { - request.set_method(http_proto::method::get); + request.set_method(http::method::get); request.erase(field::content_length); request.erase(field::content_encoding); request.erase(field::content_type); @@ -618,7 +618,7 @@ perform_request( } if(oc.resume_from && - parser.get().status() != http_proto::status::range_not_satisfiable && + parser.get().status() != http::status::range_not_satisfiable && parser.get().count(field::content_range) == 0) { throw std::runtime_error( @@ -663,7 +663,7 @@ perform_request( asio::awaitable retry( const operation_config& oc, - std::function()> request_task) + std::function()> request_task) { auto executor = co_await asio::this_coro::executor; auto timer = asio::steady_timer{ executor }; @@ -771,7 +771,7 @@ co_main(int argc, char* argv[]) // parser service { - http_proto::response_parser::config cfg; + http::response_parser::config cfg; cfg.body_limit = oc.max_filesize; cfg.min_buffer = 1024 * 1024; if constexpr(capy_has_brotli) @@ -785,14 +785,14 @@ co_main(int argc, char* argv[]) cfg.apply_gzip_decoder = true; capy::zlib::install_inflate_service(capy_ctx); } - http_proto::install_parser_service(capy_ctx, cfg); + http::install_parser_service(capy_ctx, cfg); } // serializer service { - http_proto::serializer::config cfg; + http::serializer::config cfg; cfg.payload_buffer = 1024 * 1024; - http_proto::install_serializer_service(capy_ctx, cfg); + http::install_serializer_service(capy_ctx, cfg); } if(!oc.headerfile.empty()) diff --git a/example/client/burl/message.cpp b/example/client/burl/message.cpp index c0ad53af..1e68abd7 100644 --- a/example/client/burl/message.cpp +++ b/example/client/burl/message.cpp @@ -11,7 +11,7 @@ #include "mime_type.hpp" #include -#include +#include #include #include @@ -26,10 +26,10 @@ string_body::string_body(std::string body, std::string content_type) { } -http_proto::method +http::method string_body::method() const noexcept { - return http_proto::method::post; + return http::method::post; } core::string_view @@ -57,10 +57,10 @@ file_body::file_body(std::string path) { } -http_proto::method +http::method file_body::method() const noexcept { - return http_proto::method::put; + return http::method::put; } core::string_view @@ -75,7 +75,7 @@ file_body::content_length() const return fs::file_size(path_); } -http_proto::file_source +http::file_source file_body::body() const { boost::capy::file file; @@ -84,12 +84,12 @@ file_body::body() const if(ec) throw system_error{ ec }; - return http_proto::file_source{ std::move(file), content_length() }; + return http::file_source{ std::move(file), content_length() }; } // ----------------------------------------------------------------------------- -boost::http_proto::source::results +boost::http::source::results stdin_body::source::on_read(buffers::mutable_buffer mb) { std::cin.read(static_cast(mb.data()), mb.size()); @@ -99,10 +99,10 @@ stdin_body::source::on_read(buffers::mutable_buffer mb) .finished = std::cin.eof() }; } -http_proto::method +http::method stdin_body::method() const noexcept { - return http_proto::method::put; + return http::method::put; } core::string_view @@ -126,12 +126,12 @@ stdin_body::body() const // ----------------------------------------------------------------------------- void -message::set_headers(http_proto::request& request) const +message::set_headers(http::request& request) const { std::visit( [&](auto& f) { - using field = http_proto::field; + using field = http::field; if constexpr(!std::is_same_v) { request.set_method(f.method()); @@ -143,7 +143,7 @@ message::set_headers(http_proto::request& request) const { request.set_content_length(content_length.value()); if(content_length.value() >= 1024 * 1024 && - request.version() == http_proto::version::http_1_1) + request.version() == http::version::http_1_1) request.set(field::expect, "100-continue"); } else @@ -158,8 +158,8 @@ message::set_headers(http_proto::request& request) const void message::start_serializer( - http_proto::serializer& serializer, - http_proto::request& request) const + http::serializer& serializer, + http::request& request) const { std::visit( [&](auto& f) diff --git a/example/client/burl/message.hpp b/example/client/burl/message.hpp index 8b6725ff..bbd3052e 100644 --- a/example/client/burl/message.hpp +++ b/example/client/burl/message.hpp @@ -12,9 +12,9 @@ #include "multipart_form.hpp" -#include -#include -#include +#include +#include +#include #include @@ -28,7 +28,7 @@ class string_body public: string_body(std::string body, std::string content_type); - http_proto::method + http::method method() const noexcept; core::string_view @@ -48,7 +48,7 @@ class file_body public: file_body(std::string path); - http_proto::method + http::method method() const noexcept; core::string_view @@ -57,21 +57,21 @@ class file_body std::uint64_t content_length() const; - http_proto::file_source + http::file_source body() const; }; class stdin_body { public: - class source : public http_proto::source + class source : public http::source { public: results on_read(buffers::mutable_buffer mb) override; }; - http_proto::method + http::method method() const noexcept; core::string_view @@ -106,12 +106,12 @@ class message } void - set_headers(http_proto::request& request) const; + set_headers(http::request& request) const; void start_serializer( - http_proto::serializer& serializer, - http_proto::request& request) const; + http::serializer& serializer, + http::request& request) const; }; #endif diff --git a/example/client/burl/multipart_form.cpp b/example/client/burl/multipart_form.cpp index 61fff06b..529f70c3 100644 --- a/example/client/burl/multipart_form.cpp +++ b/example/client/burl/multipart_form.cpp @@ -84,10 +84,10 @@ multipart_form::append( serialize_headers(headers) }); } -http_proto::method +http::method multipart_form::method() const noexcept { - return http_proto::method::post; + return http::method::post; } std::string diff --git a/example/client/burl/multipart_form.hpp b/example/client/burl/multipart_form.hpp index 0bce3932..2ae80643 100644 --- a/example/client/burl/multipart_form.hpp +++ b/example/client/burl/multipart_form.hpp @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -21,7 +21,7 @@ #include namespace buffers = boost::buffers; -namespace http_proto = boost::http_proto; +namespace http = boost::http; using error_code = boost::system::error_code; class multipart_form @@ -55,7 +55,7 @@ class multipart_form boost::optional content_type = {}, std::vector headers = {}); - http_proto::method + http::method method() const noexcept; std::string @@ -68,7 +68,7 @@ class multipart_form body() const; }; -class multipart_form::source : public http_proto::source +class multipart_form::source : public http::source { const multipart_form* form_; std::vector::const_iterator it_{ form_->pacapy_.begin() }; diff --git a/example/client/burl/options.hpp b/example/client/burl/options.hpp index 9aed639c..feb287a6 100644 --- a/example/client/burl/options.hpp +++ b/example/client/burl/options.hpp @@ -13,7 +13,7 @@ #include "message.hpp" #include -#include +#include #include #include @@ -26,7 +26,7 @@ namespace asio = boost::asio; namespace ch = std::chrono; namespace fs = std::filesystem; -namespace http_proto = boost::http_proto; +namespace http = boost::http; namespace urls = boost::urls; struct operation_config @@ -80,7 +80,7 @@ struct operation_config bool rm_partial = false; bool use_httpget = false; boost::optional request_target; - http_proto::fields headers; + http::fields headers; std::vector omitheaders; bool show_headers = false; bool cookiesession = false; diff --git a/example/client/burl/request.hpp b/example/client/burl/request.hpp index fb54aa6c..2665d651 100644 --- a/example/client/burl/request.hpp +++ b/example/client/burl/request.hpp @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -25,15 +25,15 @@ namespace asio = boost::asio; namespace ch = std::chrono; namespace beast2 = boost::beast2; -namespace http_proto = boost::http_proto; +namespace http = boost::http; using error_code = boost::system::error_code; template class async_request_op { AsyncReadStream& stream_; - http_proto::serializer& serializer_; - http_proto::response_parser& parser_; + http::serializer& serializer_; + http::response_parser& parser_; ch::steady_clock::duration exp100_timeout_; asio::coroutine c; @@ -52,8 +52,8 @@ class async_request_op public: async_request_op( AsyncReadStream& stream, - http_proto::serializer& serializer, - http_proto::response_parser& parser, + http::serializer& serializer, + http::response_parser& parser, ch::steady_clock::duration exp100_timeout) : stream_{ stream } , serializer_{ serializer } @@ -83,7 +83,7 @@ class async_request_op return self.complete(ec); } - if(ec != http_proto::error::expect_100_continue) + if(ec != http::error::expect_100_continue) return self.complete(ec); // TODO: use associated allocator @@ -115,7 +115,7 @@ class async_request_op exp100->timer.cancel(); if(ec || parser.get().status() != - http_proto::status::continue_) + http::status::continue_) { exp100->state = exp100::cancelled; } @@ -156,8 +156,8 @@ template< auto async_request( AsyncReadStream& stream, - http_proto::serializer& serializer, - http_proto::response_parser& parser, + http::serializer& serializer, + http::response_parser& parser, ch::steady_clock::duration expect100_timeout, CompletionToken&& token = CompletionToken{}) { diff --git a/example/client/get/main.cpp b/example/client/get/main.cpp index 4c2815e1..dcb84ff7 100644 --- a/example/client/get/main.cpp +++ b/example/client/get/main.cpp @@ -14,9 +14,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -37,9 +37,9 @@ class session asio::ssl::context& ssl_ctx_; asio::ssl::stream stream_; asio::ip::tcp::resolver resolver_; - http_proto::serializer sr_; - http_proto::response_parser pr_; - http_proto::request req_; + http::serializer sr_; + http::response_parser pr_; + http::request req_; urls::url url_; std::string host_; std::string port_; @@ -62,7 +62,7 @@ class session void run(urls::url_view url) { - using field = http_proto::field; + using field = http::field; // Set up an HTTP GET request if(!url.encoded_target().empty()) @@ -251,9 +251,9 @@ class session void on_redirect_response( - http_proto::response_base const& response) + http::response_base const& response) { - using field = http_proto::field; + using field = http::field; if(max_redirects_ == 0) return fail("Maximum redirects followed"); @@ -367,9 +367,9 @@ class session static bool - is_redirect(http_proto::status s) noexcept + is_redirect(http::status s) noexcept { - using status = http_proto::status; + using status = http::status; switch(s) { case status::moved_permanently: @@ -390,14 +390,14 @@ class session static bool can_reuse_connection( - http_proto::response_base const& response, + http::response_base const& response, urls::url_view a, urls::url_view b) noexcept { if(a.encoded_origin() != b.encoded_origin()) return false; - if(response.version() != http_proto::version::http_1_1) + if(response.version() != http::version::http_1_1) return false; if(response.metadata().connection.close) @@ -407,7 +407,7 @@ class session } // Writes body to standard out - struct stdout_sink : http_proto::sink + struct stdout_sink : http::sink { results on_write(buffers::const_buffer cb, bool) override @@ -446,7 +446,7 @@ main(int argc, char* argv[]) // Install parser service { - http_proto::response_parser::config cfg; + http::response_parser::config cfg; cfg.body_limit = std::uint64_t(-1); cfg.min_buffer = 64 * 1024; #ifdef BOOST_CAPY_HAS_BROTLI @@ -458,11 +458,11 @@ main(int argc, char* argv[]) cfg.apply_gzip_decoder = true; capy::zlib::install_inflate_service(capy_ctx); #endif - http_proto::install_parser_service(capy_ctx, cfg); + http::install_parser_service(capy_ctx, cfg); } // Install serializer service with default configuration - http_proto::install_serializer_service(capy_ctx, {}); + http::install_serializer_service(capy_ctx, {}); // Root certificates used for verification ssl_ctx.set_default_verify_paths(); diff --git a/example/client/jsonrpc/jsonrpc/client.cpp b/example/client/jsonrpc/jsonrpc/client.cpp index 86b658d7..503c3a20 100644 --- a/example/client/jsonrpc/jsonrpc/client.cpp +++ b/example/client/jsonrpc/jsonrpc/client.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -223,7 +223,7 @@ class stream_impl : public any_stream }; }; -class json_sink : public http_proto::sink +class json_sink : public http::sink { json::stream_parser& jpr_; @@ -250,7 +250,7 @@ class json_sink : public http_proto::sink } }; -class json_source : public http_proto::source +class json_source : public http::source { json::serializer& jsr_; json::value v_; @@ -404,9 +404,9 @@ client( , endpoint_(std::move(endpoint)) , sr_(capy_ctx) , pr_(capy_ctx) - , req_(http_proto::method::post, "/") + , req_(http::method::post, "/") { - using field = http_proto::field; + using field = http::field; if(!endpoint_.encoded_target().empty()) req_.set_target(endpoint_.encoded_target()); diff --git a/example/client/jsonrpc/jsonrpc/client.hpp b/example/client/jsonrpc/jsonrpc/client.hpp index 49b09512..4265cfd4 100644 --- a/example/client/jsonrpc/jsonrpc/client.hpp +++ b/example/client/jsonrpc/jsonrpc/client.hpp @@ -19,9 +19,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -35,9 +35,9 @@ class client { std::unique_ptr stream_; boost::urls::url endpoint_; - boost::http_proto::serializer sr_; - boost::http_proto::response_parser pr_; - boost::http_proto::request req_; + boost::http::serializer sr_; + boost::http::response_parser pr_; + boost::http::request req_; boost::json::stream_parser jpr_; boost::json::serializer jsr_; std::uint64_t id_ = 0; @@ -104,7 +104,7 @@ class client This function can be used to customize HTTP headers, for example, to add the required credentials. */ - boost::http_proto::fields_base& + boost::http::fields_base& http_fields() { return req_; diff --git a/example/client/jsonrpc/main.cpp b/example/client/jsonrpc/main.cpp index b4179b68..0b7c9f54 100644 --- a/example/client/jsonrpc/main.cpp +++ b/example/client/jsonrpc/main.cpp @@ -151,7 +151,7 @@ main(int, char*[]) // Install parser service { - http_proto::response_parser::config cfg; + http::response_parser::config cfg; cfg.min_buffer = 64 * 1024; #ifdef BOOST_CAPY_HAS_BROTLI cfg.apply_brotli_decoder = true; @@ -162,11 +162,11 @@ main(int, char*[]) cfg.apply_gzip_decoder = true; capy::zlib::install_inflate_service(capy_ctx); #endif - http_proto::install_parser_service(capy_ctx, cfg); + http::install_parser_service(capy_ctx, cfg); } // Install serializer service with default configuration - http_proto::install_serializer_service(capy_ctx, {}); + http::install_serializer_service(capy_ctx, {}); // Root certificates used for verification ssl_ctx.set_default_verify_paths(); diff --git a/example/client/visit/main.cpp b/example/client/visit/main.cpp index 3796a63c..c5f3c15e 100644 --- a/example/client/visit/main.cpp +++ b/example/client/visit/main.cpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -196,7 +196,7 @@ struct worker boost::asio::ip::tcp, executor_type>; socket_type sock; - boost::http_proto::response_parser pr; + boost::http::response_parser pr; boost::urls::url_view url; explicit @@ -246,12 +246,12 @@ struct worker void do_request() { - boost::http_proto::request req; + boost::http::request req; auto path = url.encoded_path(); req.set_start_line( - boost::http_proto::method::get, + boost::http::method::get, path.empty() ? "/" : path, - boost::http_proto::version::http_1_1); + boost::http::version::http_1_1); do_shutdown(); } @@ -277,8 +277,8 @@ main(int argc, char* argv[]) (void)argv; boost::capy::polystore ctx; - boost::http_proto::parser::config_base cfg; - boost::http_proto::install_parser_service(ctx, cfg); + boost::http::parser::config_base cfg; + boost::http::install_parser_service(ctx, cfg); boost::asio::io_context ioc; diff --git a/example/server/Jamfile b/example/server/Jamfile index 180f3d45..960d0c9b 100644 --- a/example/server/Jamfile +++ b/example/server/Jamfile @@ -5,7 +5,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/CPPAlliance/http_proto +# Official repository: https://github.com/CPPAlliance/http # using openssl ; diff --git a/example/server/main.cpp b/example/server/main.cpp index 10bc19bd..02905dbb 100644 --- a/example/server/main.cpp +++ b/example/server/main.cpp @@ -17,9 +17,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -45,7 +45,7 @@ void install_services(capy::application& app) capy::zlib::install_inflate_service(app); #endif - // VFALCO These ugly incantations are needed for http_proto and will hopefully go away soon. + // VFALCO These ugly incantations are needed for http and will hopefully go away soon. http::install_parser_service(app, http::request_parser::config()); http::install_serializer_service(app, diff --git a/example/server/serve_detached.hpp b/example/server/serve_detached.hpp index e9a9337d..a9d8cc9f 100644 --- a/example/server/serve_detached.hpp +++ b/example/server/serve_detached.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -39,19 +39,19 @@ class serve_detached system::error_code operator()( - http_proto::route_params& rp) const + http::route_params& rp) const { return rp.suspend( - [&](http_proto::resumer resume) + [&](http::resumer resume) { asio::post(*tp_, [&, resume]() { // Simulate some asynchronous work std::this_thread::sleep_for(std::chrono::seconds(1)); - rp.status(http_proto::status::ok); + rp.status(http::status::ok); rp.set_body("Hello from serve_detached!\n"); - resume(http_proto::route::send); + resume(http::route::send); // resume( res.send("Hello from serve_detached!\n") ); }); }); diff --git a/example/server/serve_log_admin.cpp b/example/server/serve_log_admin.cpp index 32a15f55..b313ee9d 100644 --- a/example/server/serve_log_admin.cpp +++ b/example/server/serve_log_admin.cpp @@ -30,7 +30,7 @@ class serve_log_page system::error_code operator()( - http_proto::route_params& p) const + http::route_params& p) const { auto const v = ls_.get_sections(); std::string s; @@ -71,10 +71,10 @@ class serve_log_page format_to(s, "\n"); format_to(s, "\n"); - p.status(http_proto::status::ok); - p.res.set(http_proto::field::content_type, "text/html; charset=UTF-8"); + p.status(http::status::ok); + p.res.set(http::field::content_type, "text/html; charset=UTF-8"); p.set_body(std::move(s)); - return http_proto::route::send; + return http::route::send; } private: @@ -96,12 +96,12 @@ class handle_submit system::error_code operator()( - http_proto::route_params& p) const + http::route_params& p) const { - p.status(http_proto::status::ok); - p.res.set(http_proto::field::content_type, "plain/text; charset=UTF-8"); + p.status(http::status::ok); + p.res.set(http::field::content_type, "plain/text; charset=UTF-8"); p.set_body("submit"); - return http_proto::route::send; + return http::route::send; } private: @@ -117,8 +117,8 @@ serve_log_admin( capy::polystore& ps) { router r; - r.add(http_proto::method::get, "/", serve_log_page(ps)); - r.add(http_proto::method::get, "/submit", handle_submit(ps)); + r.add(http::method::get, "/", serve_log_page(ps)); + r.add(http::method::get, "/submit", handle_submit(ps)); return r; } diff --git a/include/boost/beast2/body_read_stream.hpp b/include/boost/beast2/body_read_stream.hpp index cc2fa404..3ec089a1 100644 --- a/include/boost/beast2/body_read_stream.hpp +++ b/include/boost/beast2/body_read_stream.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include namespace boost { diff --git a/include/boost/beast2/detail/config.hpp b/include/boost/beast2/detail/config.hpp index 9e00d20d..e671fc9c 100644 --- a/include/boost/beast2/detail/config.hpp +++ b/include/boost/beast2/detail/config.hpp @@ -64,9 +64,9 @@ namespace beast2 { } // beast2 -namespace http_proto {} +namespace http {} namespace beast2 { -namespace http = http_proto; +namespace http = http; } } // boost diff --git a/include/boost/beast2/impl/read.hpp b/include/boost/beast2/impl/read.hpp index 483030a1..d7c72d9d 100644 --- a/include/boost/beast2/impl/read.hpp +++ b/include/boost/beast2/impl/read.hpp @@ -12,8 +12,8 @@ #define BOOST_BEAST2_IMPL_READ_HPP #include -#include -#include +#include +#include #include #include #include diff --git a/include/boost/beast2/impl/write.hpp b/include/boost/beast2/impl/write.hpp index 8da9b051..5f3ada1d 100644 --- a/include/boost/beast2/impl/write.hpp +++ b/include/boost/beast2/impl/write.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include namespace boost { namespace beast2 { diff --git a/include/boost/beast2/read.hpp b/include/boost/beast2/read.hpp index c328127d..29b2b681 100644 --- a/include/boost/beast2/read.hpp +++ b/include/boost/beast2/read.hpp @@ -12,8 +12,8 @@ #define BOOST_BEAST2_READ_HPP #include -#include -#include +#include +#include #include #include #include diff --git a/include/boost/beast2/server/body_source.hpp b/include/boost/beast2/server/body_source.hpp index 8a19ee9b..8b0296c7 100644 --- a/include/boost/beast2/server/body_source.hpp +++ b/include/boost/beast2/server/body_source.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/boost/beast2/server/http_stream.hpp b/include/boost/beast2/server/http_stream.hpp index 265ff469..e2dcb2db 100644 --- a/include/boost/beast2/server/http_stream.hpp +++ b/include/boost/beast2/server/http_stream.hpp @@ -22,11 +22,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/include/boost/beast2/server/route_handler_asio.hpp b/include/boost/beast2/server/route_handler_asio.hpp index d93cf4d2..ac221099 100644 --- a/include/boost/beast2/server/route_handler_asio.hpp +++ b/include/boost/beast2/server/route_handler_asio.hpp @@ -11,7 +11,7 @@ #define BOOST_BEAST2_SERVER_ROUTE_HANDLER_ASIO_HPP #include -#include +#include #include namespace boost { diff --git a/include/boost/beast2/server/router.hpp b/include/boost/beast2/server/router.hpp index aca812c5..4f80d204 100644 --- a/include/boost/beast2/server/router.hpp +++ b/include/boost/beast2/server/router.hpp @@ -11,8 +11,8 @@ #define BOOST_BEAST2_SERVER_ROUTER_HPP #include -#include -#include +#include +#include namespace boost { namespace beast2 { diff --git a/include/boost/beast2/server/router_asio.hpp b/include/boost/beast2/server/router_asio.hpp index dc466c0a..481e7b5d 100644 --- a/include/boost/beast2/server/router_asio.hpp +++ b/include/boost/beast2/server/router_asio.hpp @@ -11,7 +11,7 @@ #define BOOST_BEAST2_SERVER_ROUTER_ASIO_HPP #include -#include +#include #include namespace boost { diff --git a/include/boost/beast2/server/serve_redirect.hpp b/include/boost/beast2/server/serve_redirect.hpp index 49452295..e2189dd7 100644 --- a/include/boost/beast2/server/serve_redirect.hpp +++ b/include/boost/beast2/server/serve_redirect.hpp @@ -11,7 +11,7 @@ #define BOOST_BEAST2_SERVER_SERVE_REDIRECT_HPP #include -#include +#include namespace boost { namespace beast2 { diff --git a/include/boost/beast2/server/serve_static.hpp b/include/boost/beast2/server/serve_static.hpp index 0975ea3b..abe09da5 100644 --- a/include/boost/beast2/server/serve_static.hpp +++ b/include/boost/beast2/server/serve_static.hpp @@ -11,7 +11,7 @@ #define BOOST_BEAST2_SERVER_SERVE_STATIC_HPP #include -#include +#include namespace boost { namespace beast2 { diff --git a/include/boost/beast2/write.hpp b/include/boost/beast2/write.hpp index d71919dd..31e3b02e 100644 --- a/include/boost/beast2/write.hpp +++ b/include/boost/beast2/write.hpp @@ -11,7 +11,7 @@ #define BOOST_BEAST2_WRITE_HPP #include -#include +#include #include #include diff --git a/src/server/serve_redirect.cpp b/src/server/serve_redirect.cpp index 3dd58f34..8ae11a62 100644 --- a/src/server/serve_redirect.cpp +++ b/src/server/serve_redirect.cpp @@ -8,9 +8,9 @@ // #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace beast2 { //------------------------------------------------ -/// Returns the current system time formatted as an HTTP-date per RFC 9110 §5.6.7. +/// Returns the current system time formatted as an HTTP-date per RFC 9110 �5.6.7. /// Example: "Sat, 11 Oct 2025 02:12:34 GMT" static std::string diff --git a/src/server/serve_static.cpp b/src/server/serve_static.cpp index 0430f323..e5767772 100644 --- a/src/server/serve_static.cpp +++ b/src/server/serve_static.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/test/unit/body_read_stream.cpp b/test/unit/body_read_stream.cpp index 773b84b7..dc984ae6 100644 --- a/test/unit/body_read_stream.cpp +++ b/test/unit/body_read_stream.cpp @@ -109,7 +109,7 @@ struct ctx_base ctx_base() { - http_proto::install_parser_service(capy_ctx_, {}); + http::install_parser_service(capy_ctx_, {}); } }; @@ -131,7 +131,7 @@ struct single_tester : public ctx_base boost::asio::io_context ioc_; test::stream ts_; - http_proto::response_parser pr_; + http::response_parser pr_; // Create a destination buffer std::string s_; @@ -353,7 +353,7 @@ struct single_tester : public ctx_base // Ensure we get an error by making the body limit too small pr_.set_body_limit(2); - async_read_some(1024, http_proto::error::body_too_large, 0); + async_read_some(1024, http::error::body_too_large, 0); test::run(ioc_); } diff --git a/test/unit/read.cpp b/test/unit/read.cpp index 2771b6cb..632db1db 100644 --- a/test/unit/read.cpp +++ b/test/unit/read.cpp @@ -37,13 +37,13 @@ class read_test { boost::asio::io_context ioc; boost::capy::polystore capy_ctx; - http_proto::install_parser_service(capy_ctx, {}); + http::install_parser_service(capy_ctx, {}); // async_read_some completes when the parser reads // the header section of the message. { test::stream ts(ioc, msg); - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); @@ -84,7 +84,7 @@ class read_test { test::fail_count fc(11, asio::error::network_down); test::stream ts(ioc, fc, msg); - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); @@ -108,7 +108,7 @@ class read_test // async_read_some reports parser errors { test::stream ts(ioc, msg); - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); @@ -121,7 +121,7 @@ class read_test async_read_some( ts, pr, - test::fail_handler(http_proto::error::body_too_large)); + test::fail_handler(http::error::body_too_large)); test::run(ioc); } @@ -129,7 +129,7 @@ class read_test { test::stream ts(ioc); asio::cancellation_signal c_signal; - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); @@ -186,13 +186,13 @@ class read_test { boost::asio::io_context ioc; capy::polystore capy_ctx; - http_proto::install_parser_service(capy_ctx, {}); + http::install_parser_service(capy_ctx, {}); // async_read completes when the parser reads // the entire message. { test::stream ts(ioc, msg); - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); @@ -223,7 +223,7 @@ class read_test [&]() { test::stream ts(ioc); - http_proto::response_parser pr(capy_ctx); + http::response_parser pr(capy_ctx); pr.reset(); pr.start(); diff --git a/test/unit/sandbox.cpp b/test/unit/sandbox.cpp index 85acf00b..c6b35476 100644 --- a/test/unit/sandbox.cpp +++ b/test/unit/sandbox.cpp @@ -14,14 +14,14 @@ #include #include #include -#include +#include #include #include #include #include namespace boost { -namespace http_proto { +namespace http { static std::size_t constexpr buffer_bytes = 8 * 1024 * 1024; static std::size_t constexpr payload_size = buffer_bytes * 10; @@ -223,7 +223,7 @@ TEST_SUITE( sandbox_test, "boost.beast2.sandbox"); -} // http_proto +} // http } // boost #endif diff --git a/test/unit/server/body_source.cpp b/test/unit/server/body_source.cpp index 5fad4d15..235c5bef 100644 --- a/test/unit/server/body_source.cpp +++ b/test/unit/server/body_source.cpp @@ -79,7 +79,7 @@ struct read_source if(ec_.failed()) ec = ec_; else - ec = http_proto::error::end_of_stream; + ec = http::error::end_of_stream; } else { @@ -133,7 +133,7 @@ struct body_source_test { auto nread = b.read(buf, n, ec); s.append(buf, nread); - if(ec == http_proto::error::end_of_stream) + if(ec == http::error::end_of_stream) { BOOST_TEST(! fec.failed()); BOOST_TEST_EQ(s, s0); @@ -238,7 +238,7 @@ struct body_source_test { core::string_view s1("Hello, world!"); system::error_code fec = - http_proto::error::bad_connection; + http::error::bad_connection; body_source b1((read_source(s1, fec))); BOOST_TEST_EQ(b1.has_size(), false); diff --git a/test/unit/server/route_handler_asio.cpp b/test/unit/server/route_handler_asio.cpp index 1f4c21d6..5453f09e 100644 --- a/test/unit/server/route_handler_asio.cpp +++ b/test/unit/server/route_handler_asio.cpp @@ -10,7 +10,7 @@ // Test that header file is self-contained. #include -#include +#include #include #include @@ -30,17 +30,17 @@ struct route_handler_asio_test } }; - using test_router = http_proto::basic_router< + using test_router = http::basic_router< asio_route_params>; void check( test_router& r, core::string_view url, - http_proto::route_result rv0 = http_proto::route::send) + http::route_result rv0 = http::route::send) { asio_route_params req; auto rv = r.dispatch( - http_proto::method::get, + http::method::get, urls::url_view(url), req); if(BOOST_TEST_EQ(rv.message(), rv0.message())) BOOST_TEST(rv == rv0); @@ -49,12 +49,12 @@ struct route_handler_asio_test struct handler { template - http_proto::route_result + http::route_result operator()( asio_route_params&) const { BOOST_TEST(true); - return http_proto::route::send; + return http::route::send; } }; diff --git a/test/unit/write.cpp b/test/unit/write.cpp index 543fd0a4..88b64c52 100644 --- a/test/unit/write.cpp +++ b/test/unit/write.cpp @@ -64,7 +64,7 @@ namespace beast2 { #include #include #include -#include +#include #include "test_helpers.hpp" @@ -93,7 +93,7 @@ class write_test { boost::asio::io_context ioc; boost::capy::polystore capy_ctx; - http_proto::install_serializer_service(capy_ctx, {}); + http::install_serializer_service(capy_ctx, {}); // async_write_some completes when the serializer writes the message. { @@ -101,10 +101,10 @@ class write_test ts.connect(tr); ts.write_size(1); - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); for(std::size_t total = 0; total < msg.size(); total++) @@ -132,10 +132,10 @@ class write_test ts.connect(tr); ts.write_size(1); - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); for(int count = 0; count < 3; count++) @@ -178,10 +178,10 @@ class write_test asio::cancellation_signal c_signal; - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); // async_read_some cancels after reading 0 bytes @@ -209,7 +209,7 @@ class write_test { boost::asio::io_context ioc; capy::polystore capy_ctx; - http_proto::install_serializer_service(capy_ctx, {}); + http::install_serializer_service(capy_ctx, {}); // async_write completes when the serializer writes // the entire message. @@ -218,10 +218,10 @@ class write_test ts.connect(tr); ts.write_size(1); - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); async_write( @@ -247,10 +247,10 @@ class write_test ts.connect(tr); ts.write_size(1); - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); async_write( @@ -283,10 +283,10 @@ class write_test asio::cancellation_signal c_signal; - http_proto::serializer sr(capy_ctx); + http::serializer sr(capy_ctx); sr.reset(); - http_proto::response res(headers); + http::response res(headers); sr.start(res, buffers::const_buffer(body.data(), body.size())); // cancel after writing