diff --git a/.github/actions/install-boost/action.yml b/.github/actions/install-boost/action.yml index 39b3a0af4..6f918936d 100644 --- a/.github/actions/install-boost/action.yml +++ b/.github/actions/install-boost/action.yml @@ -43,8 +43,8 @@ runs: if: runner.os == 'macOS' shell: bash run: | - brew install boost@1.85 - echo "BOOST_ROOT=$(brew --prefix boost@1.85)" >> $GITHUB_OUTPUT + brew install boost + echo "BOOST_ROOT=$(brew --prefix boost)" >> $GITHUB_OUTPUT - name: Determine root id: determine-root diff --git a/vendor/foxy/include/foxy/detail/export_connect_fields.hpp b/vendor/foxy/include/foxy/detail/export_connect_fields.hpp index 0c1581743..f23103807 100644 --- a/vendor/foxy/include/foxy/detail/export_connect_fields.hpp +++ b/vendor/foxy/include/foxy/detail/export_connect_fields.hpp @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -88,6 +89,18 @@ launchdarkly::foxy::detail::export_connect_fields(boost::beast::http::basic_fiel // iterate the `src` fields, moving any connect headers and the corresponding tokens to the `dst` // fields // + // Boost 1.90 removed proxy_authentication_info, proxy_features, and + // proxy_instruction from boost::beast::http::field. +#if BOOST_VERSION >= 109000 + auto const hop_by_hops = std::array{http::field::connection, + http::field::keep_alive, + http::field::proxy_authenticate, + http::field::proxy_authorization, + http::field::proxy_connection, + http::field::te, + http::field::trailer, + http::field::transfer_encoding}; +#else auto const hop_by_hops = std::array{http::field::connection, http::field::keep_alive, http::field::proxy_authenticate, @@ -99,6 +112,7 @@ launchdarkly::foxy::detail::export_connect_fields(boost::beast::http::basic_fiel http::field::te, http::field::trailer, http::field::transfer_encoding}; +#endif auto const is_connect_opt = [&connect_opts,