Merge branch 'boostorg:develop' into zig-pkg

kassane · Feb 29, 2024 · d2bb344 · d2bb344
2 parents 09330f8 + 9d825d1
commit d2bb344
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,23 @@
+Version 353:
+
+* Fix unreachable code warning in `buffers_cat.hpp`
+* Fix zlib name conflicts
+* Status code list confirms with IANA registry
+* Add `const_iterator` to `buffers_adaptor::subrange`
+* Improve documentation
+
+--------------------------------------------------------------------------------
+
 Version 352:
 
-* Fixed paragraph separation issue in the documentation
-* Improved documentation for `http::message::prepare_payload()`
-* Strengthened the buffer contract on `flat_buffer` and `flat_static_buffer`
-* Added a non-allocating overload for the error category message function
-* Replaced internal uses of `beast::bind_front_handler` with `asio::prepend`
-* Specialized `asio::associator` for `bind_wrapper` and `bind_front_wrapper`
-* Fixed an infinite loop bug in `websocker_server_awaitable.cpp`
-* Fixed the write loop in advanced server examples
+* Fix paragraph separation issue in the documentation
+* Improve documentation for `http::message::prepare_payload()`
+* Strengthen the buffer contract on `flat_buffer` and `flat_static_buffer`
+* Add a non-allocating overload for the error category message function
+* Replace internal uses of `beast::bind_front_handler` with `asio::prepend`
+* Specialize `asio::associator` for `bind_wrapper` and `bind_front_wrapper`
+* Fix an infinite loop bug in `websocker_server_awaitable.cpp`
+* Fix the write loop in advanced server examples
 
 --------------------------------------------------------------------------------
 
@@ -21,21 +31,21 @@ Version 350:
 
 * Allocation and invocation hooks are removed
 * `detail::bind_default_executor` helper is removed
-* Improved documentation for `websocket::stream::async_write_some`
+* Improve documentation for `websocket::stream::async_write_some`
 
 --------------------------------------------------------------------------------
 
 Version 349:
 
-* Added support for `immediate_executor`
+* Add support for `immediate_executor`
 * `BOOST_ASIO_INITFN_AUTO_RES` replaces `BOOST_ASIO_INITFN_RESULT_TYPE`
-* Updated license info for `work_guard`
-* Corrected handler requirements of ping/pong
-* Improved Drone caching
+* Update license info for `work_guard`
+* Correct handler requirements of ping/pong
+* Improve Drone caching
 * `server-flex-awaitable` example now resets parser
 * OpenSSL 1.1.1.2100 or later is required for x86
 * GCC 5.0 or later is required
-* Introduced self-hosted GitHub actions runners
+* Introduce self-hosted GitHub actions runners
 * Minor documentation fixes and updates
 
 --------------------------------------------------------------------------------

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,11 +83,11 @@ endfunction()
 #
 #-------------------------------------------------------------------------------
 
-project (Beast VERSION 352)
+project (Beast VERSION 353)
 
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 option (Beast_BUILD_EXAMPLES "Build examples" ON)
-option (Beast_BUILD_TESTS "Build tests" ON)
+option (Beast_BUILD_TESTS "Build tests" ${BUILD_TESTING})
 option (Beast_ENABLE_HANDLER_TRACKING "Define BOOST_ASIO_ENABLE_HANDLER_TRACKING when building libraries" OFF)
 option (Boost_USE_STATIC_LIBS "Use Static Boost libraries" ON)
 

diff --git a/doc/qbk/02_examples/_examples.qbk b/doc/qbk/02_examples/_examples.qbk
@@ -151,7 +151,7 @@ support timeouts.
         [[path_link example/websocket/server/stackless/websocket_server_stackless.cpp websocket_server_stackless.cpp]]
         [[path_link example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp websocket_server_stackless_ssl.cpp]]
 ][
-        [HTTP, C++ 20 coroutine]
+        [WebSocket, C++ 20 coroutine]
         [[path_link example/websocket/server/awaitable/websocket_server_awaitable.cpp websocket_server_awaitable.cpp]]
         []
 ][

diff --git a/include/boost/beast/version.hpp b/include/boost/beast/version.hpp
@@ -20,7 +20,7 @@
    This is a simple integer that is incremented by one every
    time a set of code changes is merged to the develop branch.
 */
-#define BOOST_BEAST_VERSION 352
+#define BOOST_BEAST_VERSION 353
 
 // A string describing BOOST_BEAST_VERSION, that can be used in http headers.
 #define BOOST_BEAST_VERSION_STRING "Boost.Beast/" BOOST_STRINGIZE(BOOST_BEAST_VERSION)

diff --git a/tools/get-boost.sh b/tools/get-boost.sh
@@ -35,6 +35,7 @@ git submodule update --init --depth 20 --jobs 4 \
     libs/intrusive \
     libs/locale \
     libs/optional \
+    libs/scope \
     libs/smart_ptr \
     libs/static_assert \
     libs/static_string \