From 8722fcd00580c11b7f037f98f14e3fc68ff249b0 Mon Sep 17 00:00:00 2001 From: Dmitrii Date: Fri, 21 Mar 2025 21:38:18 +0300 Subject: [PATCH 1/2] SENJUN-25: update restinio to 0.7.4 --- CMakeLists.txt | 2 +- .../single_handler_so5_timer/CMakeLists.txt | 7 -- .../async_chained_handlers/CMakeLists.txt | 4 - .../CMakeLists.txt | 4 - .../dev/sample/notificators/CMakeLists.txt | 4 - .../async_chained_handlers_2/CMakeLists.txt | 4 - .../websocket/notificators/CMakeLists.txt | 4 - .../websocket/ws_connection/CMakeLists.txt | 4 - .../.gitattributes | 0 .../.github/workflows/ci.yml | 0 .../.gitignore | 0 .../.hgignore | 0 .../.hgtags | 0 .../LICENSE | 2 +- .../LICENSE.catch2 | 0 .../LICENSE.expected-lite | 0 third_party/restinio-v.0.7.4/LICENSE.fmtlib | 27 +++++++ third_party/restinio-v.0.7.4/LICENSE.llhttp | 22 ++++++ .../LICENSE.zlib | 0 .../README.md | 0 .../dev/CMakeLists.txt | 71 +++++++++++++---- .../dev/Doxyfile | 0 .../dev/benches/CMakeLists.txt | 0 .../dev/benches/common_args/app_args.hpp | 0 .../dev/benches/single_handler/CMakeLists.txt | 0 .../dev/benches/single_handler/main.cpp | 0 .../single_handler_no_timer/CMakeLists.txt | 0 .../benches/single_handler_no_timer/main.cpp | 0 .../single_handler_so5_timer/CMakeLists.txt | 11 +++ .../benches/single_handler_so5_timer/main.cpp | 0 .../dev/cmake/bench.cmake | 0 .../dev/cmake/code_coverage.cmake | 0 .../dev/cmake/find_program_required.cmake | 0 .../dev/cmake/libcxx.cmake | 0 .../dev/cmake/link_atomic_if_necessary.cmake | 0 .../dev/cmake/link_threads_if_necessary.cmake | 0 .../dev/cmake/modules/FindPCRE.cmake | 0 .../dev/cmake/modules/FindPCRE2.cmake | 0 .../dev/cmake/modules/Findasio.cmake | 0 .../dev/cmake/modules/Findhttp-parser.cmake | 0 .../dev/cmake/run_tests.bat | 0 .../dev/cmake/sample.cmake | 0 .../dev/cmake/testbench.cmake | 0 .../dev/cmake/unittest.cmake | 0 .../dev/default-clang-tidy-flags.cmake | 0 .../dev/mainpage.dox | 0 .../dev/restinio-helpers/CMakeLists.txt | 0 .../cmd_line_args_helpers.hpp | 0 .../dev/restinio/CMakeLists.txt | 6 +- .../dev/restinio/all.hpp | 0 .../dev/restinio/asio_include.hpp | 0 .../dev/restinio/asio_timer_manager.hpp | 0 .../dev/restinio/async_chain/common.hpp | 0 .../dev/restinio/async_chain/fixed_size.hpp | 0 .../restinio/async_chain/growable_size.hpp | 0 .../dev/restinio/buffers.hpp | 0 .../dev/restinio/cast_to.hpp | 0 .../dev/restinio/chunked_input_info.hpp | 0 .../restinio/cmake/restinio-config.cmake.in | 2 +- .../dev/restinio/common_types.hpp | 0 .../dev/restinio/compiler_features.hpp | 66 ---------------- .../dev/restinio/connection_count_limiter.hpp | 0 .../restinio/connection_state_listener.hpp | 0 .../dev/restinio/core.hpp | 0 .../dev/restinio/default_strands.hpp | 0 .../dev/restinio/detect_os.hpp | 56 ++++++++++++++ .../dev/restinio/exception.hpp | 0 .../dev/restinio/expected.hpp | 0 .../dev/restinio/helpers/easy_parser.hpp | 7 +- .../dev/restinio/helpers/file_upload.hpp | 0 .../http_field_parsers/accept-charset.hpp | 0 .../http_field_parsers/accept-encoding.hpp | 0 .../http_field_parsers/accept-language.hpp | 0 .../helpers/http_field_parsers/accept.hpp | 0 .../http_field_parsers/authorization.hpp | 0 .../helpers/http_field_parsers/basic_auth.hpp | 0 .../helpers/http_field_parsers/basics.hpp | 4 +- .../http_field_parsers/bearer_auth.hpp | 0 .../http_field_parsers/cache-control.hpp | 0 .../helpers/http_field_parsers/connection.hpp | 0 .../content-disposition.hpp | 0 .../http_field_parsers/content-encoding.hpp | 0 .../http_field_parsers/content-type.hpp | 0 .../details/pct_encoded_symbols.hpp | 0 .../helpers/http_field_parsers/host.hpp | 0 .../helpers/http_field_parsers/media-type.hpp | 0 .../helpers/http_field_parsers/range.hpp | 0 .../http_field_parsers/transfer-encoding.hpp | 0 .../http_field_parsers/try_parse_field.hpp | 0 .../helpers/http_field_parsers/user-agent.hpp | 0 .../dev/restinio/helpers/multipart_body.hpp | 0 .../dev/restinio/helpers/string_algo.hpp | 0 .../dev/restinio/http_headers.hpp | 14 ++++ .../dev/restinio/http_server.hpp | 0 .../dev/restinio/http_server_run.hpp | 4 +- .../dev/restinio/impl/acceptor.hpp | 4 +- .../dev/restinio/impl/connection.hpp | 4 +- .../dev/restinio/impl/connection_base.hpp | 0 .../dev/restinio/impl/connection_settings.hpp | 0 .../dev/restinio/impl/executor_wrapper.hpp | 0 .../dev/restinio/impl/fixed_buffer.hpp | 0 .../dev/restinio/impl/header_helpers.hpp | 0 .../dev/restinio/impl/include_fmtlib.hpp | 0 .../restinio/impl/ioctx_on_thread_pool.hpp | 0 .../dev/restinio/impl/os_posix.ipp | 0 .../dev/restinio/impl/os_unknown.ipp | 0 .../dev/restinio/impl/os_win.ipp | 0 ...verflow_controlled_integer_accumulator.hpp | 0 .../dev/restinio/impl/parser_callbacks.ipp | 0 .../restinio/impl/response_coordinator.hpp | 21 ++--- .../dev/restinio/impl/sendfile_operation.hpp | 4 +- .../impl/sendfile_operation_default.ipp | 4 +- .../impl/sendfile_operation_posix.ipp | 10 ++- .../restinio/impl/sendfile_operation_win.ipp | 0 .../restinio/impl/string_caseless_compare.hpp | 0 .../dev/restinio/impl/tls_socket.hpp | 0 .../dev/restinio/impl/to_lower_lut.hpp | 0 .../restinio/impl/write_group_output_ctx.hpp | 0 .../dev/restinio/incoming_http_msg_limits.hpp | 0 .../dev/restinio/ip_blocker.hpp | 0 .../dev/restinio/message_builders.hpp | 0 .../dev/restinio/null_logger.hpp | 0 .../dev/restinio/null_mutex.hpp | 0 .../dev/restinio/null_timer_manager.hpp | 0 .../dev/restinio/os.hpp | 0 .../dev/restinio/ostream_logger.hpp | 0 .../dev/restinio/path2regex/path2regex.hpp | 0 .../dev/restinio/request_handler.hpp | 0 .../restinio/router/boost_regex_engine.hpp | 0 .../restinio/router/easy_parser_router.hpp | 0 .../dev/restinio/router/express.hpp | 0 .../router/impl/target_path_holder.hpp | 0 .../dev/restinio/router/method_matcher.hpp | 0 .../router/non_matched_request_handler.hpp | 0 .../restinio/router/pcre2_regex_engine.hpp | 0 .../dev/restinio/router/pcre_regex_engine.hpp | 0 .../dev/restinio/router/std_regex_engine.hpp | 0 .../dev/restinio/sendfile.hpp | 77 +++++++++++++++---- .../dev/restinio/sendfile_defs_default.hpp | 72 +++++++++++++++++ .../dev/restinio/sendfile_defs_posix.hpp | 27 ++++++- .../dev/restinio/sendfile_defs_win.hpp | 58 ++++++++++++++ .../dev/restinio/settings.hpp | 0 .../dev/restinio/so5/so_timer_manager.hpp | 0 .../dev/restinio/string_view.hpp | 0 .../dev/restinio/sync_chain/fixed_size.hpp | 0 .../dev/restinio/sync_chain/growable_size.hpp | 0 .../dev/restinio/tcp_connection_ctx_base.hpp | 0 .../dev/restinio/timer_common.hpp | 0 .../dev/restinio/tls.hpp | 0 .../dev/restinio/tls_fwd.hpp | 0 .../dev/restinio/traits.hpp | 0 .../dev/restinio/transforms/zlib.hpp | 0 .../dev/restinio/uri_helpers.hpp | 0 .../dev/restinio/utils/at_scope_exit.hpp | 0 .../dev/restinio/utils/base64.hpp | 0 .../dev/restinio/utils/base64_lut.ipp | 0 .../dev/restinio/utils/from_string.hpp | 0 .../restinio/utils/from_string_details.ipp | 0 .../dev/restinio/utils/impl/bitops.hpp | 0 .../utils/impl/safe_uint_truncate.hpp | 0 .../dev/restinio/utils/metaprogramming.hpp | 0 .../dev/restinio/utils/percent_encoding.hpp | 0 .../dev/restinio/utils/sha1.hpp | 0 .../restinio/utils/suppress_exceptions.hpp | 0 .../dev/restinio/utils/tagged_scalar.hpp | 0 .../dev/restinio/utils/tuple_algorithms.hpp | 0 .../dev/restinio/utils/utf8_checker.hpp | 0 .../dev/restinio/value_or.hpp | 0 .../dev/restinio/version.cmake | 0 .../dev/restinio/version.hpp | 4 +- .../dev/restinio/websocket/impl/utf8.hpp | 0 .../restinio/websocket/impl/ws_connection.hpp | 0 .../websocket/impl/ws_connection_base.hpp | 0 .../dev/restinio/websocket/impl/ws_parser.hpp | 0 .../websocket/impl/ws_protocol_validator.hpp | 0 .../dev/restinio/websocket/message.hpp | 0 .../dev/restinio/websocket/websocket.hpp | 0 .../dev/sample/CMakeLists.txt | 0 .../async_chained_handlers/CMakeLists.txt | 8 ++ .../sample/async_chained_handlers/main.cpp | 0 .../CMakeLists.txt | 8 ++ .../async_handling_with_sobjectizer/main.cpp | 0 .../sample/chained_handlers/CMakeLists.txt | 0 .../dev/sample/chained_handlers/main.cpp | 0 .../dev/sample/compression/CMakeLists.txt | 0 .../dev/sample/compression/main.cpp | 0 .../sample/connection_state/CMakeLists.txt | 0 .../dev/sample/connection_state/main.cpp | 0 .../dev/sample/custom_buffer/CMakeLists.txt | 0 .../dev/sample/custom_buffer/main.cpp | 0 .../dev/sample/decompression/CMakeLists.txt | 0 .../dev/sample/decompression/main.cpp | 0 .../decompression/test_decompression.sh | 0 .../sample/easy_parser_router/CMakeLists.txt | 0 .../easy_parser_router/curl_examples.txt | 0 .../dev/sample/easy_parser_router/main.cpp | 0 .../sample/easy_parser_router/new_book_1.txt | 0 .../sample/easy_parser_router/new_book_2.txt | 0 .../dev/sample/express_router/CMakeLists.txt | 0 .../sample/express_router/curl_examples.txt | 0 .../dev/sample/express_router/main.cpp | 0 .../dev/sample/express_router/new_book_1.txt | 0 .../dev/sample/express_router/new_book_2.txt | 0 .../express_router_tutorial/CMakeLists.txt | 0 .../sample/express_router_tutorial/main.cpp | 0 .../sample/extra_data_factory/CMakeLists.txt | 0 .../dev/sample/extra_data_factory/main.cpp | 0 .../dev/sample/file_upload/CMakeLists.txt | 0 .../dev/sample/file_upload/main.cpp | 0 .../dev/sample/hello_world/CMakeLists.txt | 0 .../dev/sample/hello_world/main.cpp | 0 .../sample/hello_world_basic/CMakeLists.txt | 0 .../dev/sample/hello_world_basic/main.cpp | 0 .../sample/hello_world_delayed/CMakeLists.txt | 0 .../dev/sample/hello_world_delayed/main.cpp | 0 .../sample/hello_world_https/CMakeLists.txt | 0 .../dev/sample/hello_world_https/dh2048.pem | 0 .../dev/sample/hello_world_https/key.pem | 0 .../dev/sample/hello_world_https/main.cpp | 0 .../dev/sample/hello_world_https/server.pem | 0 .../sample/hello_world_minimal/CMakeLists.txt | 0 .../dev/sample/hello_world_minimal/main.cpp | 0 .../hello_world_sendfile/CMakeLists.txt | 0 .../dev/sample/hello_world_sendfile/main.cpp | 0 .../hello_world_sendfile_https/CMakeLists.txt | 0 .../hello_world_sendfile_https/main.cpp | 0 .../CMakeLists.txt | 0 .../hello_world_sendfile_w32_unicode/main.cpp | 0 .../dev/sample/ip_blocker/CMakeLists.txt | 0 .../dev/sample/ip_blocker/main.cpp | 0 .../dev/sample/notificators/CMakeLists.txt | 8 ++ .../dev/sample/notificators/main.cpp | 0 .../sample/query_string_params/CMakeLists.txt | 0 .../dev/sample/query_string_params/main.cpp | 0 .../sample/run_existing_server/CMakeLists.txt | 0 .../dev/sample/run_existing_server/main.cpp | 0 .../dev/sample/run_for_minute/CMakeLists.txt | 0 .../dev/sample/run_for_minute/main.cpp | 0 .../dev/sample/samples.dox | 0 .../dev/sample/sendfiles/CMakeLists.txt | 0 .../dev/sample/sendfiles/main.cpp | 0 .../sample/shared_tls_context/CMakeLists.txt | 0 .../dev/sample/shared_tls_context/dh2048.pem | 0 .../dev/sample/shared_tls_context/key.pem | 0 .../dev/sample/shared_tls_context/main.cpp | 0 .../dev/sample/shared_tls_context/server.pem | 0 .../dev/sample/tls_inspector/CMakeLists.txt | 0 .../dev/sample/tls_inspector/certs/README.md | 0 .../dev/sample/tls_inspector/certs/alice.cer | 0 .../dev/sample/tls_inspector/certs/alice.key | 0 .../dev/sample/tls_inspector/certs/bob.cer | 0 .../dev/sample/tls_inspector/certs/bob.key | 0 .../dev/sample/tls_inspector/certs/ca.cer | 0 .../dev/sample/tls_inspector/certs/ca.key | 0 .../tls_inspector/certs/ca.key.passphrase | 0 .../dev/sample/tls_inspector/certs/dh2048.pem | 0 .../dev/sample/tls_inspector/certs/server.cer | 0 .../dev/sample/tls_inspector/certs/server.key | 0 .../dev/sample/tls_inspector/main.cpp | 0 .../try_parse_query_string/CMakeLists.txt | 0 .../sample/try_parse_query_string/main.cpp | 0 .../using_external_io_context/CMakeLists.txt | 0 .../sample/using_external_io_context/main.cpp | 0 .../dev/sample/websocket/CMakeLists.txt | 0 .../dev/sample/websocket/main.cpp | 0 .../sample/websocket_detailed/CMakeLists.txt | 0 .../dev/sample/websocket_detailed/main.cpp | 0 .../dev/sample/websocket_wss/CMakeLists.txt | 0 .../dev/sample/websocket_wss/main.cpp | 0 .../dev/sample/websocket_wss/wss_dh2048.pem | 0 .../dev/sample/websocket_wss/wss_key.pem | 0 .../dev/sample/websocket_wss/wss_server.pem | 0 .../dev/test/CMakeLists.txt | 0 .../dev/test/basic_auth/CMakeLists.txt | 0 .../dev/test/basic_auth/main.cpp | 2 +- .../dev/test/bearer_auth/CMakeLists.txt | 0 .../dev/test/bearer_auth/main.cpp | 2 +- .../dev/test/buffers/CMakeLists.txt | 0 .../dev/test/buffers/main.cpp | 0 .../dev/test/common/dummy_connection.hpp | 0 .../dev/test/common/fake_connection.ipp | 0 .../dev/test/common/pub.hpp | 2 +- .../dev/test/common/request_handler_pool.hpp | 0 .../test/common/test_extra_data_factory.ipp | 0 .../dev/test/common/thread_safe_queue.hpp | 0 .../test/common/time_limited_execution.hpp | 0 .../dev/test/common/utest_logger.hpp | 0 .../CMakeLists.txt | 0 .../default_constructed_settings/main.cpp | 4 +- .../dev/test/encoders/CMakeLists.txt | 0 .../dev/test/encoders/main.cpp | 0 .../dev/test/file_upload/CMakeLists.txt | 0 .../dev/test/file_upload/main.cpp | 2 +- .../dev/test/from_string/CMakeLists.txt | 0 .../dev/test/from_string/main.cpp | 0 .../dev/test/from_string_bench/main.cpp | 0 .../dev/test/handle_requests/CMakeLists.txt | 0 .../acceptor_post_bind_hook/CMakeLists.txt | 0 .../acceptor_post_bind_hook/main.cpp | 0 .../async_chained_handlers_1/CMakeLists.txt | 0 .../async_chained_handlers_1/main.cpp | 0 .../async_chained_handlers_2/CMakeLists.txt | 8 ++ .../async_chained_handlers_2/main.cpp | 0 .../chunked_input/CMakeLists.txt | 0 .../handle_requests/chunked_input/main.cpp | 2 + .../chunked_output/CMakeLists.txt | 0 .../handle_requests/chunked_output/main.cpp | 0 .../connection_count_limit/CMakeLists.txt | 0 .../connection_count_limit/main.cpp | 0 .../connection_state/CMakeLists.txt | 0 .../handle_requests/connection_state/main.cpp | 0 .../handle_requests/echo_body/CMakeLists.txt | 0 .../test/handle_requests/echo_body/main.cpp | 2 +- .../incoming_msg_limits/CMakeLists.txt | 0 .../incoming_msg_limits/main.cpp | 0 .../handle_requests/ip_blocker/CMakeLists.txt | 0 .../test/handle_requests/ip_blocker/main.cpp | 0 .../handle_requests/method/CMakeLists.txt | 0 .../dev/test/handle_requests/method/main.cpp | 0 .../notificators/CMakeLists.txt | 0 .../handle_requests/notificators/main.cpp | 0 .../output_and_buffers/CMakeLists.txt | 0 .../output_and_buffers/const_buffer.cpp | 0 .../shared_ptr_std_string.cpp | 0 .../output_and_buffers/std_string.cpp | 0 .../remote_endpoint/CMakeLists.txt | 0 .../handle_requests/remote_endpoint/main.cpp | 0 .../slow_transmit/CMakeLists.txt | 0 .../handle_requests/slow_transmit/main.cpp | 0 .../sync_chained_handlers/CMakeLists.txt | 0 .../sync_chained_handlers/main.cpp | 0 .../throw_exception/CMakeLists.txt | 0 .../handle_requests/throw_exception/main.cpp | 0 .../handle_requests/timeouts/CMakeLists.txt | 0 .../test/handle_requests/timeouts/main.cpp | 0 .../handle_requests/upgrade/CMakeLists.txt | 0 .../dev/test/handle_requests/upgrade/main.cpp | 0 .../user_controlled_output/CMakeLists.txt | 0 .../user_controlled_output/main.cpp | 0 .../user_data_simple/CMakeLists.txt | 0 .../handle_requests/user_data_simple/main.cpp | 0 .../dev/test/header/CMakeLists.txt | 0 .../dev/test/header/main.cpp | 20 +++++ .../dev/test/http_field_parser/CMakeLists.txt | 0 .../test/http_field_parser/accept-charset.cpp | 0 .../http_field_parser/accept-encoding.cpp | 0 .../http_field_parser/accept-language.cpp | 0 .../dev/test/http_field_parser/accept.cpp | 0 .../test/http_field_parser/authorization.cpp | 0 .../dev/test/http_field_parser/basics.cpp | 0 .../test/http_field_parser/cache-control.cpp | 0 .../dev/test/http_field_parser/connection.cpp | 0 .../http_field_parser/content-disposition.cpp | 0 .../http_field_parser/content-encoding.cpp | 0 .../test/http_field_parser/content-type.cpp | 0 .../dev/test/http_field_parser/host.cpp | 0 .../dev/test/http_field_parser/media-type.cpp | 0 .../dev/test/http_field_parser/range.cpp | 0 .../http_field_parser/transfer-encoding.cpp | 0 .../dev/test/http_field_parser/user-agent.cpp | 0 .../dev/test/http_pipelining/CMakeLists.txt | 0 .../http_pipelining/sequence/CMakeLists.txt | 0 .../test/http_pipelining/sequence/main.cpp | 0 .../http_pipelining/timeouts/CMakeLists.txt | 0 .../test/http_pipelining/timeouts/main.cpp | 0 .../dev/test/metaprogramming/CMakeLists.txt | 0 .../dev/test/metaprogramming/main.cpp | 0 .../dev/test/multipart_body/CMakeLists.txt | 0 .../http_field_parser/CMakeLists.txt | 0 .../multipart_body/http_field_parser/main.cpp | 0 .../dev/test/multipart_body/main.cpp | 2 +- .../ref_qualifiers_settings/CMakeLists.txt | 0 .../dev/test/ref_qualifiers_settings/main.cpp | 4 +- .../test/response_coordinator/CMakeLists.txt | 0 .../dev/test/response_coordinator/main.cpp | 2 +- .../dev/test/router/CMakeLists.txt | 0 .../router/cmp_router_bench/CMakeLists.txt | 0 .../dev/test/router/cmp_router_bench/main.cpp | 0 .../router/cmp_router_bench/route_parser.cpp | 0 .../router/cmp_router_bench/route_parser.hpp | 0 .../easy_parser_path_to_params/CMakeLists.txt | 0 .../easy_parser_path_to_params/main.cpp | 0 .../easy_parser_path_to_tuple/CMakeLists.txt | 0 .../router/easy_parser_path_to_tuple/main.cpp | 0 .../easy_parser_router_bench/CMakeLists.txt | 0 .../router/easy_parser_router_bench/main.cpp | 0 .../easy_parser_router_dsl/CMakeLists.txt | 0 .../router/easy_parser_router_dsl/main.cpp | 0 .../dev/test/router/express/CMakeLists.txt | 0 .../test/router/express/additional_tests.ipp | 0 .../dev/test/router/express/main.cpp | 0 .../router/express/original_tests_part1.ipp | 0 .../router/express/original_tests_part2.ipp | 0 .../router/express/original_tests_part3.ipp | 0 .../router/express/original_tests_part4.ipp | 0 .../router/express/original_tests_part5.ipp | 0 .../dev/test/router/express/part1.cpp | 0 .../dev/test/router/express/part2.cpp | 0 .../dev/test/router/express/part3.cpp | 0 .../dev/test/router/express/part4.cpp | 0 .../dev/test/router/express/part5.cpp | 0 .../dev/test/router/express/usings.ipp | 0 .../router/express_boost_regex/CMakeLists.txt | 0 .../test/router/express_boost_regex/main.cpp | 0 .../test/router/express_boost_regex/part1.cpp | 0 .../test/router/express_boost_regex/part2.cpp | 0 .../test/router/express_boost_regex/part3.cpp | 0 .../test/router/express_boost_regex/part4.cpp | 0 .../test/router/express_boost_regex/part5.cpp | 0 .../router/express_boost_regex/usings.ipp | 0 .../test/router/express_pcre/CMakeLists.txt | 0 .../dev/test/router/express_pcre/main.cpp | 0 .../dev/test/router/express_pcre/part1.cpp | 0 .../dev/test/router/express_pcre/part2.cpp | 0 .../dev/test/router/express_pcre/part3.cpp | 0 .../dev/test/router/express_pcre/part4.cpp | 0 .../dev/test/router/express_pcre/part5.cpp | 0 .../dev/test/router/express_pcre/usings.ipp | 0 .../test/router/express_pcre2/CMakeLists.txt | 0 .../dev/test/router/express_pcre2/main.cpp | 0 .../dev/test/router/express_pcre2/part1.cpp | 0 .../dev/test/router/express_pcre2/part2.cpp | 0 .../dev/test/router/express_pcre2/part3.cpp | 0 .../dev/test/router/express_pcre2/part4.cpp | 0 .../dev/test/router/express_pcre2/part5.cpp | 0 .../dev/test/router/express_pcre2/usings.ipp | 0 .../test/router/express_router/CMakeLists.txt | 0 .../dev/test/router/express_router/main.cpp | 0 .../dev/test/router/express_router/tests.ipp | 0 .../express_router_bench/CMakeLists.txt | 0 .../express_router_bench/cmp_routes.lua | 0 .../express_router_bench/cmp_routes.txt | 0 .../test/router/express_router_bench/main.cpp | 0 .../express_router_bench/many_routes.txt | 0 .../router/express_router_bench/simple.txt | 0 .../express_router_boost_regex/CMakeLists.txt | 0 .../express_router_boost_regex/main.cpp | 0 .../CMakeLists.txt | 0 .../express_router_boost_regex_bench/main.cpp | 0 .../router/express_router_pcre/CMakeLists.txt | 0 .../test/router/express_router_pcre/main.cpp | 0 .../express_router_pcre2/CMakeLists.txt | 0 .../test/router/express_router_pcre2/main.cpp | 0 .../express_router_pcre2_bench/CMakeLists.txt | 0 .../express_router_pcre2_bench/main.cpp | 0 .../express_router_pcre_bench/CMakeLists.txt | 0 .../router/express_router_pcre_bench/main.cpp | 0 .../CMakeLists.txt | 0 .../express_router_user_data_simple/main.cpp | 0 .../router/fake_connection_and_request.ipp | 0 .../test/run_on_thread_pool/CMakeLists.txt | 0 .../dev/test/run_on_thread_pool/main.cpp | 16 ++-- .../dev/test/sendfile/.gitattributes | 0 .../dev/test/sendfile/CMakeLists.txt | 2 + .../dev/test/sendfile/f1.dat | 0 .../dev/test/sendfile/f2.dat | 0 .../dev/test/sendfile/f3.dat | 0 .../dev/test/sendfile/main.cpp | 66 +++++++++++++++- ...\265\321\202-\344\275\240\345\245\275.dat" | 1 + .../dev/test/socket_options/CMakeLists.txt | 0 .../dev/test/socket_options/main.cpp | 0 .../test/socket_options_tls/CMakeLists.txt | 0 .../dev/test/socket_options_tls/main.cpp | 0 .../dev/test/start_stop/CMakeLists.txt | 0 .../dev/test/start_stop/main.cpp | 0 .../dev/test/to_lower_bench/main.cpp | 0 .../dev/test/transforms/CMakeLists.txt | 0 .../transforms/random_data_generators.ipp | 0 .../dev/test/transforms/zlib/CMakeLists.txt | 0 .../dev/test/transforms/zlib/main.cpp | 0 .../zlib_body_appender/CMakeLists.txt | 0 .../transforms/zlib_body_appender/main.cpp | 0 .../zlib_body_handler/CMakeLists.txt | 0 .../transforms/zlib_body_handler/main.cpp | 0 .../dev/test/try_parse_field/CMakeLists.txt | 0 .../dev/test/try_parse_field/main.cpp | 2 +- .../dev/test/tuple_algorithms/CMakeLists.txt | 0 .../dev/test/tuple_algorithms/main.cpp | 0 .../dev/test/uri_helpers/CMakeLists.txt | 0 .../dev/test/uri_helpers/main.cpp | 0 .../dev/test/utf8_checker/CMakeLists.txt | 0 .../dev/test/utf8_checker/main.cpp | 0 .../dev/test/websocket/CMakeLists.txt | 0 .../dev/test/websocket/common/pub.hpp | 0 .../websocket/notificators/CMakeLists.txt | 8 ++ .../dev/test/websocket/notificators/main.cpp | 0 .../dev/test/websocket/parser/CMakeLists.txt | 0 .../dev/test/websocket/parser/main.cpp | 0 .../test/websocket/validators/CMakeLists.txt | 0 .../dev/test/websocket/validators/main.cpp | 0 .../websocket/ws_connection/CMakeLists.txt | 8 ++ .../dev/test/websocket/ws_connection/main.cpp | 0 .../write_group_output_ctx/CMakeLists.txt | 0 .../dev/test/write_group_output_ctx/main.cpp | 2 +- .../externals.rb | 16 ++-- 495 files changed, 618 insertions(+), 189 deletions(-) delete mode 100644 third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/sample/notificators/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/test/websocket/notificators/CMakeLists.txt delete mode 100644 third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/.gitattributes (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/.github/workflows/ci.yml (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/.gitignore (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/.hgignore (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/.hgtags (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/LICENSE (95%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/LICENSE.catch2 (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/LICENSE.expected-lite (100%) create mode 100644 third_party/restinio-v.0.7.4/LICENSE.fmtlib create mode 100644 third_party/restinio-v.0.7.4/LICENSE.llhttp rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/LICENSE.zlib (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/README.md (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/CMakeLists.txt (83%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/Doxyfile (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/common_args/app_args.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/single_handler/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/single_handler/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/single_handler_no_timer/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/single_handler_no_timer/main.cpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/benches/single_handler_so5_timer/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/bench.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/code_coverage.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/find_program_required.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/libcxx.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/link_atomic_if_necessary.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/link_threads_if_necessary.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/modules/FindPCRE.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/modules/FindPCRE2.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/modules/Findasio.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/modules/Findhttp-parser.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/run_tests.bat (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/sample.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/testbench.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/cmake/unittest.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/default-clang-tidy-flags.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/mainpage.dox (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio-helpers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio-helpers/cmd_line_args_helpers.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/CMakeLists.txt (98%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/all.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/asio_include.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/asio_timer_manager.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/async_chain/common.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/async_chain/fixed_size.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/async_chain/growable_size.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/buffers.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/cast_to.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/chunked_input_info.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/cmake/restinio-config.cmake.in (96%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/common_types.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/compiler_features.hpp (67%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/connection_count_limiter.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/connection_state_listener.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/core.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/default_strands.hpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/restinio/detect_os.hpp rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/exception.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/expected.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/easy_parser.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/file_upload.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/accept-charset.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/accept-encoding.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/accept-language.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/accept.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/authorization.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/basic_auth.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/basics.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/bearer_auth.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/cache-control.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/connection.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/content-disposition.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/content-encoding.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/content-type.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/details/pct_encoded_symbols.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/host.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/media-type.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/range.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/transfer-encoding.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/try_parse_field.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/http_field_parsers/user-agent.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/multipart_body.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/helpers/string_algo.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/http_headers.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/http_server.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/http_server_run.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/acceptor.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/connection.hpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/connection_base.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/connection_settings.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/executor_wrapper.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/fixed_buffer.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/header_helpers.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/include_fmtlib.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/ioctx_on_thread_pool.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/os_posix.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/os_unknown.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/os_win.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/overflow_controlled_integer_accumulator.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/parser_callbacks.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/response_coordinator.hpp (96%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/sendfile_operation.hpp (95%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/sendfile_operation_default.ipp (95%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/sendfile_operation_posix.ipp (97%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/sendfile_operation_win.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/string_caseless_compare.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/tls_socket.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/to_lower_lut.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/impl/write_group_output_ctx.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/incoming_http_msg_limits.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/ip_blocker.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/message_builders.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/null_logger.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/null_mutex.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/null_timer_manager.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/os.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/ostream_logger.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/path2regex/path2regex.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/request_handler.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/boost_regex_engine.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/easy_parser_router.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/express.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/impl/target_path_holder.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/method_matcher.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/non_matched_request_handler.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/pcre2_regex_engine.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/pcre_regex_engine.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/router/std_regex_engine.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sendfile.hpp (89%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sendfile_defs_default.hpp (52%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sendfile_defs_posix.hpp (78%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sendfile_defs_win.hpp (64%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/settings.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/so5/so_timer_manager.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/string_view.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sync_chain/fixed_size.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/sync_chain/growable_size.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/tcp_connection_ctx_base.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/timer_common.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/tls.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/tls_fwd.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/traits.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/transforms/zlib.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/uri_helpers.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/at_scope_exit.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/base64.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/base64_lut.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/from_string.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/from_string_details.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/impl/bitops.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/impl/safe_uint_truncate.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/metaprogramming.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/percent_encoding.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/sha1.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/suppress_exceptions.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/tagged_scalar.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/tuple_algorithms.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/utils/utf8_checker.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/value_or.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/version.cmake (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/version.hpp (95%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/impl/utf8.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/impl/ws_connection.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/impl/ws_connection_base.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/impl/ws_parser.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/impl/ws_protocol_validator.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/message.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/restinio/websocket/websocket.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/CMakeLists.txt (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/async_chained_handlers/main.cpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/async_handling_with_sobjectizer/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/chained_handlers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/chained_handlers/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/compression/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/compression/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/connection_state/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/connection_state/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/custom_buffer/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/custom_buffer/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/decompression/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/decompression/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/decompression/test_decompression.sh (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/easy_parser_router/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/easy_parser_router/curl_examples.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/easy_parser_router/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/easy_parser_router/new_book_1.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/easy_parser_router/new_book_2.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router/curl_examples.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router/new_book_1.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router/new_book_2.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router_tutorial/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/express_router_tutorial/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/extra_data_factory/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/extra_data_factory/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/file_upload/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/file_upload/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_basic/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_basic/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_delayed/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_delayed/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_https/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_https/dh2048.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_https/key.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_https/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_https/server.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_minimal/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_minimal/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile_https/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile_https/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile_w32_unicode/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/hello_world_sendfile_w32_unicode/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/ip_blocker/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/ip_blocker/main.cpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/sample/notificators/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/notificators/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/query_string_params/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/query_string_params/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/run_existing_server/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/run_existing_server/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/run_for_minute/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/run_for_minute/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/samples.dox (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/sendfiles/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/sendfiles/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/shared_tls_context/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/shared_tls_context/dh2048.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/shared_tls_context/key.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/shared_tls_context/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/shared_tls_context/server.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/README.md (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/alice.cer (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/alice.key (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/bob.cer (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/bob.key (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/ca.cer (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/ca.key (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/ca.key.passphrase (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/dh2048.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/server.cer (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/certs/server.key (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/tls_inspector/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/try_parse_query_string/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/try_parse_query_string/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/using_external_io_context/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/using_external_io_context/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_detailed/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_detailed/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_wss/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_wss/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_wss/wss_dh2048.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_wss/wss_key.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/sample/websocket_wss/wss_server.pem (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/basic_auth/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/basic_auth/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/bearer_auth/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/bearer_auth/main.cpp (98%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/buffers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/buffers/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/dummy_connection.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/fake_connection.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/pub.hpp (97%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/request_handler_pool.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/test_extra_data_factory.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/thread_safe_queue.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/time_limited_execution.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/common/utest_logger.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/default_constructed_settings/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/default_constructed_settings/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/encoders/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/encoders/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/file_upload/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/file_upload/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/from_string/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/from_string/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/from_string_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/acceptor_post_bind_hook/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/acceptor_post_bind_hook/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/async_chained_handlers_1/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/async_chained_handlers_1/main.cpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/async_chained_handlers_2/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/chunked_input/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/chunked_input/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/chunked_output/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/chunked_output/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/connection_count_limit/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/connection_count_limit/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/connection_state/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/connection_state/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/echo_body/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/echo_body/main.cpp (98%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/incoming_msg_limits/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/incoming_msg_limits/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/ip_blocker/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/ip_blocker/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/method/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/method/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/notificators/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/notificators/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/output_and_buffers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/output_and_buffers/const_buffer.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/output_and_buffers/shared_ptr_std_string.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/output_and_buffers/std_string.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/remote_endpoint/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/remote_endpoint/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/slow_transmit/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/slow_transmit/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/sync_chained_handlers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/sync_chained_handlers/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/throw_exception/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/throw_exception/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/timeouts/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/timeouts/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/upgrade/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/upgrade/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/user_controlled_output/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/user_controlled_output/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/user_data_simple/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/handle_requests/user_data_simple/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/header/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/header/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/accept-charset.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/accept-encoding.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/accept-language.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/accept.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/authorization.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/basics.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/cache-control.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/connection.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/content-disposition.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/content-encoding.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/content-type.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/host.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/media-type.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/range.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/transfer-encoding.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_field_parser/user-agent.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_pipelining/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_pipelining/sequence/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_pipelining/sequence/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_pipelining/timeouts/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/http_pipelining/timeouts/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/metaprogramming/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/metaprogramming/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/multipart_body/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/multipart_body/http_field_parser/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/multipart_body/http_field_parser/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/multipart_body/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/ref_qualifiers_settings/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/ref_qualifiers_settings/main.cpp (98%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/response_coordinator/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/response_coordinator/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/cmp_router_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/cmp_router_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/cmp_router_bench/route_parser.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/cmp_router_bench/route_parser.hpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_path_to_params/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_path_to_params/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_path_to_tuple/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_path_to_tuple/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_router_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_router_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_router_dsl/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/easy_parser_router_dsl/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/additional_tests.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/original_tests_part1.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/original_tests_part2.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/original_tests_part3.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/original_tests_part4.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/original_tests_part5.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/part1.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/part2.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/part3.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/part4.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/part5.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express/usings.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/part1.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/part2.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/part3.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/part4.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/part5.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_boost_regex/usings.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/part1.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/part2.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/part3.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/part4.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/part5.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre/usings.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/part1.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/part2.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/part3.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/part4.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/part5.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_pcre2/usings.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router/tests.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/cmp_routes.lua (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/cmp_routes.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/many_routes.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_bench/simple.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_boost_regex/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_boost_regex/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_boost_regex_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_boost_regex_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre2/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre2/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre2_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre2_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre_bench/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_pcre_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_user_data_simple/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/express_router_user_data_simple/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/router/fake_connection_and_request.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/run_on_thread_pool/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/run_on_thread_pool/main.cpp (97%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/.gitattributes (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/CMakeLists.txt (74%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/f1.dat (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/f2.dat (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/f3.dat (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/sendfile/main.cpp (91%) create mode 100644 "third_party/restinio-v.0.7.4/dev/test/sendfile/\320\237\321\200\320\270\320\262\320\265\321\202-\344\275\240\345\245\275.dat" rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/socket_options/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/socket_options/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/socket_options_tls/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/socket_options_tls/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/start_stop/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/start_stop/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/to_lower_bench/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/random_data_generators.ipp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib_body_appender/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib_body_appender/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib_body_handler/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/transforms/zlib_body_handler/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/try_parse_field/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/try_parse_field/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/tuple_algorithms/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/tuple_algorithms/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/uri_helpers/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/uri_helpers/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/utf8_checker/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/utf8_checker/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/common/pub.hpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/test/websocket/notificators/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/notificators/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/parser/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/parser/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/validators/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/validators/main.cpp (100%) create mode 100644 third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/CMakeLists.txt rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/websocket/ws_connection/main.cpp (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/write_group_output_ctx/CMakeLists.txt (100%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/dev/test/write_group_output_ctx/main.cpp (99%) rename third_party/{restinio-v.0.7.0 => restinio-v.0.7.4}/externals.rb (77%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 436f2bd..d489632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ add_subdirectory(third_party/expected-lite-0.6.3) add_subdirectory(third_party/libunifex-0.4.0) set(RESTINIO_ASIO_SOURCE "boost") -add_subdirectory(third_party/restinio-v.0.7.0/dev/restinio) +add_subdirectory(third_party/restinio-v.0.7.4/dev/restinio) # TODO make it compile #add_compile_options(-Werror -Wpedantic) diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/CMakeLists.txt deleted file mode 100644 index 05a8888..0000000 --- a/third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(BENCH _bench.restinio.single_handler_so5_timer) -include(${CMAKE_SOURCE_DIR}/cmake/bench.cmake) - -target_link_libraries(${BENCH} PRIVATE sobjectizer::StaticLib) - -target_link_libraries(${BENCH} PRIVATE restinio_helpers::cmd_line_args) - diff --git a/third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/CMakeLists.txt deleted file mode 100644 index 489a42c..0000000 --- a/third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(SAMPLE sample.async_chained_handlers) -include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) - -target_link_libraries(${SAMPLE} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt deleted file mode 100644 index 245f9f6..0000000 --- a/third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(SAMPLE sample.async_handling_with_sobjectizer) -include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) - -TARGET_LINK_LIBRARIES(${SAMPLE} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/dev/sample/notificators/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/sample/notificators/CMakeLists.txt deleted file mode 100644 index 23fd871..0000000 --- a/third_party/restinio-v.0.7.0/dev/sample/notificators/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(SAMPLE sample.notificators) -include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) - -TARGET_LINK_LIBRARIES(${SAMPLE} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt deleted file mode 100644 index cdb1ea7..0000000 --- a/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(UNITTEST _unit.test.handle_requests.async_chained_handlers_2) -include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) - -target_link_libraries(${UNITTEST} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/notificators/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/test/websocket/notificators/CMakeLists.txt deleted file mode 100644 index 19c54c9..0000000 --- a/third_party/restinio-v.0.7.0/dev/test/websocket/notificators/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(UNITTEST _unit.test.notificators) -include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) - -TARGET_LINK_LIBRARIES(${UNITTEST} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/CMakeLists.txt b/third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/CMakeLists.txt deleted file mode 100644 index 835b037..0000000 --- a/third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(UNITTEST _unit.test.ws_connection) -include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) - -TARGET_LINK_LIBRARIES(${UNITTEST} PRIVATE sobjectizer::StaticLib) diff --git a/third_party/restinio-v.0.7.0/.gitattributes b/third_party/restinio-v.0.7.4/.gitattributes similarity index 100% rename from third_party/restinio-v.0.7.0/.gitattributes rename to third_party/restinio-v.0.7.4/.gitattributes diff --git a/third_party/restinio-v.0.7.0/.github/workflows/ci.yml b/third_party/restinio-v.0.7.4/.github/workflows/ci.yml similarity index 100% rename from third_party/restinio-v.0.7.0/.github/workflows/ci.yml rename to third_party/restinio-v.0.7.4/.github/workflows/ci.yml diff --git a/third_party/restinio-v.0.7.0/.gitignore b/third_party/restinio-v.0.7.4/.gitignore similarity index 100% rename from third_party/restinio-v.0.7.0/.gitignore rename to third_party/restinio-v.0.7.4/.gitignore diff --git a/third_party/restinio-v.0.7.0/.hgignore b/third_party/restinio-v.0.7.4/.hgignore similarity index 100% rename from third_party/restinio-v.0.7.0/.hgignore rename to third_party/restinio-v.0.7.4/.hgignore diff --git a/third_party/restinio-v.0.7.0/.hgtags b/third_party/restinio-v.0.7.4/.hgtags similarity index 100% rename from third_party/restinio-v.0.7.0/.hgtags rename to third_party/restinio-v.0.7.4/.hgtags diff --git a/third_party/restinio-v.0.7.0/LICENSE b/third_party/restinio-v.0.7.4/LICENSE similarity index 95% rename from third_party/restinio-v.0.7.0/LICENSE rename to third_party/restinio-v.0.7.4/LICENSE index 36965f9..4ec1c01 100644 --- a/third_party/restinio-v.0.7.0/LICENSE +++ b/third_party/restinio-v.0.7.4/LICENSE @@ -1,5 +1,5 @@ RESTinio - library for creating REST applications in c++. -Copyright (c) 2017-2023 Stiffstream . All rights reserved. +Copyright (c) 2017-2025 Stiffstream . All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/third_party/restinio-v.0.7.0/LICENSE.catch2 b/third_party/restinio-v.0.7.4/LICENSE.catch2 similarity index 100% rename from third_party/restinio-v.0.7.0/LICENSE.catch2 rename to third_party/restinio-v.0.7.4/LICENSE.catch2 diff --git a/third_party/restinio-v.0.7.0/LICENSE.expected-lite b/third_party/restinio-v.0.7.4/LICENSE.expected-lite similarity index 100% rename from third_party/restinio-v.0.7.0/LICENSE.expected-lite rename to third_party/restinio-v.0.7.4/LICENSE.expected-lite diff --git a/third_party/restinio-v.0.7.4/LICENSE.fmtlib b/third_party/restinio-v.0.7.4/LICENSE.fmtlib new file mode 100644 index 0000000..1cd1ef9 --- /dev/null +++ b/third_party/restinio-v.0.7.4/LICENSE.fmtlib @@ -0,0 +1,27 @@ +Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--- Optional exception to the license --- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into a machine-executable object form of such +source code, you may redistribute such embedded portions in such object form +without including the above copyright and permission notices. diff --git a/third_party/restinio-v.0.7.4/LICENSE.llhttp b/third_party/restinio-v.0.7.4/LICENSE.llhttp new file mode 100644 index 0000000..6c1512d --- /dev/null +++ b/third_party/restinio-v.0.7.4/LICENSE.llhttp @@ -0,0 +1,22 @@ +This software is licensed under the MIT License. + +Copyright Fedor Indutny, 2018. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/third_party/restinio-v.0.7.0/LICENSE.zlib b/third_party/restinio-v.0.7.4/LICENSE.zlib similarity index 100% rename from third_party/restinio-v.0.7.0/LICENSE.zlib rename to third_party/restinio-v.0.7.4/LICENSE.zlib diff --git a/third_party/restinio-v.0.7.0/README.md b/third_party/restinio-v.0.7.4/README.md similarity index 100% rename from third_party/restinio-v.0.7.0/README.md rename to third_party/restinio-v.0.7.4/README.md diff --git a/third_party/restinio-v.0.7.0/dev/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/CMakeLists.txt similarity index 83% rename from third_party/restinio-v.0.7.0/dev/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/CMakeLists.txt index 3aea0c1..3d16fab 100644 --- a/third_party/restinio-v.0.7.0/dev/CMakeLists.txt +++ b/third_party/restinio-v.0.7.4/dev/CMakeLists.txt @@ -50,6 +50,10 @@ else() set(CMAKE_CXX_STANDARD 17) endif() +if (NOT RESTINIO_EXPLICIT_WIN32_WINNT) + set(RESTINIO_EXPLICIT_WIN32_WINNT "0x0602") # Win8 by default +endif() + set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -98,11 +102,22 @@ set_property(CACHE RESTINIO_DEP_FMT PROPERTY STRINGS "system;find;local") set(RESTINIO_DEP_EXPECTED_LITE "local" CACHE STRING "How to get expected-lite dependency)") set_property(CACHE RESTINIO_DEP_EXPECTED_LITE PROPERTY STRINGS "system;find;local") +# By default we assume to use an embedded version of Catch2. +set(RESTINIO_DEP_CATCH2 "local" CACHE STRING "How to get Catch2 dependency)") +set_property(CACHE RESTINIO_DEP_CATCH2 PROPERTY STRINGS "find;local") + +# By default we assume to use an embedded version of SObjectizer. +set(RESTINIO_DEP_SOBJECTIZER "local" CACHE STRING "How to get SObjectizer dependency)") +set_property(CACHE RESTINIO_DEP_SOBJECTIZER PROPERTY STRINGS "system;find;local") + + message(STATUS "RESTINIO_DEP_STANDALONE_ASIO: ${RESTINIO_DEP_STANDALONE_ASIO}") message(STATUS "RESTINIO_DEP_BOOST_ASIO: ${RESTINIO_DEP_BOOST_ASIO}") message(STATUS "RESTINIO_DEP_LLHTTP: ${RESTINIO_DEP_LLHTTP}") message(STATUS "RESTINIO_DEP_FMT: ${RESTINIO_DEP_FMT}") message(STATUS "RESTINIO_DEP_EXPECTED_LITE: ${RESTINIO_DEP_EXPECTED_LITE}") +message(STATUS "RESTINIO_DEP_CATCH2: ${RESTINIO_DEP_CATCH2}") +message(STATUS "RESTINIO_DEP_SOBJECTIZER: ${RESTINIO_DEP_SOBJECTIZER}") set(RESTINIO_ASIO_SOURCE "standalone" CACHE STRING "What source of ASIO to use (standalone, boost)") set(RESTINIO_ASIO_SOURCE_VALUES "standalone;boost") @@ -124,10 +139,14 @@ endif () option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so)" OFF) option(BUILD_STATIC_LIBS "Build static libraries (.lib/.a)" ON) +if (WIN32) + add_compile_definitions(_WIN32_WINNT=${RESTINIO_EXPLICIT_WIN32_WINNT}) +endif () + if (MSVC) add_compile_options(/W3) - add_compile_definitions(_CRT_SECURE_NO_WARNINGS) add_compile_definitions(_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS) + add_compile_options(/utf-8) endif () # ==================================================================== @@ -148,7 +167,7 @@ if (RESTINIO_ASIO_SOURCE STREQUAL "standalone") else () if (RESTINIO_DEP_BOOST_ASIO STREQUAL "find") find_package(Boost REQUIRED) - find_package(Boost REQUIRED COMPONENTS headers regex) + find_package(Boost REQUIRED COMPONENTS regex) endif () endif () @@ -181,8 +200,24 @@ endif () if (RESTINIO_WITH_SOBJECTIZER) message("========================================") - SET(SOBJECTIZER_BUILD_STATIC ON) - add_subdirectory(so_5) + if (RESTINIO_DEP_SOBJECTIZER STREQUAL "local") + message(STATUS "Add subdirectory so_5") + SET(SOBJECTIZER_BUILD_STATIC ON) + add_subdirectory(so_5) + + set(RESTINIO_SOBJECTIZER_LIB_LINK_NAME "sobjectizer::StaticLib") + elseif (RESTINIO_DEP_SOBJECTIZER STREQUAL "find") + find_package(sobjectizer CONFIG REQUIRED) + + set(RESTINIO_SOBJECTIZER_LIB_LINK_NAME "sobjectizer::StaticLib") + elseif (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + if (NOT RESTINIO_SOBJECTIZER_LIB_LINK_NAME) + message(FATAL_ERROR "The RESTINIO_SOBJECTIZER_LIB_LINK_NAME has to be " + "specified explicitly when RESTINIO_DEP_SOBJECTIZER is 'system'") + endif() + endif() + + message(STATUS "RESTINIO_SOBJECTIZER_LIB_LINK_NAME: ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}") message("========================================") endif () @@ -219,12 +254,6 @@ IF (PCRE2_FOUND) message( STATUS "PCRE2_INCLUDE_DIRS='" ${PCRE2_INCLUDE_DIRS} "'" ) ENDIF () -# PCRE2 -find_package(PCRE2) -IF (PCRE2_FOUND) - message( STATUS "PCRE2_LIBRARIES='" ${PCRE2_LIBRARIES} "'" ) - message( STATUS "PCRE2_INCLUDE_DIRS='" ${PCRE2_INCLUDE_DIRS} "'" ) -ENDIF () # ==================================================================== option(RESTINIO_GCC_CODE_COVERAGE "Build code coverage targets" OFF) @@ -297,13 +326,21 @@ add_subdirectory(restinio) message("========================================") if (RESTINIO_TEST) - set(CATCH_INSTALL_DOCS OFF) - set(CATCH_INSTALL_EXTRAS OFF) - set(CATCH_DEVELOPMENT_BUILD OFF) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - add_subdirectory(catch2) + if (RESTINIO_DEP_CATCH2 STREQUAL "find") + find_package(Catch2 REQUIRED) + elseif (RESTINIO_DEP_CATCH2 STREQUAL "local") + message("========================================") + message(STATUS "Add subdirectory catch2") + set(CATCH_INSTALL_DOCS OFF) + set(CATCH_INSTALL_EXTRAS OFF) + set(CATCH_DEVELOPMENT_BUILD OFF) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) + add_subdirectory(catch2) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/catch2/extras) + message("========================================") + endif () - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/catch2/extras) include(Catch) enable_testing() @@ -319,3 +356,5 @@ if (RESTINIO_BENCHMARK) include_directories("${CMAKE_SOURCE_DIR}/clara") add_subdirectory(benches) endif () + +# vim:ts=4:sts=4:sw=4:expandtab: diff --git a/third_party/restinio-v.0.7.0/dev/Doxyfile b/third_party/restinio-v.0.7.4/dev/Doxyfile similarity index 100% rename from third_party/restinio-v.0.7.0/dev/Doxyfile rename to third_party/restinio-v.0.7.4/dev/Doxyfile diff --git a/third_party/restinio-v.0.7.0/dev/benches/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/benches/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/benches/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/benches/common_args/app_args.hpp b/third_party/restinio-v.0.7.4/dev/benches/common_args/app_args.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/common_args/app_args.hpp rename to third_party/restinio-v.0.7.4/dev/benches/common_args/app_args.hpp diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/benches/single_handler/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/single_handler/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/benches/single_handler/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler/main.cpp b/third_party/restinio-v.0.7.4/dev/benches/single_handler/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/single_handler/main.cpp rename to third_party/restinio-v.0.7.4/dev/benches/single_handler/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler_no_timer/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/benches/single_handler_no_timer/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/single_handler_no_timer/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/benches/single_handler_no_timer/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler_no_timer/main.cpp b/third_party/restinio-v.0.7.4/dev/benches/single_handler_no_timer/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/single_handler_no_timer/main.cpp rename to third_party/restinio-v.0.7.4/dev/benches/single_handler_no_timer/main.cpp diff --git a/third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/CMakeLists.txt new file mode 100644 index 0000000..c72971e --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/CMakeLists.txt @@ -0,0 +1,11 @@ +set(BENCH _bench.restinio.single_handler_so5_timer) +include(${CMAKE_SOURCE_DIR}/cmake/bench.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${BENCH} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${BENCH} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) + +target_link_libraries(${BENCH} PRIVATE restinio_helpers::cmd_line_args) + diff --git a/third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/main.cpp b/third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/benches/single_handler_so5_timer/main.cpp rename to third_party/restinio-v.0.7.4/dev/benches/single_handler_so5_timer/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/cmake/bench.cmake b/third_party/restinio-v.0.7.4/dev/cmake/bench.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/bench.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/bench.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/code_coverage.cmake b/third_party/restinio-v.0.7.4/dev/cmake/code_coverage.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/code_coverage.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/code_coverage.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/find_program_required.cmake b/third_party/restinio-v.0.7.4/dev/cmake/find_program_required.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/find_program_required.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/find_program_required.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/libcxx.cmake b/third_party/restinio-v.0.7.4/dev/cmake/libcxx.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/libcxx.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/libcxx.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/link_atomic_if_necessary.cmake b/third_party/restinio-v.0.7.4/dev/cmake/link_atomic_if_necessary.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/link_atomic_if_necessary.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/link_atomic_if_necessary.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/link_threads_if_necessary.cmake b/third_party/restinio-v.0.7.4/dev/cmake/link_threads_if_necessary.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/link_threads_if_necessary.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/link_threads_if_necessary.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/modules/FindPCRE.cmake b/third_party/restinio-v.0.7.4/dev/cmake/modules/FindPCRE.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/modules/FindPCRE.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/modules/FindPCRE.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/modules/FindPCRE2.cmake b/third_party/restinio-v.0.7.4/dev/cmake/modules/FindPCRE2.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/modules/FindPCRE2.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/modules/FindPCRE2.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/modules/Findasio.cmake b/third_party/restinio-v.0.7.4/dev/cmake/modules/Findasio.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/modules/Findasio.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/modules/Findasio.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/modules/Findhttp-parser.cmake b/third_party/restinio-v.0.7.4/dev/cmake/modules/Findhttp-parser.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/modules/Findhttp-parser.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/modules/Findhttp-parser.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/run_tests.bat b/third_party/restinio-v.0.7.4/dev/cmake/run_tests.bat similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/run_tests.bat rename to third_party/restinio-v.0.7.4/dev/cmake/run_tests.bat diff --git a/third_party/restinio-v.0.7.0/dev/cmake/sample.cmake b/third_party/restinio-v.0.7.4/dev/cmake/sample.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/sample.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/sample.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/testbench.cmake b/third_party/restinio-v.0.7.4/dev/cmake/testbench.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/testbench.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/testbench.cmake diff --git a/third_party/restinio-v.0.7.0/dev/cmake/unittest.cmake b/third_party/restinio-v.0.7.4/dev/cmake/unittest.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/cmake/unittest.cmake rename to third_party/restinio-v.0.7.4/dev/cmake/unittest.cmake diff --git a/third_party/restinio-v.0.7.0/dev/default-clang-tidy-flags.cmake b/third_party/restinio-v.0.7.4/dev/default-clang-tidy-flags.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/default-clang-tidy-flags.cmake rename to third_party/restinio-v.0.7.4/dev/default-clang-tidy-flags.cmake diff --git a/third_party/restinio-v.0.7.0/dev/mainpage.dox b/third_party/restinio-v.0.7.4/dev/mainpage.dox similarity index 100% rename from third_party/restinio-v.0.7.0/dev/mainpage.dox rename to third_party/restinio-v.0.7.4/dev/mainpage.dox diff --git a/third_party/restinio-v.0.7.0/dev/restinio-helpers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/restinio-helpers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio-helpers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/restinio-helpers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/restinio-helpers/cmd_line_args_helpers.hpp b/third_party/restinio-v.0.7.4/dev/restinio-helpers/cmd_line_args_helpers.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio-helpers/cmd_line_args_helpers.hpp rename to third_party/restinio-v.0.7.4/dev/restinio-helpers/cmd_line_args_helpers.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/restinio/CMakeLists.txt similarity index 98% rename from third_party/restinio-v.0.7.0/dev/restinio/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/restinio/CMakeLists.txt index 5c0a5ec..594e74d 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/CMakeLists.txt +++ b/third_party/restinio-v.0.7.4/dev/restinio/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.10) if(NOT RESTINIO_LIBRARY_NAME) - # That must be the case we RESTinio is used as a dependency. + # That must be the case when RESTinio is used as a dependency. set(RESTINIO_LIBRARY_NAME restinio) endif() @@ -146,7 +146,7 @@ if ("${RESTINIO_EXPLICIT_CPPSTD}" STREQUAL "17" # conditional block. endif() -if (RESTINIO_DEP_FMT STREQUAL "system") +if (RESTINIO_DEP_EXPECTED_LITE STREQUAL "system") message(STATUS "Using system expected-lite") elseif (TARGET expected-lite::expected-lite) target_link_libraries(${RESTINIO_LIBRARY_NAME} INTERFACE expected-lite::expected-lite) diff --git a/third_party/restinio-v.0.7.0/dev/restinio/all.hpp b/third_party/restinio-v.0.7.4/dev/restinio/all.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/all.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/all.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/asio_include.hpp b/third_party/restinio-v.0.7.4/dev/restinio/asio_include.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/asio_include.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/asio_include.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/asio_timer_manager.hpp b/third_party/restinio-v.0.7.4/dev/restinio/asio_timer_manager.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/asio_timer_manager.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/asio_timer_manager.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/async_chain/common.hpp b/third_party/restinio-v.0.7.4/dev/restinio/async_chain/common.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/async_chain/common.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/async_chain/common.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/async_chain/fixed_size.hpp b/third_party/restinio-v.0.7.4/dev/restinio/async_chain/fixed_size.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/async_chain/fixed_size.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/async_chain/fixed_size.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/async_chain/growable_size.hpp b/third_party/restinio-v.0.7.4/dev/restinio/async_chain/growable_size.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/async_chain/growable_size.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/async_chain/growable_size.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/buffers.hpp b/third_party/restinio-v.0.7.4/dev/restinio/buffers.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/buffers.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/buffers.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/cast_to.hpp b/third_party/restinio-v.0.7.4/dev/restinio/cast_to.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/cast_to.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/cast_to.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/chunked_input_info.hpp b/third_party/restinio-v.0.7.4/dev/restinio/chunked_input_info.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/chunked_input_info.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/chunked_input_info.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/cmake/restinio-config.cmake.in b/third_party/restinio-v.0.7.4/dev/restinio/cmake/restinio-config.cmake.in similarity index 96% rename from third_party/restinio-v.0.7.0/dev/restinio/cmake/restinio-config.cmake.in rename to third_party/restinio-v.0.7.4/dev/restinio/cmake/restinio-config.cmake.in index 6c36002..9857c94 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/cmake/restinio-config.cmake.in +++ b/third_party/restinio-v.0.7.4/dev/restinio/cmake/restinio-config.cmake.in @@ -16,7 +16,7 @@ if(RESTINIO_ASIO_SOURCE STREQUAL "standalone") endif () else () if (RESTINIO_DEP_BOOST_ASIO STREQUAL "find") - find_dependency(boost) + find_dependency(Boost) endif () endif () diff --git a/third_party/restinio-v.0.7.0/dev/restinio/common_types.hpp b/third_party/restinio-v.0.7.4/dev/restinio/common_types.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/common_types.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/common_types.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/compiler_features.hpp b/third_party/restinio-v.0.7.4/dev/restinio/compiler_features.hpp similarity index 67% rename from third_party/restinio-v.0.7.0/dev/restinio/compiler_features.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/compiler_features.hpp index f5ee9ec..e39ebf3 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/compiler_features.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/compiler_features.hpp @@ -92,69 +92,3 @@ #define RESTINIO_STATIC_ASSERT_NOT_NOEXCEPT(expr) \ static_assert(!noexcept(expr), #expr " is not expected to be noexcept" ) -namespace restinio -{ - -namespace static_if_details -{ - -template< bool Condition > -struct static_if_impl; - -template<> -struct static_if_impl -{ - template - static decltype(auto) - call( If_Part && if_part, Else_Part && ) - { - return if_part(); - } -}; - -template<> -struct static_if_impl -{ - template - static decltype(auto) - call( If_Part &&, Else_Part && else_part ) - { - return else_part(); - } -}; - -} /* namespace static_if_details */ - -// -// static_if_else -// -/*! - * @brief An emulation of if constexpr for C++14. - * - * Usage example: - * @code - * static_if_else< noexcept(some-expression) >( - * []() noexcept { - * ... // Some action that doesn't throw. - * }, - * [] { - * try { - * ... // Some action that throws. - * } - * catch(...) {} - * }); - * @endcode - * - * @since v.0.6.1.1 - */ -template< bool Condition, typename If_Part, typename Else_Part > -decltype(auto) -static_if_else( If_Part && if_part, Else_Part && else_part ) -{ - return static_if_details::static_if_impl::call( - std::forward(if_part), - std::forward(else_part) ); -} - -} /* namespace restinio */ - diff --git a/third_party/restinio-v.0.7.0/dev/restinio/connection_count_limiter.hpp b/third_party/restinio-v.0.7.4/dev/restinio/connection_count_limiter.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/connection_count_limiter.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/connection_count_limiter.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/connection_state_listener.hpp b/third_party/restinio-v.0.7.4/dev/restinio/connection_state_listener.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/connection_state_listener.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/connection_state_listener.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/core.hpp b/third_party/restinio-v.0.7.4/dev/restinio/core.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/core.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/core.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/default_strands.hpp b/third_party/restinio-v.0.7.4/dev/restinio/default_strands.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/default_strands.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/default_strands.hpp diff --git a/third_party/restinio-v.0.7.4/dev/restinio/detect_os.hpp b/third_party/restinio-v.0.7.4/dev/restinio/detect_os.hpp new file mode 100644 index 0000000..d6884b5 --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/restinio/detect_os.hpp @@ -0,0 +1,56 @@ +/*! + * @file + * @brief Helper macros for detection of compiler/platform. + */ + +#pragma once + +/*! + * @def RESTINIO_OS_WIN32 + * @brief A marker for Win32 platform. + * + * @note This marker is also defined for Win64 platform. + */ + +/*! + * @def RESTINIO_OS_WIN64 + * @brief A marker for Win64 platform. + */ + +/*! + * @def RESTINIO_OS_WINDOWS + * @brief A marker for Windows platform. + * + * Defined if RESTINIO_OS_WIN32 or RESTINIO_OS_WIN64 are defined. + */ + +/*! + * @def RESTINIO_OS_UNIX + * @brief A marker for Unix platforms, but not macOS/iOS. + */ + +/*! + * @def RESTINIO_OS_APPLE + * @brief A marker for macOS/iOS. + */ + +#if defined( _WIN64 ) + #define RESTINIO_OS_WIN64 +#endif + +#if defined( _WIN32 ) + #define RESTINIO_OS_WIN32 +#endif + +#if defined( RESTINIO_OS_WIN32 ) || defined( RESTINIO_OS_WIN64 ) + #define RESTINIO_OS_WINDOWS +#endif + +#if defined(unix) || defined(__unix__) || defined(__unix) + #define RESTINIO_OS_UNIX +#endif + +#if defined(__APPLE__) + #define RESTINIO_OS_APPLE +#endif + diff --git a/third_party/restinio-v.0.7.0/dev/restinio/exception.hpp b/third_party/restinio-v.0.7.4/dev/restinio/exception.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/exception.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/exception.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/expected.hpp b/third_party/restinio-v.0.7.4/dev/restinio/expected.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/expected.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/expected.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/easy_parser.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/easy_parser.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/easy_parser.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/easy_parser.hpp index d4d00e9..c657672 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/helpers/easy_parser.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/helpers/easy_parser.hpp @@ -24,13 +24,14 @@ #include #include +#include +#include +#include #include #include #include -#include -#include -#include #include +#include namespace restinio { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/file_upload.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/file_upload.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/file_upload.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/file_upload.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-charset.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-charset.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-charset.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-charset.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-encoding.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-encoding.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-encoding.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-encoding.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-language.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-language.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept-language.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept-language.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/accept.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/accept.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/authorization.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/authorization.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/authorization.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/authorization.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/basic_auth.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/basic_auth.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/basic_auth.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/basic_auth.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/basics.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/basics.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/basics.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/basics.hpp index 4f84e21..5a263c2 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/basics.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/basics.hpp @@ -163,7 +163,9 @@ private : underlying_char_array_t result; if( qvalue_details::maximum == m_value ) { - std::strcpy( &result[0], "1.000" ); + static constexpr char fixed_value[]{ "1.000" }; + std::copy( std::begin(fixed_value), std::end(fixed_value), + std::begin(result) ); } else { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/bearer_auth.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/bearer_auth.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/bearer_auth.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/bearer_auth.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/cache-control.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/cache-control.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/cache-control.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/cache-control.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/connection.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/connection.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/connection.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/connection.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-disposition.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-disposition.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-disposition.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-disposition.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-encoding.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-encoding.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-encoding.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-encoding.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-type.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-type.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/content-type.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/content-type.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/details/pct_encoded_symbols.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/details/pct_encoded_symbols.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/details/pct_encoded_symbols.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/details/pct_encoded_symbols.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/host.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/host.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/host.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/host.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/media-type.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/media-type.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/media-type.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/media-type.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/range.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/range.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/range.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/range.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/transfer-encoding.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/transfer-encoding.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/transfer-encoding.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/transfer-encoding.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/try_parse_field.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/try_parse_field.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/try_parse_field.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/try_parse_field.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/user-agent.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/user-agent.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/http_field_parsers/user-agent.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/http_field_parsers/user-agent.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/multipart_body.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/multipart_body.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/multipart_body.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/multipart_body.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/helpers/string_algo.hpp b/third_party/restinio-v.0.7.4/dev/restinio/helpers/string_algo.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/helpers/string_algo.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/helpers/string_algo.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/http_headers.hpp b/third_party/restinio-v.0.7.4/dev/restinio/http_headers.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/http_headers.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/http_headers.hpp index 5821fc0..af8f6e5 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/http_headers.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/http_headers.hpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -2029,6 +2030,19 @@ class http_status_code_t std::uint16_t m_status_code{ 0 }; }; +//! Helper for printing status_code to ostream. +/*! + * @since v.0.7.1 + */ +template< typename CharT, typename Traits > +inline std::basic_ostream & +operator<<( + std::basic_ostream & to, + const http_status_code_t & status_code ) +{ + return to << status_code.raw_code(); +} + namespace status_code { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/http_server.hpp b/third_party/restinio-v.0.7.4/dev/restinio/http_server.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/http_server.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/http_server.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/http_server_run.hpp b/third_party/restinio-v.0.7.4/dev/restinio/http_server_run.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/http_server_run.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/http_server_run.hpp index a579238..ea0ec85 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/http_server_run.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/http_server_run.hpp @@ -680,7 +680,9 @@ template inline void initiate_shutdown( http_server_t & server ) { - server.io_context().post( [&server] { + asio_ns::post( + server.io_context(), + [&server] { server.close_sync(); server.io_context().stop(); } ); diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/acceptor.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/acceptor.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/acceptor.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/acceptor.hpp index b49df35..30691f9 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/acceptor.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/acceptor.hpp @@ -263,7 +263,7 @@ class acceptor_t final ep = m_acceptor.local_endpoint(); // Now we can switch acceptor to listen state. - m_acceptor.listen( asio_ns::socket_base::max_connections ); + m_acceptor.listen( asio_ns::socket_base::max_listen_connections ); // Call accept connections routine. for( std::size_t i = 0; i< this->concurrent_accept_sockets_count(); ++i ) @@ -620,7 +620,7 @@ class acceptor_t final else if( str_addr == "ip6-localhost" ) str_addr = "::1"; - result = asio_ns::ip::address::from_string( str_addr ); + result = asio_ns::ip::make_address( str_addr ); } else if( auto * addr_v = std::get_if( &from ) ) { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/connection.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/connection.hpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/connection.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/connection.hpp index 7411e01..339176b 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/connection.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/connection.hpp @@ -1131,8 +1131,8 @@ class connection_t final m_logger.trace( [&]{ // Get status line: const string_view_t status_line{ - asio_ns::buffer_cast< const char * >( - next_write_group->first.items().front().buf() ), + static_cast< const char * >( + next_write_group->first.items().front().buf().data() ), next_write_group->first.status_line_size() }; return fmt::format( diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/connection_base.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/connection_base.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/connection_base.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/connection_base.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/connection_settings.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/connection_settings.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/connection_settings.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/connection_settings.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/executor_wrapper.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/executor_wrapper.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/executor_wrapper.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/executor_wrapper.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/fixed_buffer.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/fixed_buffer.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/fixed_buffer.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/fixed_buffer.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/header_helpers.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/header_helpers.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/header_helpers.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/header_helpers.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/include_fmtlib.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/include_fmtlib.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/include_fmtlib.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/include_fmtlib.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/ioctx_on_thread_pool.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/ioctx_on_thread_pool.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/ioctx_on_thread_pool.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/ioctx_on_thread_pool.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/os_posix.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/os_posix.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/os_posix.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/os_posix.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/os_unknown.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/os_unknown.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/os_unknown.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/os_unknown.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/os_win.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/os_win.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/os_win.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/os_win.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/overflow_controlled_integer_accumulator.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/overflow_controlled_integer_accumulator.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/overflow_controlled_integer_accumulator.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/overflow_controlled_integer_accumulator.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/parser_callbacks.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/parser_callbacks.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/parser_callbacks.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/parser_callbacks.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/response_coordinator.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/response_coordinator.hpp similarity index 96% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/response_coordinator.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/response_coordinator.hpp index 40c83be..69fa234 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/response_coordinator.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/response_coordinator.hpp @@ -95,17 +95,18 @@ class response_context_t // Some STL implementation can have std::vector::erase that // doesn't throw. So we use a kind of static if to select // an appropriate behaviour. - static_if_else< noexcept(m_write_groups.erase(m_write_groups.begin())) >( - // This is for the case when std::vector::erase doesn't throw. - [this]() noexcept { + if constexpr( noexcept(m_write_groups.erase(m_write_groups.begin())) ) + { + // This is for the case when std::vector::erase doesn't throw. + m_write_groups.erase( m_write_groups.begin() ); + } + else + { + // This is for the case when std::vector::erase does throw. + restinio::utils::suppress_exceptions_quietly( [this] { m_write_groups.erase( m_write_groups.begin() ); - }, - // This is for the case when std::vector::erase does throw. - [this]() { - restinio::utils::suppress_exceptions_quietly( [this] { - m_write_groups.erase( m_write_groups.begin() ); - } ); - } ); + } ); + } return result; } diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation.hpp similarity index 95% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation.hpp index 30a178c..8544f3c 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation.hpp @@ -98,9 +98,9 @@ make_error_code( const Error_Type & e ) noexcept Concrete implementations. */ -#if defined( _MSC_VER ) || defined( __MINGW32__ ) +#if defined(RESTINIO_OS_WINDOWS) #include "sendfile_operation_win.ipp" -#elif (defined( __clang__ ) || defined( __GNUC__ )) && !defined(__WIN32__) +#elif defined(RESTINIO_OS_UNIX) || defined(RESTINIO_OS_APPLE) #include "sendfile_operation_posix.ipp" #else #if defined (RESTINIO_ENABLE_SENDFILE_DEFAULT_IMPL) diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_default.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_default.ipp similarity index 95% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_default.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_default.ipp index 0a1c330..98876c1 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_default.ipp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_default.ipp @@ -41,7 +41,9 @@ class sendfile_operation_runner_t final const auto n = std::fseek( this->m_file_descriptor, - this->m_next_write_offset, + //eao197: suppress warning from a compiler if restinio::file_offset_t + //is not long. + static_cast(this->m_next_write_offset), SEEK_SET ); if( 0 == n ) diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_posix.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_posix.ipp similarity index 97% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_posix.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_posix.ipp index bc31945..15e8927 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_posix.ipp +++ b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_posix.ipp @@ -41,7 +41,7 @@ class sendfile_operation_runner_t final virtual void start() override { -#if defined( RESTINIO_FREEBSD_TARGET ) || defined( RESTINIO_MACOS_TARGET ) +#if !defined( _LARGEFILE64_SOURCE ) auto const n = ::lseek( this->m_file_descriptor, this->m_next_write_offset, SEEK_SET ); #else auto const n = ::lseek64( this->m_file_descriptor, this->m_next_write_offset, SEEK_SET ); @@ -274,11 +274,19 @@ class sendfile_operation_runner_t< asio_ns::ip::tcp::socket > final auto call_native_sendfile() noexcept { +#if defined( _LARGEFILE64_SOURCE ) return ::sendfile64( m_socket.native_handle(), m_file_descriptor, &m_next_write_offset, std::min< file_size_t >( m_remained_size, m_chunk_size ) ); +#else + return ::sendfile( + m_socket.native_handle(), + m_file_descriptor, + &m_next_write_offset, + std::min< file_size_t >( m_remained_size, m_chunk_size ) ); +#endif } #endif diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_win.ipp b/third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_win.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/sendfile_operation_win.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/sendfile_operation_win.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/string_caseless_compare.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/string_caseless_compare.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/string_caseless_compare.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/string_caseless_compare.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/tls_socket.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/tls_socket.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/tls_socket.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/tls_socket.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/to_lower_lut.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/to_lower_lut.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/to_lower_lut.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/to_lower_lut.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/impl/write_group_output_ctx.hpp b/third_party/restinio-v.0.7.4/dev/restinio/impl/write_group_output_ctx.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/impl/write_group_output_ctx.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/impl/write_group_output_ctx.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/incoming_http_msg_limits.hpp b/third_party/restinio-v.0.7.4/dev/restinio/incoming_http_msg_limits.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/incoming_http_msg_limits.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/incoming_http_msg_limits.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/ip_blocker.hpp b/third_party/restinio-v.0.7.4/dev/restinio/ip_blocker.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/ip_blocker.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/ip_blocker.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/message_builders.hpp b/third_party/restinio-v.0.7.4/dev/restinio/message_builders.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/message_builders.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/message_builders.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/null_logger.hpp b/third_party/restinio-v.0.7.4/dev/restinio/null_logger.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/null_logger.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/null_logger.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/null_mutex.hpp b/third_party/restinio-v.0.7.4/dev/restinio/null_mutex.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/null_mutex.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/null_mutex.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/null_timer_manager.hpp b/third_party/restinio-v.0.7.4/dev/restinio/null_timer_manager.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/null_timer_manager.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/null_timer_manager.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/os.hpp b/third_party/restinio-v.0.7.4/dev/restinio/os.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/os.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/os.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/ostream_logger.hpp b/third_party/restinio-v.0.7.4/dev/restinio/ostream_logger.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/ostream_logger.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/ostream_logger.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/path2regex/path2regex.hpp b/third_party/restinio-v.0.7.4/dev/restinio/path2regex/path2regex.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/path2regex/path2regex.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/path2regex/path2regex.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/request_handler.hpp b/third_party/restinio-v.0.7.4/dev/restinio/request_handler.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/request_handler.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/request_handler.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/boost_regex_engine.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/boost_regex_engine.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/boost_regex_engine.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/boost_regex_engine.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/easy_parser_router.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/easy_parser_router.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/easy_parser_router.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/easy_parser_router.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/express.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/express.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/express.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/express.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/impl/target_path_holder.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/impl/target_path_holder.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/impl/target_path_holder.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/impl/target_path_holder.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/method_matcher.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/method_matcher.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/method_matcher.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/method_matcher.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/non_matched_request_handler.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/non_matched_request_handler.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/non_matched_request_handler.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/non_matched_request_handler.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/pcre2_regex_engine.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/pcre2_regex_engine.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/pcre2_regex_engine.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/pcre2_regex_engine.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/pcre_regex_engine.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/pcre_regex_engine.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/pcre_regex_engine.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/pcre_regex_engine.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/router/std_regex_engine.hpp b/third_party/restinio-v.0.7.4/dev/restinio/router/std_regex_engine.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/router/std_regex_engine.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/router/std_regex_engine.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sendfile.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sendfile.hpp similarity index 89% rename from third_party/restinio-v.0.7.0/dev/restinio/sendfile.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sendfile.hpp index 877acf5..09f7fdc 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/sendfile.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/sendfile.hpp @@ -10,16 +10,19 @@ #pragma once -#include -#include -#include - #include #include #include #include +#include + +#include +#include +#include +#include + /* Defenitions for: file_descriptor_t @@ -27,9 +30,9 @@ file_size_t */ -#if defined( _MSC_VER ) || defined(__MINGW32__) +#if defined(RESTINIO_OS_WINDOWS) #include "sendfile_defs_win.hpp" -#elif (defined( __clang__ ) || defined( __GNUC__ )) && !defined(__WIN32__) +#elif defined(RESTINIO_OS_UNIX) || defined(RESTINIO_OS_APPLE) #include "sendfile_defs_posix.hpp" #else #if defined (RESTINIO_ENABLE_SENDFILE_DEFAULT_IMPL) @@ -88,6 +91,7 @@ class sendfile_chunk_size_guarded_value_t {} //! Get the valid value of a chunk size. + [[nodiscard]] constexpr auto value() const noexcept { return m_chunk_size; } private: @@ -137,11 +141,9 @@ class file_descriptor_holder_t file_descriptor_holder_t & operator = ( file_descriptor_holder_t && fdh ) noexcept { - if( this != &fdh ) - { - file_descriptor_holder_t tmp{ std::move( fdh ) }; - swap( *this, tmp ); - } + file_descriptor_holder_t tmp{ std::move( fdh ) }; + swap( *this, tmp ); + return *this; } @@ -152,12 +154,14 @@ class file_descriptor_holder_t } //! Check if file descriptor is valid. + [[nodiscard]] bool is_valid() const noexcept { return null_file_descriptor() != m_file_descriptor; } //Get file descriptor. + [[nodiscard]] file_descriptor_t fd() const noexcept { return m_file_descriptor; @@ -199,8 +203,10 @@ class file_meta_t , m_last_modified_at{ last_modified_at } {} + [[nodiscard]] file_size_t file_total_size() const noexcept { return m_file_total_size; } + [[nodiscard]] auto last_modified_at() const noexcept { return m_last_modified_at; } private: @@ -280,29 +286,30 @@ class sendfile_t sendfile_t & operator = ( sendfile_t && sf ) noexcept { - if( this != &sf ) - { - sendfile_t tmp{ std::move( sf ) }; - swap( *this, tmp ); - } + sendfile_t tmp{ std::move( sf ) }; + swap( *this, tmp ); return *this; } ///@} //! Check if file is valid. + [[nodiscard]] bool is_valid() const noexcept { return m_file_descriptor.is_valid(); } //! Get file meta data. + [[nodiscard]] const file_meta_t & meta() const { return m_meta; } //! Get offset of data to write. + [[nodiscard]] auto offset() const noexcept { return m_offset; } //! Get size of data to write. + [[nodiscard]] auto size() const noexcept { return m_size; } /** @name Set file offset and size. @@ -350,6 +357,7 @@ class sendfile_t } ///@} + [[nodiscard]] auto chunk_size() const noexcept { return m_chunk_size; } /** @name Set prefered chunk size to use in write operation. @@ -374,6 +382,7 @@ class sendfile_t } ///@} + [[nodiscard]] auto timelimit() const noexcept { return m_timelimit; } /** @name Set timelimit on write operation.. @@ -398,6 +407,7 @@ class sendfile_t ///@} //! Get the file descriptor of a given sendfile operation. + [[nodiscard]] file_descriptor_t file_descriptor() const noexcept { @@ -417,6 +427,7 @@ class sendfile_t @since v.0.4.9 */ + [[nodiscard]] friend file_descriptor_holder_t takeaway_file_descriptor( sendfile_t & target ) { @@ -465,6 +476,7 @@ class sendfile_t * @since v.0.4.3 */ ///@{ +[[nodiscard]] inline sendfile_t sendfile( //! Native file descriptor. @@ -477,6 +489,7 @@ sendfile( return sendfile_t{ std::move( fd ), meta, chunk_size }; } +[[nodiscard]] inline sendfile_t sendfile( //! Path to file. @@ -491,6 +504,7 @@ sendfile( return sendfile( std::move( fd ), meta, chunk_size ); } +[[nodiscard]] inline sendfile_t sendfile( //! Path to file. @@ -501,6 +515,7 @@ sendfile( return sendfile( file_path.c_str(), chunk_size ); } +[[nodiscard]] inline sendfile_t sendfile( //! Path to file. @@ -513,6 +528,36 @@ sendfile( std::string{ file_path.data(), file_path.size() }, chunk_size ); } + +/*! + * @brief Creates an instance for service sendfile operation. + * + * This overload accepts `std::filesystem::path` as file name. + * + * @note + * On Windows it uses `std::filesystem::path::wstring()` for opening + * the file. It means that on Windows UNICODE-based version of + * file-related functions are used and file names with UNICODE symbols + * are supported. On UNIX platforms `std::filesystem::path::string()` is + * used and it's assumed that file names are in UTF-8. + * + * @since v.0.7.1 + */ +[[nodiscard]] +inline sendfile_t +sendfile( + //! Path to file. + const std::filesystem::path & file_path, + //! The max size of a data to be send on a single iteration. + file_size_t chunk_size = sendfile_default_chunk_size ) +{ + file_descriptor_holder_t fd{ open_file( file_path ) }; + + auto meta = get_file_meta< file_meta_t >( fd.fd() ); + + return sendfile( std::move( fd ), meta, chunk_size ); +} ///@} } /* namespace restinio */ + diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_default.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_default.hpp similarity index 52% rename from third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_default.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_default.hpp index ec6b1f5..585e87f 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_default.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_default.hpp @@ -11,6 +11,11 @@ #pragma once #include +#include + +// for fixing #199 (https://github.com/Stiffstream/restinio/issues/199) +// fopen_s seems to be defined in the global namespace. +#include namespace restinio { @@ -33,12 +38,39 @@ using file_size_t = std::uint64_t; ///@{ //! Get file descriptor which stands for null. +[[nodiscard]] constexpr file_descriptor_t null_file_descriptor(){ return nullptr; } //! Open file. +/*! + * @note + * It uses `fopen_s` if the compiler is VC++. + * + * @note + * It's expected that @a file_path contains names in ANSI encoding + * on Windows platform. + */ +[[nodiscard]] inline file_descriptor_t open_file( const char * file_path ) { +//NOTE: fopen_s is only used for VC++ compiler. +#if defined(_MSC_VER) + file_descriptor_t file_descriptor{}; + const auto result = fopen_s( &file_descriptor, file_path, "rb" ); + + if( result ) + { + const auto err_code = errno; + throw exception_t{ + fmt::format( + RESTINIO_FMT_FORMAT_STRING( "fopen_s('{}') failed; errno={}" ), + file_path, err_code ) + }; + } + + return file_descriptor; +#else file_descriptor_t file_descriptor = std::fopen( file_path, "rb" ); if( null_file_descriptor() == file_descriptor ) @@ -51,10 +83,50 @@ open_file( const char * file_path ) } return file_descriptor; +#endif +} + +/*! + * @brief Helper function that accepts std::filesystem::path. + * + * @note + * It uses `_wfopen_s` if the compiler is VC++. + * + * @note + * It's expected that @a file_path contains names in ANSI encoding + * on Windows platform. + * + * @since v.0.7.1 + */ +[[nodiscard]] +inline file_descriptor_t +open_file( const std::filesystem::path & file_path ) +{ +//NOTE: _wfopen_s is only used for VC++ compiler. +#if defined(_MSC_VER) + file_descriptor_t file_descriptor{}; + const auto result = _wfopen_s( &file_descriptor, file_path.c_str(), L"rb" ); + + if( result ) + { + const auto err_code = errno; + throw exception_t{ + fmt::format( + RESTINIO_FMT_FORMAT_STRING( "_wfopen_s failed; errno={}" ), + err_code ) + }; + } + + return file_descriptor; +#else + // Just delegate to ordinary open_file assuming that file_path is in UTF-8. + return open_file( file_path.c_str() ); +#endif } //! Get file size. template < typename META > +[[nodiscard]] META get_file_meta( file_descriptor_t fd ) { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_posix.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_posix.hpp similarity index 78% rename from third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_posix.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_posix.hpp index e531a17..691ad18 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_posix.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_posix.hpp @@ -42,9 +42,11 @@ using file_size_t = std::uint64_t; ///@{ //! Get file descriptor which stands for null. +[[nodiscard]] constexpr file_descriptor_t null_file_descriptor(){ return -1; } //! Open file. +[[nodiscard]] inline file_descriptor_t open_file( const char * file_path) { @@ -65,8 +67,31 @@ open_file( const char * file_path) return file_descriptor; } +/*! + * @brief Helper function that accepts std::filesystem::path. + * + * Just delegates all real work to open_file(const char *). + * + * @attention + * Uses std::filesystem::path::c_str() to get file name and pass it + * to the actual open_file implementation. It means that we assume + * that file systems on POSIX uses UTF-8 natively and that + * @a file_path is specified in UTF-8. + * + * @since v.0.7.1 + */ +[[nodiscard]] +inline file_descriptor_t +open_file( const std::filesystem::path & file_path ) +{ + // Use c_str() on POSIX, because it's assumed that + // filesystem uses UTF-8. + return open_file( file_path.c_str() ); +} + //! Get file meta. template < typename META > +[[nodiscard]] META get_file_meta( file_descriptor_t fd ) { @@ -75,7 +100,7 @@ get_file_meta( file_descriptor_t fd ) throw exception_t{ "invalid file descriptor" }; } -#if defined( RESTINIO_FREEBSD_TARGET ) || defined( RESTINIO_MACOS_TARGET ) +#if !defined( _LARGEFILE64_SOURCE ) struct stat file_stat; const auto fstat_rc = ::fstat( fd, &file_stat ); diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_win.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_win.hpp similarity index 64% rename from third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_win.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_win.hpp index 6476f83..fc48684 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/sendfile_defs_win.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/sendfile_defs_win.hpp @@ -10,6 +10,12 @@ #pragma once +//eao197: this code has to be uncommented to check the default +//implementation of sendfile operation. +//#if defined(RESTINIO_ASIO_HAS_WINDOWS_OVERLAPPED_PTR) +//#undef RESTINIO_ASIO_HAS_WINDOWS_OVERLAPPED_PTR +//#endif + #if defined(RESTINIO_ASIO_HAS_WINDOWS_OVERLAPPED_PTR) #include @@ -33,9 +39,11 @@ using file_size_t = std::uint64_t; */ ///@{ //! Get file descriptor which stands for null. +[[nodiscard]] inline file_descriptor_t null_file_descriptor(){ return INVALID_HANDLE_VALUE; } //! Open file. +[[nodiscard]] inline file_descriptor_t open_file( const char * file_path ) { @@ -63,8 +71,58 @@ open_file( const char * file_path ) return file_descriptor; } +/*! + * @brief Version of %open_file that accepts std::filesystem::path. + * + * @attention + * It uses std::filesystem::path::wstring() to get the file name and + * calls CreateFileW. We assume that @a file_path contains a valid + * file name constructed from a wide-char string or from utf-8 string + * literal (as `const std::char8_t[N]` in C++20). Or @a file_path is + * specified as a narrow string, but it can be automatically converted + * to wide-string in the current code page. + * + * @since v.0.7.1 + */ +[[nodiscard]] +inline file_descriptor_t +open_file( const std::filesystem::path & file_path ) +{ + const auto wide_file_path = file_path.wstring(); + file_descriptor_t file_descriptor = + // Use wide-char version of CreateFile. + ::CreateFileW( + wide_file_path.c_str(), + GENERIC_READ, + FILE_SHARE_READ, + 0, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, + 0 ); + + if( null_file_descriptor() == file_descriptor ) + { + //NOTE(eao197): I don't know a simple way to add `file_path` value into + //error message (with respect to the fact that file_path can contain name + //in Unicode, in UCS-2, but not in UTF-8). + //Because of that the current version doesn't include file name in the + //error description. + throw exception_t{ + fmt::format( + RESTINIO_FMT_FORMAT_STRING( + "open_file(std::filesystem::path) " + "unable to openfile: error({})" ), + GetLastError() ) + }; + } + + return file_descriptor; +} + + //! Get file meta. template < typename META > +[[nodiscard]] META get_file_meta( file_descriptor_t fd ) { diff --git a/third_party/restinio-v.0.7.0/dev/restinio/settings.hpp b/third_party/restinio-v.0.7.4/dev/restinio/settings.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/settings.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/settings.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/so5/so_timer_manager.hpp b/third_party/restinio-v.0.7.4/dev/restinio/so5/so_timer_manager.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/so5/so_timer_manager.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/so5/so_timer_manager.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/string_view.hpp b/third_party/restinio-v.0.7.4/dev/restinio/string_view.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/string_view.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/string_view.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sync_chain/fixed_size.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sync_chain/fixed_size.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/sync_chain/fixed_size.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sync_chain/fixed_size.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/sync_chain/growable_size.hpp b/third_party/restinio-v.0.7.4/dev/restinio/sync_chain/growable_size.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/sync_chain/growable_size.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/sync_chain/growable_size.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/tcp_connection_ctx_base.hpp b/third_party/restinio-v.0.7.4/dev/restinio/tcp_connection_ctx_base.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/tcp_connection_ctx_base.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/tcp_connection_ctx_base.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/timer_common.hpp b/third_party/restinio-v.0.7.4/dev/restinio/timer_common.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/timer_common.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/timer_common.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/tls.hpp b/third_party/restinio-v.0.7.4/dev/restinio/tls.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/tls.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/tls.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/tls_fwd.hpp b/third_party/restinio-v.0.7.4/dev/restinio/tls_fwd.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/tls_fwd.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/tls_fwd.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/traits.hpp b/third_party/restinio-v.0.7.4/dev/restinio/traits.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/traits.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/traits.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/transforms/zlib.hpp b/third_party/restinio-v.0.7.4/dev/restinio/transforms/zlib.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/transforms/zlib.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/transforms/zlib.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/uri_helpers.hpp b/third_party/restinio-v.0.7.4/dev/restinio/uri_helpers.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/uri_helpers.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/uri_helpers.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/at_scope_exit.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/at_scope_exit.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/at_scope_exit.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/at_scope_exit.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/base64.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/base64.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/base64.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/base64.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/base64_lut.ipp b/third_party/restinio-v.0.7.4/dev/restinio/utils/base64_lut.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/base64_lut.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/base64_lut.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/from_string.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/from_string.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/from_string.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/from_string.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/from_string_details.ipp b/third_party/restinio-v.0.7.4/dev/restinio/utils/from_string_details.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/from_string_details.ipp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/from_string_details.ipp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/impl/bitops.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/impl/bitops.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/impl/bitops.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/impl/bitops.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/impl/safe_uint_truncate.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/impl/safe_uint_truncate.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/impl/safe_uint_truncate.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/impl/safe_uint_truncate.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/metaprogramming.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/metaprogramming.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/metaprogramming.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/metaprogramming.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/percent_encoding.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/percent_encoding.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/percent_encoding.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/percent_encoding.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/sha1.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/sha1.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/sha1.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/sha1.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/suppress_exceptions.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/suppress_exceptions.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/suppress_exceptions.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/suppress_exceptions.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/tagged_scalar.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/tagged_scalar.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/tagged_scalar.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/tagged_scalar.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/tuple_algorithms.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/tuple_algorithms.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/tuple_algorithms.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/tuple_algorithms.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/utils/utf8_checker.hpp b/third_party/restinio-v.0.7.4/dev/restinio/utils/utf8_checker.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/utils/utf8_checker.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/utils/utf8_checker.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/value_or.hpp b/third_party/restinio-v.0.7.4/dev/restinio/value_or.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/value_or.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/value_or.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/version.cmake b/third_party/restinio-v.0.7.4/dev/restinio/version.cmake similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/version.cmake rename to third_party/restinio-v.0.7.4/dev/restinio/version.cmake diff --git a/third_party/restinio-v.0.7.0/dev/restinio/version.hpp b/third_party/restinio-v.0.7.4/dev/restinio/version.hpp similarity index 95% rename from third_party/restinio-v.0.7.0/dev/restinio/version.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/version.hpp index 2748c02..4edbe17 100644 --- a/third_party/restinio-v.0.7.0/dev/restinio/version.hpp +++ b/third_party/restinio-v.0.7.4/dev/restinio/version.hpp @@ -11,7 +11,7 @@ #pragma once -// The current version is 0.7.0 +// The current version is 0.7.4 // /*! * The major part of version number. @@ -33,7 +33,7 @@ * * If RESTinio's version is 0.6.23 then RESTINIO_VERSION_PATCH==23. */ -#define RESTINIO_VERSION_PATCH 0ull +#define RESTINIO_VERSION_PATCH 4ull /*! * Helper macro for make single number representation of RESTinio's version. diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/utf8.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/utf8.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/utf8.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/utf8.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_connection.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_connection.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_connection.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_connection.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_connection_base.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_connection_base.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_connection_base.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_connection_base.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_parser.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_parser.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_parser.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_parser.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_protocol_validator.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_protocol_validator.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/impl/ws_protocol_validator.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/impl/ws_protocol_validator.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/message.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/message.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/message.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/message.hpp diff --git a/third_party/restinio-v.0.7.0/dev/restinio/websocket/websocket.hpp b/third_party/restinio-v.0.7.4/dev/restinio/websocket/websocket.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/restinio/websocket/websocket.hpp rename to third_party/restinio-v.0.7.4/dev/restinio/websocket/websocket.hpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/CMakeLists.txt new file mode 100644 index 0000000..5cc7fe9 --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SAMPLE sample.async_chained_handlers) +include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${SAMPLE} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${SAMPLE} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/async_chained_handlers/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/async_chained_handlers/main.cpp diff --git a/third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt new file mode 100644 index 0000000..8e22e90 --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SAMPLE sample.async_handling_with_sobjectizer) +include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${SAMPLE} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${SAMPLE} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/async_handling_with_sobjectizer/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/async_handling_with_sobjectizer/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/chained_handlers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/chained_handlers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/chained_handlers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/chained_handlers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/chained_handlers/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/chained_handlers/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/chained_handlers/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/chained_handlers/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/compression/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/compression/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/compression/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/compression/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/compression/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/compression/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/compression/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/compression/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/connection_state/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/connection_state/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/connection_state/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/connection_state/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/connection_state/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/connection_state/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/connection_state/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/connection_state/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/custom_buffer/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/custom_buffer/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/custom_buffer/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/custom_buffer/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/custom_buffer/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/custom_buffer/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/custom_buffer/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/custom_buffer/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/decompression/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/decompression/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/decompression/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/decompression/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/decompression/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/decompression/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/decompression/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/decompression/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/decompression/test_decompression.sh b/third_party/restinio-v.0.7.4/dev/sample/decompression/test_decompression.sh similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/decompression/test_decompression.sh rename to third_party/restinio-v.0.7.4/dev/sample/decompression/test_decompression.sh diff --git a/third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/curl_examples.txt b/third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/curl_examples.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/curl_examples.txt rename to third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/curl_examples.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/new_book_1.txt b/third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/new_book_1.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/new_book_1.txt rename to third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/new_book_1.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/new_book_2.txt b/third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/new_book_2.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/easy_parser_router/new_book_2.txt rename to third_party/restinio-v.0.7.4/dev/sample/easy_parser_router/new_book_2.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/express_router/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/express_router/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router/curl_examples.txt b/third_party/restinio-v.0.7.4/dev/sample/express_router/curl_examples.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router/curl_examples.txt rename to third_party/restinio-v.0.7.4/dev/sample/express_router/curl_examples.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/express_router/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/express_router/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router/new_book_1.txt b/third_party/restinio-v.0.7.4/dev/sample/express_router/new_book_1.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router/new_book_1.txt rename to third_party/restinio-v.0.7.4/dev/sample/express_router/new_book_1.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router/new_book_2.txt b/third_party/restinio-v.0.7.4/dev/sample/express_router/new_book_2.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router/new_book_2.txt rename to third_party/restinio-v.0.7.4/dev/sample/express_router/new_book_2.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router_tutorial/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/express_router_tutorial/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router_tutorial/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/express_router_tutorial/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/express_router_tutorial/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/express_router_tutorial/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/express_router_tutorial/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/express_router_tutorial/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/extra_data_factory/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/extra_data_factory/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/extra_data_factory/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/extra_data_factory/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/extra_data_factory/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/extra_data_factory/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/extra_data_factory/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/extra_data_factory/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/file_upload/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/file_upload/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/file_upload/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/file_upload/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/file_upload/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/file_upload/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/file_upload/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/file_upload/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_basic/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_basic/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_basic/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_basic/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_basic/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_basic/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_basic/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_basic/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_delayed/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_delayed/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_delayed/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_delayed/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_delayed/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_delayed/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_delayed/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_delayed/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_https/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_https/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_https/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_https/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_https/dh2048.pem b/third_party/restinio-v.0.7.4/dev/sample/hello_world_https/dh2048.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_https/dh2048.pem rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_https/dh2048.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_https/key.pem b/third_party/restinio-v.0.7.4/dev/sample/hello_world_https/key.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_https/key.pem rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_https/key.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_https/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_https/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_https/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_https/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_https/server.pem b/third_party/restinio-v.0.7.4/dev/sample/hello_world_https/server.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_https/server.pem rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_https/server.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_minimal/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_minimal/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_minimal/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_minimal/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_minimal/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_minimal/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_minimal/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_minimal/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_https/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_https/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_https/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_https/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_https/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_https/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_https/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_https/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_w32_unicode/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_w32_unicode/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_w32_unicode/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_w32_unicode/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_w32_unicode/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_w32_unicode/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/hello_world_sendfile_w32_unicode/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/hello_world_sendfile_w32_unicode/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/ip_blocker/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/ip_blocker/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/ip_blocker/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/ip_blocker/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/ip_blocker/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/ip_blocker/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/ip_blocker/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/ip_blocker/main.cpp diff --git a/third_party/restinio-v.0.7.4/dev/sample/notificators/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/notificators/CMakeLists.txt new file mode 100644 index 0000000..3d980f7 --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/sample/notificators/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SAMPLE sample.notificators) +include(${CMAKE_SOURCE_DIR}/cmake/sample.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${SAMPLE} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${SAMPLE} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/sample/notificators/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/notificators/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/notificators/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/notificators/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/query_string_params/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/query_string_params/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/query_string_params/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/query_string_params/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/query_string_params/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/query_string_params/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/query_string_params/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/query_string_params/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/run_existing_server/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/run_existing_server/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/run_existing_server/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/run_existing_server/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/run_existing_server/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/run_existing_server/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/run_existing_server/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/run_existing_server/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/run_for_minute/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/run_for_minute/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/run_for_minute/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/run_for_minute/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/run_for_minute/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/run_for_minute/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/run_for_minute/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/run_for_minute/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/samples.dox b/third_party/restinio-v.0.7.4/dev/sample/samples.dox similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/samples.dox rename to third_party/restinio-v.0.7.4/dev/sample/samples.dox diff --git a/third_party/restinio-v.0.7.0/dev/sample/sendfiles/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/sendfiles/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/sendfiles/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/sendfiles/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/sendfiles/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/sendfiles/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/sendfiles/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/sendfiles/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/dh2048.pem b/third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/dh2048.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/dh2048.pem rename to third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/dh2048.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/key.pem b/third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/key.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/key.pem rename to third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/key.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/server.pem b/third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/server.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/shared_tls_context/server.pem rename to third_party/restinio-v.0.7.4/dev/sample/shared_tls_context/server.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/README.md b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/README.md similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/README.md rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/README.md diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/alice.cer b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/alice.cer similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/alice.cer rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/alice.cer diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/alice.key b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/alice.key similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/alice.key rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/alice.key diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/bob.cer b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/bob.cer similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/bob.cer rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/bob.cer diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/bob.key b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/bob.key similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/bob.key rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/bob.key diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.cer b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.cer similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.cer rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.cer diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.key b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.key similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.key rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.key diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.key.passphrase b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.key.passphrase similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/ca.key.passphrase rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/ca.key.passphrase diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/dh2048.pem b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/dh2048.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/dh2048.pem rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/dh2048.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/server.cer b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/server.cer similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/server.cer rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/server.cer diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/server.key b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/server.key similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/certs/server.key rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/certs/server.key diff --git a/third_party/restinio-v.0.7.0/dev/sample/tls_inspector/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/tls_inspector/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/tls_inspector/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/tls_inspector/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/try_parse_query_string/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/try_parse_query_string/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/try_parse_query_string/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/try_parse_query_string/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/try_parse_query_string/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/try_parse_query_string/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/try_parse_query_string/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/try_parse_query_string/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/using_external_io_context/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/using_external_io_context/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/using_external_io_context/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/using_external_io_context/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/using_external_io_context/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/using_external_io_context/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/using_external_io_context/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/using_external_io_context/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/websocket/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/websocket/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/websocket/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/websocket/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_detailed/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/websocket_detailed/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_detailed/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/websocket_detailed/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_detailed/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/websocket_detailed/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_detailed/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/websocket_detailed/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_wss/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/sample/websocket_wss/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_wss/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/sample/websocket_wss/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_wss/main.cpp b/third_party/restinio-v.0.7.4/dev/sample/websocket_wss/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_wss/main.cpp rename to third_party/restinio-v.0.7.4/dev/sample/websocket_wss/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_dh2048.pem b/third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_dh2048.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_dh2048.pem rename to third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_dh2048.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_key.pem b/third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_key.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_key.pem rename to third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_key.pem diff --git a/third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_server.pem b/third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_server.pem similarity index 100% rename from third_party/restinio-v.0.7.0/dev/sample/websocket_wss/wss_server.pem rename to third_party/restinio-v.0.7.4/dev/sample/websocket_wss/wss_server.pem diff --git a/third_party/restinio-v.0.7.0/dev/test/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/basic_auth/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/basic_auth/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/basic_auth/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/basic_auth/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/basic_auth/main.cpp b/third_party/restinio-v.0.7.4/dev/test/basic_auth/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/basic_auth/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/basic_auth/main.cpp index eb7ad5e..e5dc60e 100644 --- a/third_party/restinio-v.0.7.0/dev/test/basic_auth/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/basic_auth/main.cpp @@ -16,7 +16,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/bearer_auth/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/bearer_auth/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/bearer_auth/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/bearer_auth/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/bearer_auth/main.cpp b/third_party/restinio-v.0.7.4/dev/test/bearer_auth/main.cpp similarity index 98% rename from third_party/restinio-v.0.7.0/dev/test/bearer_auth/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/bearer_auth/main.cpp index 038bdd4..116407e 100644 --- a/third_party/restinio-v.0.7.0/dev/test/bearer_auth/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/bearer_auth/main.cpp @@ -15,7 +15,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/buffers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/buffers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/buffers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/buffers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/buffers/main.cpp b/third_party/restinio-v.0.7.4/dev/test/buffers/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/buffers/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/buffers/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/dummy_connection.hpp b/third_party/restinio-v.0.7.4/dev/test/common/dummy_connection.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/dummy_connection.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/dummy_connection.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/fake_connection.ipp b/third_party/restinio-v.0.7.4/dev/test/common/fake_connection.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/fake_connection.ipp rename to third_party/restinio-v.0.7.4/dev/test/common/fake_connection.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/pub.hpp b/third_party/restinio-v.0.7.4/dev/test/common/pub.hpp similarity index 97% rename from third_party/restinio-v.0.7.0/dev/test/common/pub.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/pub.hpp index 23d21bb..090af23 100644 --- a/third_party/restinio-v.0.7.0/dev/test/common/pub.hpp +++ b/third_party/restinio-v.0.7.4/dev/test/common/pub.hpp @@ -40,7 +40,7 @@ do_with_socket( socket.connect( restinio::asio_ns::ip::tcp::endpoint{ - restinio::asio_ns::ip::address::from_string( str_addr ), + restinio::asio_ns::ip::make_address( str_addr ), port } ); diff --git a/third_party/restinio-v.0.7.0/dev/test/common/request_handler_pool.hpp b/third_party/restinio-v.0.7.4/dev/test/common/request_handler_pool.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/request_handler_pool.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/request_handler_pool.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/test_extra_data_factory.ipp b/third_party/restinio-v.0.7.4/dev/test/common/test_extra_data_factory.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/test_extra_data_factory.ipp rename to third_party/restinio-v.0.7.4/dev/test/common/test_extra_data_factory.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/thread_safe_queue.hpp b/third_party/restinio-v.0.7.4/dev/test/common/thread_safe_queue.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/thread_safe_queue.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/thread_safe_queue.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/time_limited_execution.hpp b/third_party/restinio-v.0.7.4/dev/test/common/time_limited_execution.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/time_limited_execution.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/time_limited_execution.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/common/utest_logger.hpp b/third_party/restinio-v.0.7.4/dev/test/common/utest_logger.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/common/utest_logger.hpp rename to third_party/restinio-v.0.7.4/dev/test/common/utest_logger.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/default_constructed_settings/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/default_constructed_settings/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/default_constructed_settings/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/default_constructed_settings/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/default_constructed_settings/main.cpp b/third_party/restinio-v.0.7.4/dev/test/default_constructed_settings/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/default_constructed_settings/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/default_constructed_settings/main.cpp index 90582c5..7116083 100644 --- a/third_party/restinio-v.0.7.0/dev/test/default_constructed_settings/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/default_constructed_settings/main.cpp @@ -291,7 +291,7 @@ TEST_CASE( "Acceptor options" , "[settings][acceptor_options]" ) acceptor_option_setter = s.acceptor_options_setter(); - asio_ns::io_service io_svc; + asio_ns::io_context io_svc; asio_ns::ip::tcp::acceptor dummy_acceptor{ io_svc }; restinio::acceptor_options_t acceptor_options{ dummy_acceptor }; @@ -318,7 +318,7 @@ TEST_CASE( "Socket options" , "[settings][socket_options]" ) socket_option_setter = s.socket_options_setter(); - asio_ns::io_service io_svc; + asio_ns::io_context io_svc; asio_ns::ip::tcp::socket dummy_socket{ io_svc }; restinio::socket_options_t socket_options{ dummy_socket }; diff --git a/third_party/restinio-v.0.7.0/dev/test/encoders/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/encoders/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/encoders/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/encoders/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/encoders/main.cpp b/third_party/restinio-v.0.7.4/dev/test/encoders/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/encoders/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/encoders/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/file_upload/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/file_upload/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/file_upload/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/file_upload/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/file_upload/main.cpp b/third_party/restinio-v.0.7.4/dev/test/file_upload/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/file_upload/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/file_upload/main.cpp index 21e4a26..37b4fd3 100644 --- a/third_party/restinio-v.0.7.0/dev/test/file_upload/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/file_upload/main.cpp @@ -15,7 +15,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/from_string/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/from_string/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/from_string/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/from_string/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/from_string/main.cpp b/third_party/restinio-v.0.7.4/dev/test/from_string/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/from_string/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/from_string/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/from_string_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/from_string_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/from_string_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/from_string_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/acceptor_post_bind_hook/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/acceptor_post_bind_hook/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/acceptor_post_bind_hook/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/acceptor_post_bind_hook/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/acceptor_post_bind_hook/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/acceptor_post_bind_hook/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/acceptor_post_bind_hook/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/acceptor_post_bind_hook/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_1/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_1/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_1/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_1/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_1/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_1/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_1/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_1/main.cpp diff --git a/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt new file mode 100644 index 0000000..a79edbf --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/CMakeLists.txt @@ -0,0 +1,8 @@ +set(UNITTEST _unit.test.handle_requests.async_chained_handlers_2) +include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${UNITTEST} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${UNITTEST} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/async_chained_handlers_2/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/async_chained_handlers_2/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_input/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_input/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_input/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_input/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_input/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_input/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_input/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_input/main.cpp index 140f9ac..88198ba 100644 --- a/third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_input/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_input/main.cpp @@ -4,6 +4,8 @@ #include +#include + #include #include diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_output/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_output/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_output/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_output/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_output/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_output/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/chunked_output/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/chunked_output/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_count_limit/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_count_limit/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_count_limit/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_count_limit/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_count_limit/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_count_limit/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_count_limit/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_count_limit/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_state/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_state/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_state/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_state/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_state/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_state/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/connection_state/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/connection_state/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/echo_body/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/echo_body/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/echo_body/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/echo_body/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/echo_body/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/echo_body/main.cpp similarity index 98% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/echo_body/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/echo_body/main.cpp index aecfaa1..b26877e 100644 --- a/third_party/restinio-v.0.7.0/dev/test/handle_requests/echo_body/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/handle_requests/echo_body/main.cpp @@ -116,7 +116,7 @@ perform_test() [&request_handler]( auto & settings ){ settings .port( utest_default_port() ) - .address( restinio::asio_ns::ip::address::from_string( "127.0.0.1" ) ) + .address( restinio::asio_ns::ip::make_address( "127.0.0.1" ) ) .request_handler( request_handler ); } }; diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/incoming_msg_limits/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/incoming_msg_limits/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/incoming_msg_limits/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/incoming_msg_limits/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/incoming_msg_limits/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/incoming_msg_limits/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/incoming_msg_limits/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/incoming_msg_limits/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/ip_blocker/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/ip_blocker/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/ip_blocker/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/ip_blocker/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/ip_blocker/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/ip_blocker/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/ip_blocker/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/ip_blocker/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/method/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/method/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/method/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/method/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/method/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/method/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/method/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/method/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/notificators/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/notificators/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/notificators/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/notificators/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/notificators/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/notificators/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/notificators/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/notificators/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/const_buffer.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/const_buffer.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/const_buffer.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/const_buffer.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/shared_ptr_std_string.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/shared_ptr_std_string.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/shared_ptr_std_string.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/shared_ptr_std_string.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/std_string.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/std_string.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/output_and_buffers/std_string.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/output_and_buffers/std_string.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/remote_endpoint/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/remote_endpoint/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/remote_endpoint/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/remote_endpoint/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/remote_endpoint/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/remote_endpoint/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/remote_endpoint/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/remote_endpoint/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/slow_transmit/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/slow_transmit/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/slow_transmit/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/slow_transmit/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/slow_transmit/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/slow_transmit/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/slow_transmit/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/slow_transmit/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/sync_chained_handlers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/sync_chained_handlers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/sync_chained_handlers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/sync_chained_handlers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/sync_chained_handlers/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/sync_chained_handlers/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/sync_chained_handlers/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/sync_chained_handlers/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/throw_exception/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/throw_exception/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/throw_exception/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/throw_exception/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/throw_exception/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/throw_exception/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/throw_exception/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/throw_exception/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/timeouts/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/timeouts/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/timeouts/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/timeouts/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/timeouts/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/timeouts/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/timeouts/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/timeouts/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/upgrade/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/upgrade/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/upgrade/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/upgrade/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/upgrade/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/upgrade/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/upgrade/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/upgrade/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/user_controlled_output/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/user_controlled_output/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/user_controlled_output/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/user_controlled_output/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/user_controlled_output/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/user_controlled_output/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/user_controlled_output/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/user_controlled_output/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/user_data_simple/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/handle_requests/user_data_simple/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/user_data_simple/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/user_data_simple/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/handle_requests/user_data_simple/main.cpp b/third_party/restinio-v.0.7.4/dev/test/handle_requests/user_data_simple/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/handle_requests/user_data_simple/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/handle_requests/user_data_simple/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/header/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/header/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/header/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/header/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/header/main.cpp b/third_party/restinio-v.0.7.4/dev/test/header/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/header/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/header/main.cpp index 582433a..eb8401a 100644 --- a/third_party/restinio-v.0.7.0/dev/test/header/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/header/main.cpp @@ -10,6 +10,8 @@ #include #include +#include +#include #include @@ -713,6 +715,24 @@ TEST_CASE( "working with response header" , "[header][response]" ) h.status_code( restinio::status_code::not_found ); REQUIRE( restinio::status_code::not_found == h.status_code() ); + + { + std::ostringstream ss; + ss << h.status_code(); + + const std::string expected{ "404" }; + + REQUIRE( expected == ss.str() ); + } + + { + std::wostringstream wss; + wss << h.status_code(); + + const std::wstring expected{ L"404" }; + + REQUIRE( expected == wss.str() ); + } } SECTION( "request target" ) diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-charset.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-charset.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-charset.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-charset.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-encoding.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-encoding.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-encoding.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-encoding.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-language.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-language.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept-language.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept-language.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/accept.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/accept.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/authorization.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/authorization.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/authorization.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/authorization.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/basics.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/basics.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/basics.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/basics.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/cache-control.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/cache-control.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/cache-control.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/cache-control.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/connection.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/connection.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/connection.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/connection.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-disposition.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-disposition.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-disposition.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-disposition.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-encoding.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-encoding.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-encoding.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-encoding.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-type.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-type.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/content-type.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/content-type.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/host.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/host.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/host.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/host.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/media-type.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/media-type.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/media-type.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/media-type.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/range.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/range.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/range.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/range.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/transfer-encoding.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/transfer-encoding.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/transfer-encoding.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/transfer-encoding.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_field_parser/user-agent.cpp b/third_party/restinio-v.0.7.4/dev/test/http_field_parser/user-agent.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_field_parser/user-agent.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_field_parser/user-agent.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_pipelining/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/http_pipelining/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_pipelining/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/http_pipelining/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/http_pipelining/sequence/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/http_pipelining/sequence/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_pipelining/sequence/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/http_pipelining/sequence/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/http_pipelining/sequence/main.cpp b/third_party/restinio-v.0.7.4/dev/test/http_pipelining/sequence/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_pipelining/sequence/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_pipelining/sequence/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/http_pipelining/timeouts/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/http_pipelining/timeouts/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_pipelining/timeouts/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/http_pipelining/timeouts/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/http_pipelining/timeouts/main.cpp b/third_party/restinio-v.0.7.4/dev/test/http_pipelining/timeouts/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/http_pipelining/timeouts/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/http_pipelining/timeouts/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/metaprogramming/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/metaprogramming/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/metaprogramming/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/metaprogramming/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/metaprogramming/main.cpp b/third_party/restinio-v.0.7.4/dev/test/metaprogramming/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/metaprogramming/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/metaprogramming/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/multipart_body/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/multipart_body/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/multipart_body/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/multipart_body/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/multipart_body/http_field_parser/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/multipart_body/http_field_parser/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/multipart_body/http_field_parser/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/multipart_body/http_field_parser/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/multipart_body/http_field_parser/main.cpp b/third_party/restinio-v.0.7.4/dev/test/multipart_body/http_field_parser/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/multipart_body/http_field_parser/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/multipart_body/http_field_parser/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/multipart_body/main.cpp b/third_party/restinio-v.0.7.4/dev/test/multipart_body/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/multipart_body/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/multipart_body/main.cpp index 460523d..fb52f7a 100644 --- a/third_party/restinio-v.0.7.0/dev/test/multipart_body/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/multipart_body/main.cpp @@ -39,7 +39,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/ref_qualifiers_settings/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/ref_qualifiers_settings/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/ref_qualifiers_settings/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/ref_qualifiers_settings/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/ref_qualifiers_settings/main.cpp b/third_party/restinio-v.0.7.4/dev/test/ref_qualifiers_settings/main.cpp similarity index 98% rename from third_party/restinio-v.0.7.0/dev/test/ref_qualifiers_settings/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/ref_qualifiers_settings/main.cpp index 17272a0..0af83ce 100644 --- a/third_party/restinio-v.0.7.0/dev/test/ref_qualifiers_settings/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/ref_qualifiers_settings/main.cpp @@ -145,7 +145,7 @@ TEST_CASE( "Ref-qualifiers" , "[settings][ref_qualifiers]" ) { auto acceptor_option_setter = settings.acceptor_options_setter(); - restinio::asio_ns::io_service io_svc; + restinio::asio_ns::io_context io_svc; restinio::asio_ns::ip::tcp::acceptor dummy_acceptor{ io_svc }; restinio::acceptor_options_t acceptor_options{ dummy_acceptor }; @@ -158,7 +158,7 @@ TEST_CASE( "Ref-qualifiers" , "[settings][ref_qualifiers]" ) { auto socket_option_setter = settings.socket_options_setter(); - restinio::asio_ns::io_service io_svc; + restinio::asio_ns::io_context io_svc; restinio::asio_ns::ip::tcp::socket dummy_socket{ io_svc }; restinio::socket_options_t socket_options{ dummy_socket }; diff --git a/third_party/restinio-v.0.7.0/dev/test/response_coordinator/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/response_coordinator/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/response_coordinator/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/response_coordinator/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/response_coordinator/main.cpp b/third_party/restinio-v.0.7.4/dev/test/response_coordinator/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/response_coordinator/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/response_coordinator/main.cpp index 637c5bc..023a205 100644 --- a/third_party/restinio-v.0.7.0/dev/test/response_coordinator/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/response_coordinator/main.cpp @@ -33,7 +33,7 @@ make_string( const BUF & buf ) { return std::string{ - asio_ns::buffer_cast< const char * >( buf.buf() ), + static_cast< const char * >( buf.buf().data() ), asio_ns::buffer_size( buf.buf() ) }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/router/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/route_parser.cpp b/third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/route_parser.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/route_parser.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/route_parser.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/route_parser.hpp b/third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/route_parser.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/cmp_router_bench/route_parser.hpp rename to third_party/restinio-v.0.7.4/dev/test/router/cmp_router_bench/route_parser.hpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_params/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_params/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_params/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_params/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_params/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_params/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_params/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_params/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_tuple/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_tuple/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_tuple/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_tuple/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_tuple/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_tuple/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_path_to_tuple/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_path_to_tuple/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_dsl/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_dsl/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_dsl/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_dsl/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_dsl/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_dsl/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/easy_parser_router_dsl/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/easy_parser_router_dsl/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/additional_tests.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/additional_tests.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/additional_tests.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/additional_tests.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part1.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part1.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part1.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part1.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part2.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part2.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part2.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part2.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part3.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part3.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part3.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part3.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part4.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part4.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part4.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part4.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part5.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part5.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/original_tests_part5.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/original_tests_part5.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/part1.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/part1.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/part1.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/part1.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/part2.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/part2.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/part2.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/part2.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/part3.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/part3.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/part3.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/part3.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/part4.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/part4.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/part4.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/part4.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/part5.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express/part5.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/part5.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express/part5.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express/usings.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express/usings.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express/usings.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express/usings.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part1.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part1.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part1.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part1.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part2.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part2.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part2.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part2.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part3.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part3.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part3.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part3.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part4.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part4.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part4.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part4.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part5.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part5.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/part5.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/part5.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/usings.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/usings.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_boost_regex/usings.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express_boost_regex/usings.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part1.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part1.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part1.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part1.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part2.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part2.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part2.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part2.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part3.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part3.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part3.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part3.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part4.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part4.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part4.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part4.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part5.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part5.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/part5.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/part5.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre/usings.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre/usings.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre/usings.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre/usings.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part1.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part1.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part1.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part1.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part2.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part2.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part2.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part2.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part3.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part3.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part3.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part3.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part4.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part4.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part4.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part4.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part5.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part5.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/part5.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/part5.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/usings.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/usings.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_pcre2/usings.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express_pcre2/usings.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router/tests.ipp b/third_party/restinio-v.0.7.4/dev/test/router/express_router/tests.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router/tests.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router/tests.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/cmp_routes.lua b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/cmp_routes.lua similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/cmp_routes.lua rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/cmp_routes.lua diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/cmp_routes.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/cmp_routes.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/cmp_routes.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/cmp_routes.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/many_routes.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/many_routes.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/many_routes.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/many_routes.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/simple.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/simple.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_bench/simple.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_bench/simple.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_boost_regex_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_boost_regex_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre2_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre2_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre_bench/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre_bench/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre_bench/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre_bench/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_pcre_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_pcre_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_user_data_simple/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/router/express_router_user_data_simple/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_user_data_simple/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_user_data_simple/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/router/express_router_user_data_simple/main.cpp b/third_party/restinio-v.0.7.4/dev/test/router/express_router_user_data_simple/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/express_router_user_data_simple/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/router/express_router_user_data_simple/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/router/fake_connection_and_request.ipp b/third_party/restinio-v.0.7.4/dev/test/router/fake_connection_and_request.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/router/fake_connection_and_request.ipp rename to third_party/restinio-v.0.7.4/dev/test/router/fake_connection_and_request.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/run_on_thread_pool/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/run_on_thread_pool/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/run_on_thread_pool/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/run_on_thread_pool/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/run_on_thread_pool/main.cpp b/third_party/restinio-v.0.7.4/dev/test/run_on_thread_pool/main.cpp similarity index 97% rename from third_party/restinio-v.0.7.0/dev/test/run_on_thread_pool/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/run_on_thread_pool/main.cpp index 2d1df52..527f532 100644 --- a/third_party/restinio-v.0.7.0/dev/test/run_on_thread_pool/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/run_on_thread_pool/main.cpp @@ -92,9 +92,11 @@ TEST_CASE( "on thread pool with break signals" , "[with_break_signal]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { - started.set_value(); - } ); + restinio::asio_ns::post( + http_server.io_context(), + [&started] { + started.set_value(); + } ); started.get_future().get(); std::string response; @@ -160,7 +162,9 @@ TEST_CASE( "on thread pool without break signals" , "[without_break_signal]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { + restinio::asio_ns::post( + http_server.io_context(), + [&started] { started.set_value(); } ); started.get_future().get(); @@ -228,7 +232,9 @@ TEST_CASE( "server on thread pool runner" , "[on_pool_runner]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { + restinio::asio_ns::post( + http_server.io_context(), + [&started] { started.set_value(); } ); started.get_future().get(); diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/.gitattributes b/third_party/restinio-v.0.7.4/dev/test/sendfile/.gitattributes similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/.gitattributes rename to third_party/restinio-v.0.7.4/dev/test/sendfile/.gitattributes diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/sendfile/CMakeLists.txt similarity index 74% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/sendfile/CMakeLists.txt index d0ef674..e7ad1f5 100644 --- a/third_party/restinio-v.0.7.0/dev/test/sendfile/CMakeLists.txt +++ b/third_party/restinio-v.0.7.4/dev/test/sendfile/CMakeLists.txt @@ -7,3 +7,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f2.dat ${CMAKE_CURRENT_BINARY_DIR}/test/sendfile/f2.dat COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f3.dat ${CMAKE_CURRENT_BINARY_DIR}/test/sendfile/f3.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Привет-你好.dat + ${CMAKE_CURRENT_BINARY_DIR}/test/sendfile/Привет-你好.dat COPYONLY) diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/f1.dat b/third_party/restinio-v.0.7.4/dev/test/sendfile/f1.dat similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/f1.dat rename to third_party/restinio-v.0.7.4/dev/test/sendfile/f1.dat diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/f2.dat b/third_party/restinio-v.0.7.4/dev/test/sendfile/f2.dat similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/f2.dat rename to third_party/restinio-v.0.7.4/dev/test/sendfile/f2.dat diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/f3.dat b/third_party/restinio-v.0.7.4/dev/test/sendfile/f3.dat similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/f3.dat rename to third_party/restinio-v.0.7.4/dev/test/sendfile/f3.dat diff --git a/third_party/restinio-v.0.7.0/dev/test/sendfile/main.cpp b/third_party/restinio-v.0.7.4/dev/test/sendfile/main.cpp similarity index 91% rename from third_party/restinio-v.0.7.0/dev/test/sendfile/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/sendfile/main.cpp index c4935fe..4fd6201 100644 --- a/third_party/restinio-v.0.7.0/dev/test/sendfile/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/sendfile/main.cpp @@ -15,8 +15,8 @@ #include #include -using logger_to_use_t = restinio::null_logger_t; -//using logger_to_use_t = utest_logger_t; +//using logger_to_use_t = restinio::null_logger_t; +using logger_to_use_t = utest_logger_t; TEST_CASE( "sendfile offset/size representation" , "[sendfile]" ) { @@ -81,6 +81,67 @@ TEST_CASE( "simple sendfile" , "[sendfile]" ) other_thread.stop_and_join(); } +TEST_CASE( "simple sendfile with std::filesystem::path" , "[sendfile][std::filesystem::path]" ) +{ + using http_server_t = + restinio::http_server_t< + restinio::traits_t< + restinio::asio_timer_manager_t, + logger_to_use_t > >; + + http_server_t http_server{ + restinio::own_io_context(), + []( auto & settings ){ + settings + .port( utest_default_port() ) + .address( "127.0.0.1" ) + .request_handler( + []( auto req ){ + if( restinio::http_method_get() == req->header().method() ) + { +#if defined(_WIN32) || defined(__WIN32__) + std::wstring raw_name{ L"test/sendfile/Привет-你好.dat" }; + std::filesystem::path path{ raw_name }; +#else + std::filesystem::path path{ u"test/sendfile/Привет-你好.dat" }; +#endif + req->create_response() + .append_header( "Server", "RESTinio utest server" ) + .append_header_date_field() + .append_header( "Content-Type", "text/plain; charset=utf-8" ) + .set_body( restinio::sendfile( path ) ) + .done(); + return restinio::request_accepted(); + } + + return restinio::request_rejected(); + } ); + } + }; + + other_work_thread_for_server_t other_thread{ http_server }; + other_thread.run(); + + const std::string request{ + "GET / HTTP/1.0\r\n" + "From: unit-test\r\n" + "User-Agent: unit-test\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + "Connection: close\r\n" + "\r\n" + }; + std::string response; + + REQUIRE_NOTHROW( response = do_request( request ) ); + + REQUIRE_THAT( + response, + Catch::Matchers::EndsWith( + "1234567890" ) ); + + other_thread.stop_and_join(); +} + TEST_CASE( "sendfile the same file several times" , "[sendfile][same-several-times]" ) { using http_server_t = @@ -711,4 +772,3 @@ TEST_CASE( "sendfile with partially-read response" , other_thread.stop_and_join(); } - diff --git "a/third_party/restinio-v.0.7.4/dev/test/sendfile/\320\237\321\200\320\270\320\262\320\265\321\202-\344\275\240\345\245\275.dat" "b/third_party/restinio-v.0.7.4/dev/test/sendfile/\320\237\321\200\320\270\320\262\320\265\321\202-\344\275\240\345\245\275.dat" new file mode 100644 index 0000000..6a537b5 --- /dev/null +++ "b/third_party/restinio-v.0.7.4/dev/test/sendfile/\320\237\321\200\320\270\320\262\320\265\321\202-\344\275\240\345\245\275.dat" @@ -0,0 +1 @@ +1234567890 \ No newline at end of file diff --git a/third_party/restinio-v.0.7.0/dev/test/socket_options/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/socket_options/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/socket_options/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/socket_options/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/socket_options/main.cpp b/third_party/restinio-v.0.7.4/dev/test/socket_options/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/socket_options/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/socket_options/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/socket_options_tls/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/socket_options_tls/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/socket_options_tls/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/socket_options_tls/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/socket_options_tls/main.cpp b/third_party/restinio-v.0.7.4/dev/test/socket_options_tls/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/socket_options_tls/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/socket_options_tls/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/start_stop/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/start_stop/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/start_stop/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/start_stop/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/start_stop/main.cpp b/third_party/restinio-v.0.7.4/dev/test/start_stop/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/start_stop/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/start_stop/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/to_lower_bench/main.cpp b/third_party/restinio-v.0.7.4/dev/test/to_lower_bench/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/to_lower_bench/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/to_lower_bench/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/transforms/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/transforms/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/random_data_generators.ipp b/third_party/restinio-v.0.7.4/dev/test/transforms/random_data_generators.ipp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/random_data_generators.ipp rename to third_party/restinio-v.0.7.4/dev/test/transforms/random_data_generators.ipp diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib/main.cpp b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_appender/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_appender/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_appender/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_appender/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_appender/main.cpp b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_appender/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_appender/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_appender/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_handler/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_handler/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_handler/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_handler/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_handler/main.cpp b/third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_handler/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/transforms/zlib_body_handler/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/transforms/zlib_body_handler/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/try_parse_field/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/try_parse_field/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/try_parse_field/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/try_parse_field/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/try_parse_field/main.cpp b/third_party/restinio-v.0.7.4/dev/test/try_parse_field/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/try_parse_field/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/try_parse_field/main.cpp index c4ef23d..a864f04 100644 --- a/third_party/restinio-v.0.7.0/dev/test/try_parse_field/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/try_parse_field/main.cpp @@ -16,7 +16,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/third_party/restinio-v.0.7.0/dev/test/tuple_algorithms/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/tuple_algorithms/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/tuple_algorithms/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/tuple_algorithms/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/tuple_algorithms/main.cpp b/third_party/restinio-v.0.7.4/dev/test/tuple_algorithms/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/tuple_algorithms/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/tuple_algorithms/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/uri_helpers/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/uri_helpers/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/uri_helpers/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/uri_helpers/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/uri_helpers/main.cpp b/third_party/restinio-v.0.7.4/dev/test/uri_helpers/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/uri_helpers/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/uri_helpers/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/utf8_checker/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/utf8_checker/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/utf8_checker/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/utf8_checker/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/utf8_checker/main.cpp b/third_party/restinio-v.0.7.4/dev/test/utf8_checker/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/utf8_checker/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/utf8_checker/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/websocket/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/websocket/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/common/pub.hpp b/third_party/restinio-v.0.7.4/dev/test/websocket/common/pub.hpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/common/pub.hpp rename to third_party/restinio-v.0.7.4/dev/test/websocket/common/pub.hpp diff --git a/third_party/restinio-v.0.7.4/dev/test/websocket/notificators/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/websocket/notificators/CMakeLists.txt new file mode 100644 index 0000000..6ccaf8d --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/test/websocket/notificators/CMakeLists.txt @@ -0,0 +1,8 @@ +set(UNITTEST _unit.test.notificators) +include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${UNITTEST} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${UNITTEST} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/notificators/main.cpp b/third_party/restinio-v.0.7.4/dev/test/websocket/notificators/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/notificators/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/websocket/notificators/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/parser/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/websocket/parser/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/parser/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/websocket/parser/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/parser/main.cpp b/third_party/restinio-v.0.7.4/dev/test/websocket/parser/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/parser/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/websocket/parser/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/validators/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/websocket/validators/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/validators/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/websocket/validators/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/validators/main.cpp b/third_party/restinio-v.0.7.4/dev/test/websocket/validators/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/validators/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/websocket/validators/main.cpp diff --git a/third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/CMakeLists.txt new file mode 100644 index 0000000..b329571 --- /dev/null +++ b/third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/CMakeLists.txt @@ -0,0 +1,8 @@ +set(UNITTEST _unit.test.ws_connection) +include(${CMAKE_SOURCE_DIR}/cmake/unittest.cmake) + +if (RESTINIO_DEP_SOBJECTIZER STREQUAL "system") + target_compile_definitions(${UNITTEST} PRIVATE SO_5_STATIC_LIB) +endif() + +target_link_libraries(${UNITTEST} PRIVATE ${RESTINIO_SOBJECTIZER_LIB_LINK_NAME}) diff --git a/third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/main.cpp b/third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/main.cpp similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/websocket/ws_connection/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/websocket/ws_connection/main.cpp diff --git a/third_party/restinio-v.0.7.0/dev/test/write_group_output_ctx/CMakeLists.txt b/third_party/restinio-v.0.7.4/dev/test/write_group_output_ctx/CMakeLists.txt similarity index 100% rename from third_party/restinio-v.0.7.0/dev/test/write_group_output_ctx/CMakeLists.txt rename to third_party/restinio-v.0.7.4/dev/test/write_group_output_ctx/CMakeLists.txt diff --git a/third_party/restinio-v.0.7.0/dev/test/write_group_output_ctx/main.cpp b/third_party/restinio-v.0.7.4/dev/test/write_group_output_ctx/main.cpp similarity index 99% rename from third_party/restinio-v.0.7.0/dev/test/write_group_output_ctx/main.cpp rename to third_party/restinio-v.0.7.4/dev/test/write_group_output_ctx/main.cpp index 3b824e0..16a30ab 100644 --- a/third_party/restinio-v.0.7.0/dev/test/write_group_output_ctx/main.cpp +++ b/third_party/restinio-v.0.7.4/dev/test/write_group_output_ctx/main.cpp @@ -24,7 +24,7 @@ make_string( const asio_ns::const_buffer & buf ) { return std::string{ - asio_ns::buffer_cast< const char * >( buf ), + static_cast< const char * >( buf.data() ), asio_ns::buffer_size( buf ) }; } diff --git a/third_party/restinio-v.0.7.0/externals.rb b/third_party/restinio-v.0.7.4/externals.rb similarity index 77% rename from third_party/restinio-v.0.7.0/externals.rb rename to third_party/restinio-v.0.7.4/externals.rb index 6daf938..75f1d01 100644 --- a/third_party/restinio-v.0.7.0/externals.rb +++ b/third_party/restinio-v.0.7.4/externals.rb @@ -6,13 +6,13 @@ MxxRu::arch_externals :asio do |e| # e.url 'https://github.com/chriskohlhoff/asio/archive/asio-1-18-0.tar.gz' - e.url 'https://github.com/chriskohlhoff/asio/archive/asio-1-28-2.tar.gz' + e.url 'https://github.com/chriskohlhoff/asio/archive/asio-1-32-0.tar.gz' e.map_dir 'asio/include' => 'dev/asio' end MxxRu::arch_externals :llhttp do |e| - e.url 'https://github.com/nodejs/llhttp/archive/refs/tags/release/v9.1.3.tar.gz' + e.url 'https://github.com/nodejs/llhttp/archive/refs/tags/release/v9.2.1.tar.gz' e.map_dir 'include' => 'dev/nodejs/llhttp' e.map_dir 'src' => 'dev/nodejs/llhttp' @@ -21,26 +21,28 @@ end MxxRu::arch_externals :fmt do |e| - e.url 'https://github.com/fmtlib/fmt/archive/10.1.1.zip' + e.url 'https://github.com/fmtlib/fmt/archive/11.1.3.zip' e.map_dir 'include' => 'dev/fmt' e.map_dir 'src' => 'dev/fmt' e.map_dir 'support' => 'dev/fmt' e.map_file 'CMakeLists.txt' => 'dev/fmt/*' - e.map_file 'README.rst' => 'dev/fmt/*' - e.map_file 'ChangeLog.rst' => 'dev/fmt/*' + e.map_file 'README.md' => 'dev/fmt/*' + e.map_file 'ChangeLog.md' => 'dev/fmt/*' end MxxRu::arch_externals :expected_lite do |e| - e.url 'https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz' + e.url 'https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.8.0.tar.gz' e.map_dir 'include' => 'dev/expected-lite' e.map_dir 'cmake' => 'dev/expected-lite' e.map_file 'CMakeLists.txt' => 'dev/expected-lite/*' + e.map_file 'LICENSE.txt' => 'dev/expected-lite/*' + e.map_file 'README.md' => 'dev/expected-lite/*' end MxxRu::arch_externals :catch do |e| - e.url 'https://github.com/catchorg/Catch2/archive/refs/tags/v3.4.0.tar.gz' + e.url 'https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.1.tar.gz' e.map_dir 'src' => 'dev/catch2/' e.map_dir 'CMake' => 'dev/catch2/' From 3449495ff9a5e974d1be8514f67a1c9ed770a6c2 Mon Sep 17 00:00:00 2001 From: Microvenator Date: Sat, 22 Mar 2025 11:30:27 +0300 Subject: [PATCH 2/2] Update for version & C++ practice containers in config --- accomodation/build_rpm/Dockerfile | 2 +- accomodation/etc/watchman_cpp_config.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/accomodation/build_rpm/Dockerfile b/accomodation/build_rpm/Dockerfile index d1d1a89..f07f56a 100644 --- a/accomodation/build_rpm/Dockerfile +++ b/accomodation/build_rpm/Dockerfile @@ -8,6 +8,6 @@ RUN yum upgrade -y \ && yum install -y -q boost-devel zlib-devel curl-devel # env variable for spec file. watchman_cpp release version -ENV VERSION="1.0.3" +ENV VERSION="1.1.0" ENTRYPOINT sh /mnt/watchman_cpp/accomodation/build_rpm/build_rpm.sh diff --git a/accomodation/etc/watchman_cpp_config.json b/accomodation/etc/watchman_cpp_config.json index 273c979..5a088c0 100644 --- a/accomodation/etc/watchman_cpp_config.json +++ b/accomodation/etc/watchman_cpp_config.json @@ -49,6 +49,10 @@ "python": { "image-name": "senjun_python", "launched": 3 + }, + "cpp": { + "image-name": "senjun_cpp", + "launched": 3 } } }