passenger 6.0.11 → 6.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +24 -1
- data/CONTRIBUTORS +3 -0
- data/src/agent/Core/Config.h +1 -1
- data/src/agent/Core/Controller/CheckoutSession.cpp +24 -13
- data/src/agent/Core/Controller/Config.h +1 -1
- data/src/agent/Core/Controller/InternalUtils.cpp +32 -6
- data/src/agent/Core/Controller.h +4 -1
- data/src/agent/Watchdog/Config.h +1 -1
- data/src/cxx_supportlib/Constants.h +1 -1
- data/src/cxx_supportlib/IOTools/IOUtils.cpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp +47 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp +41 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp +28 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/associated_allocator.hpp +53 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/associated_cancellation_slot.hpp +179 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/associated_executor.hpp +57 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/associator.hpp +37 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/async_result.hpp +789 -106
- data/src/cxx_supportlib/vendor-modified/boost/asio/awaitable.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_datagram_socket.hpp +80 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_deadline_timer.hpp +10 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_raw_socket.hpp +80 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_seq_packet_socket.hpp +30 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket_acceptor.hpp +90 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_stream_socket.hpp +60 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/basic_waitable_timer.hpp +10 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/bind_cancellation_slot.hpp +723 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/bind_executor.hpp +191 -12
- data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_signal.hpp +361 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_state.hpp +237 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_type.hpp +176 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/co_spawn.hpp +30 -2
- data/src/cxx_supportlib/vendor-modified/boost/asio/connect.hpp +60 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/base_from_cancellation_state.hpp +165 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/bind_handler.hpp +209 -76
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp +149 -60
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/deadline_timer_service.hpp +40 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/dev_poll_reactor.hpp +8 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/epoll_reactor.hpp +14 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/functional.hpp +6 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_alloc_helpers.hpp +14 -10
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_type_requirements.hpp +21 -18
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_work.hpp +30 -19
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.hpp +8 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.ipp +14 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.ipp +30 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.ipp +29 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.hpp +24 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.ipp +19 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/strand_executor_service.hpp +3 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/timer_queue_ptime.ipp +6 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/kqueue_reactor.hpp +15 -5
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/memory.hpp +60 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/pop_options.hpp +8 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/push_options.hpp +27 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_descriptor_service.hpp +93 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service.hpp +77 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service_base.hpp +111 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op.hpp +4 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op_queue.hpp +44 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/recycling_allocator.hpp +2 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_endpoint_op.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/select_reactor.hpp +14 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/thread_info_base.hpp +90 -24
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue.hpp +30 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue_ptime.hpp +4 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/wait_op.hpp +5 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/detail/work_dispatcher.hpp +5 -2
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/any_executor.hpp +12 -12
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/bulk_execute.hpp +10 -8
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/connect.hpp +8 -8
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/execute.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/schedule.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_done.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_error.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_value.hpp +13 -13
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/start.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/execution/submit.hpp +8 -8
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/append.hpp +73 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/as_tuple.hpp +133 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/awaitable_operators.hpp +538 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/cancellation_condition.hpp +157 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/coro.hpp +1057 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/deferred.hpp +607 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/completion_handler_erasure.hpp +160 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_promise_allocator.hpp +120 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_traits.hpp +185 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/partial_promise.hpp +181 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/append.hpp +219 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_single.hpp +14 -28
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_tuple.hpp +248 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/deferred.hpp +106 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/parallel_group.hpp +434 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/prepend.hpp +219 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/promise.hpp +100 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/parallel_group.hpp +217 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/prepend.hpp +73 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/promise.hpp +608 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/use_coro.hpp +284 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/awaitable.hpp +344 -20
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_read_stream.hpp +23 -54
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_write_stream.hpp +23 -54
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/co_spawn.hpp +66 -18
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/compose.hpp +55 -5
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/connect.hpp +68 -80
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/defer.hpp +8 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/dispatch.hpp +8 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/handler_alloc_hook.ipp +3 -2
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/post.hpp +8 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read.hpp +98 -113
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_at.hpp +71 -82
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_until.hpp +210 -266
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/redirect_error.hpp +248 -30
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/spawn.hpp +11 -21
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/use_awaitable.hpp +15 -3
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write.hpp +71 -87
- data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write_at.hpp +46 -68
- data/src/cxx_supportlib/vendor-modified/boost/asio/io_context.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/local/detail/impl/endpoint.ipp +2 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_descriptor.hpp +10 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_stream_descriptor.hpp +23 -3
- data/src/cxx_supportlib/vendor-modified/boost/asio/prefer.hpp +21 -21
- data/src/cxx_supportlib/vendor-modified/boost/asio/query.hpp +9 -9
- data/src/cxx_supportlib/vendor-modified/boost/asio/read.hpp +88 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/read_at.hpp +44 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/read_until.hpp +132 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/require.hpp +21 -21
- data/src/cxx_supportlib/vendor-modified/boost/asio/require_concept.hpp +9 -9
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/buffered_handshake_op.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/engine.hpp +5 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/handshake_op.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/impl/engine.ipp +14 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/io.hpp +36 -27
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/read_op.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/shutdown_op.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/stream_core.hpp +37 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/write_op.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.ipp +14 -7
- data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/stream.hpp +73 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/system_executor.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/this_coro.hpp +235 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/thread_pool.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/asio/use_awaitable.hpp +7 -10
- data/src/cxx_supportlib/vendor-modified/boost/asio/version.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_random_access_handle.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_stream_handle.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/write.hpp +88 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio/write_at.hpp +44 -0
- data/src/cxx_supportlib/vendor-modified/boost/asio.hpp +6 -0
- data/src/cxx_supportlib/vendor-modified/boost/atomic/atomic_ref.hpp +14 -1
- data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/config.hpp +17 -13
- data/src/cxx_supportlib/vendor-modified/boost/atomic/ipc_atomic_ref.hpp +14 -1
- data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx03.hpp +2 -5
- data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx11.hpp +2 -5
- data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx14.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx17.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx20.hpp +56 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/auto_link.hpp +1 -5
- data/src/cxx_supportlib/vendor-modified/boost/config/compiler/common_edg.hpp +31 -11
- data/src/cxx_supportlib/vendor-modified/boost/config/detail/cxx_composite.hpp +20 -4
- data/src/cxx_supportlib/vendor-modified/boost/config/detail/select_platform_config.hpp +5 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/detail/suffix.hpp +81 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/platform/bsd.hpp +5 -8
- data/src/cxx_supportlib/vendor-modified/boost/config/platform/wasm.hpp +17 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/dinkumware.hpp +26 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libcpp.hpp +49 -0
- data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libstdcpp3.hpp +46 -4
- data/src/cxx_supportlib/vendor-modified/boost/container/adaptive_pool.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/container/allocator.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/container/detail/adaptive_node_pool.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/container/detail/node_pool.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/container/detail/std_fwd.hpp +3 -0
- data/src/cxx_supportlib/vendor-modified/boost/container/devector.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/container/new_allocator.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/container/node_allocator.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/container/pmr/polymorphic_allocator.hpp +6 -6
- data/src/cxx_supportlib/vendor-modified/boost/container/static_vector.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/container/throw_exception.hpp +45 -38
- data/src/cxx_supportlib/vendor-modified/boost/container/vector.hpp +24 -0
- data/src/cxx_supportlib/vendor-modified/boost/core/ignore_unused.hpp +32 -2
- data/src/cxx_supportlib/vendor-modified/boost/core/uncaught_exceptions.hpp +7 -7
- data/src/cxx_supportlib/vendor-modified/boost/date_time/compiler_config.hpp +0 -24
- data/src/cxx_supportlib/vendor-modified/boost/date_time/posix_time/time_parsers.hpp +4 -0
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/any_hook.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/avl_set.hpp +83 -83
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree.hpp +43 -43
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree_algorithms.hpp +31 -31
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/bs_set.hpp +85 -85
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree.hpp +68 -68
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree_algorithms.hpp +72 -62
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_list_algorithms.hpp +19 -20
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_slist_algorithms.hpp +19 -19
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/derivation_value_traits.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/any_node_and_algorithms.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/bstree_algorithms_base.hpp +3 -3
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/common_slist_algorithms.hpp +5 -5
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/config_begin.hpp +1 -0
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/generic_hook.hpp +8 -8
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hash_combine.hpp +2 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hashtable_node.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/math.hpp +2 -50
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/node_cloner_disposer.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/hashtable.hpp +71 -70
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/linear_slist_algorithms.hpp +15 -14
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/list.hpp +84 -82
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/list_hook.hpp +10 -10
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/member_value_traits.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/parent_from_member.hpp +2 -2
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_plus_bits.hpp +4 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_traits.hpp +18 -18
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree.hpp +43 -43
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree_algorithms.hpp +26 -26
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/set.hpp +85 -85
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/set_hook.hpp +12 -12
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/sg_set.hpp +93 -93
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree.hpp +51 -51
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree_algorithms.hpp +24 -24
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist.hpp +104 -104
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist_hook.hpp +8 -6
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/splay_set.hpp +91 -91
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree.hpp +46 -46
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree_algorithms.hpp +31 -31
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap.hpp +51 -51
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_algorithms.hpp +18 -18
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_set.hpp +97 -97
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/trivial_value_traits.hpp +6 -4
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set.hpp +63 -63
- data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set_hook.hpp +15 -15
- data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_numeric.hpp +4 -1
- data/src/cxx_supportlib/vendor-modified/boost/move/detail/config_begin.hpp +1 -0
- data/src/cxx_supportlib/vendor-modified/boost/move/detail/iterator_traits.hpp +1 -0
- data/src/cxx_supportlib/vendor-modified/boost/move/detail/nsec_clock.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/operators.hpp +2 -0
- data/src/cxx_supportlib/vendor-modified/boost/regex/concepts.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex_parser.hpp +3 -0
- data/src/cxx_supportlib/vendor-modified/boost/regex/v4/unicode_iterator.hpp +112 -31
- data/src/cxx_supportlib/vendor-modified/boost/regex/v5/basic_regex_parser.hpp +3 -0
- data/src/cxx_supportlib/vendor-modified/boost/regex/v5/mem_block_cache.hpp +4 -8
- data/src/cxx_supportlib/vendor-modified/boost/regex/v5/unicode_iterator.hpp +0 -2
- data/src/cxx_supportlib/vendor-modified/boost/regex/v5/w32_regex_traits.hpp +6 -2
- data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/shared_count.hpp +1 -1
- data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_impl.hpp +22 -2
- data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/shared_ptr.hpp +59 -1
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/config.hpp +9 -11
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category.hpp +27 -21
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category_impl.hpp +34 -3
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_code.hpp +378 -36
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_condition.hpp +97 -21
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/interop_category.hpp +107 -0
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_same.hpp +33 -0
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/snprintf.hpp +70 -0
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/{to_std_category.hpp → std_category.hpp} +5 -55
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/system_category_impl.hpp +2 -12
- data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +0 -33
- data/src/cxx_supportlib/vendor-modified/boost/utility/detail/result_of_variadic.hpp +190 -0
- data/src/cxx_supportlib/vendor-modified/boost/utility/result_of.hpp +20 -9
- data/src/cxx_supportlib/vendor-modified/boost/utility/string_view.hpp +3 -1
- data/src/cxx_supportlib/vendor-modified/boost/version.hpp +2 -2
- data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c +8 -0
- data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +6 -0
- data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +12 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +5 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +21 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +13 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +3 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +4 -0
- data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +3 -2
- data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb +8 -1
- data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +6 -0
- data/src/ruby_supportlib/phusion_passenger/packaging.rb +1 -0
- data/src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb +1 -1
- data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb +8 -0
- data/src/ruby_supportlib/phusion_passenger/request_handler.rb +4 -1
- data/src/ruby_supportlib/phusion_passenger.rb +1 -1
- metadata +39 -4
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_generic_value.hpp +0 -125
@@ -12,6 +12,7 @@
|
|
12
12
|
#define BOOST_ASIO_DETAIL_CONFIG_HPP
|
13
13
|
|
14
14
|
#if defined(BOOST_ASIO_STANDALONE)
|
15
|
+
# define BOOST_ASIO_DISABLE_BOOST_ALIGN 1
|
15
16
|
# define BOOST_ASIO_DISABLE_BOOST_ARRAY 1
|
16
17
|
# define BOOST_ASIO_DISABLE_BOOST_ASSERT 1
|
17
18
|
# define BOOST_ASIO_DISABLE_BOOST_BIND 1
|
@@ -98,8 +99,7 @@
|
|
98
99
|
# if __has_feature(__cxx_rvalue_references__)
|
99
100
|
# define BOOST_ASIO_HAS_MOVE 1
|
100
101
|
# endif // __has_feature(__cxx_rvalue_references__)
|
101
|
-
#
|
102
|
-
# if defined(__GNUC__)
|
102
|
+
# elif defined(__GNUC__)
|
103
103
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4)
|
104
104
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
105
105
|
# define BOOST_ASIO_HAS_MOVE 1
|
@@ -172,8 +172,7 @@
|
|
172
172
|
# if __has_feature(__cxx_variadic_templates__)
|
173
173
|
# define BOOST_ASIO_HAS_VARIADIC_TEMPLATES 1
|
174
174
|
# endif // __has_feature(__cxx_variadic_templates__)
|
175
|
-
#
|
176
|
-
# if defined(__GNUC__)
|
175
|
+
# elif defined(__GNUC__)
|
177
176
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4)
|
178
177
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
179
178
|
# define BOOST_ASIO_HAS_VARIADIC_TEMPLATES 1
|
@@ -197,18 +196,17 @@
|
|
197
196
|
|
198
197
|
// Support deleted functions on compilers known to allow it.
|
199
198
|
#if !defined(BOOST_ASIO_DELETED)
|
200
|
-
# if defined(
|
199
|
+
# if defined(__clang__)
|
200
|
+
# if __has_feature(__cxx_deleted_functions__)
|
201
|
+
# define BOOST_ASIO_DELETED = delete
|
202
|
+
# endif // __has_feature(__cxx_deleted_functions__)
|
203
|
+
# elif defined(__GNUC__)
|
201
204
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
202
205
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
203
206
|
# define BOOST_ASIO_DELETED = delete
|
204
207
|
# endif // (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
205
208
|
# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
206
209
|
# endif // defined(__GNUC__)
|
207
|
-
# if defined(__clang__)
|
208
|
-
# if __has_feature(__cxx_deleted_functions__)
|
209
|
-
# define BOOST_ASIO_DELETED = delete
|
210
|
-
# endif // __has_feature(__cxx_deleted_functions__)
|
211
|
-
# endif // defined(__clang__)
|
212
210
|
# if defined(BOOST_ASIO_MSVC)
|
213
211
|
# if (_MSC_VER >= 1900)
|
214
212
|
# define BOOST_ASIO_DELETED = delete
|
@@ -226,8 +224,7 @@
|
|
226
224
|
# if __has_feature(__cxx_constexpr__)
|
227
225
|
# define BOOST_ASIO_HAS_CONSTEXPR 1
|
228
226
|
# endif // __has_feature(__cxx_constexpr__)
|
229
|
-
#
|
230
|
-
# if defined(__GNUC__)
|
227
|
+
# elif defined(__GNUC__)
|
231
228
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4)
|
232
229
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
233
230
|
# define BOOST_ASIO_HAS_CONSTEXPR 1
|
@@ -333,6 +330,25 @@
|
|
333
330
|
# endif // defined(BOOST_ASIO_HAS_NOEXCEPT)
|
334
331
|
#endif // !defined(BOOST_ASIO_NOEXCEPT_IF)
|
335
332
|
|
333
|
+
// Support noexcept on function types on compilers known to allow it.
|
334
|
+
#if !defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
|
335
|
+
# if !defined(BOOST_ASIO_DISABLE_NOEXCEPT_FUNCTION_TYPE)
|
336
|
+
# if defined(__clang__)
|
337
|
+
# if (__cplusplus >= 202002)
|
338
|
+
# define BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE 1
|
339
|
+
# endif // (__cplusplus >= 202002)
|
340
|
+
# elif defined(__GNUC__)
|
341
|
+
# if (__cplusplus >= 202002)
|
342
|
+
# define BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE 1
|
343
|
+
# endif // (__cplusplus >= 202002)
|
344
|
+
# elif defined(BOOST_ASIO_MSVC)
|
345
|
+
# if (_MSC_VER >= 1900 && _MSVC_LANG >= 202002)
|
346
|
+
# define BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE 1
|
347
|
+
# endif // (_MSC_VER >= 1900 && _MSVC_LANG >= 202002)
|
348
|
+
# endif // defined(BOOST_ASIO_MSVC)
|
349
|
+
# endif // !defined(BOOST_ASIO_DISABLE_NOEXCEPT_FUNCTION_TYPE)
|
350
|
+
#endif // !defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
|
351
|
+
|
336
352
|
// Support automatic type deduction on compilers known to support it.
|
337
353
|
#if !defined(BOOST_ASIO_HAS_DECLTYPE)
|
338
354
|
# if !defined(BOOST_ASIO_DISABLE_DECLTYPE)
|
@@ -340,8 +356,7 @@
|
|
340
356
|
# if __has_feature(__cxx_decltype__)
|
341
357
|
# define BOOST_ASIO_HAS_DECLTYPE 1
|
342
358
|
# endif // __has_feature(__cxx_decltype__)
|
343
|
-
#
|
344
|
-
# if defined(__GNUC__)
|
359
|
+
# elif defined(__GNUC__)
|
345
360
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4)
|
346
361
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
347
362
|
# define BOOST_ASIO_HAS_DECLTYPE 1
|
@@ -363,8 +378,7 @@
|
|
363
378
|
# if __has_feature(__cxx_alias_templates__)
|
364
379
|
# define BOOST_ASIO_HAS_ALIAS_TEMPLATES 1
|
365
380
|
# endif // __has_feature(__cxx_alias_templates__)
|
366
|
-
#
|
367
|
-
# if defined(__GNUC__)
|
381
|
+
# elif defined(__GNUC__)
|
368
382
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
369
383
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
370
384
|
# define BOOST_ASIO_HAS_ALIAS_TEMPLATES 1
|
@@ -409,6 +423,19 @@
|
|
409
423
|
# endif // !defined(BOOST_ASIO_DISABLE_DEFAULT_FUNCTION_TEMPLATE_ARGUMENTS)
|
410
424
|
#endif // !defined(BOOST_ASIO_HAS_DEFAULT_FUNCTION_TEMPLATE_ARGUMENTS)
|
411
425
|
|
426
|
+
// Support enum classes on compilers known to allow them.
|
427
|
+
#if !defined(BOOST_ASIO_HAS_ENUM_CLASS)
|
428
|
+
# if !defined(BOOST_ASIO_DISABLE_ENUM_CLASS)
|
429
|
+
# if (__cplusplus >= 201103)
|
430
|
+
# define BOOST_ASIO_HAS_ENUM_CLASS 1
|
431
|
+
# elif defined(BOOST_ASIO_MSVC)
|
432
|
+
# if (_MSC_VER >= 1900 && _MSVC_LANG >= 201103)
|
433
|
+
# define BOOST_ASIO_HAS_ENUM_CLASS 1
|
434
|
+
# endif // (_MSC_VER >= 1900 && _MSVC_LANG >= 201103)
|
435
|
+
# endif // defined(BOOST_ASIO_MSVC)
|
436
|
+
# endif // !defined(BOOST_ASIO_DISABLE_ENUM_CLASS)
|
437
|
+
#endif // !defined(BOOST_ASIO_HAS_ENUM_CLASS)
|
438
|
+
|
412
439
|
// Support concepts on compilers known to allow them.
|
413
440
|
#if !defined(BOOST_ASIO_HAS_CONCEPTS)
|
414
441
|
# if !defined(BOOST_ASIO_DISABLE_CONCEPTS)
|
@@ -432,8 +459,7 @@
|
|
432
459
|
# define BOOST_ASIO_HAS_VARIABLE_TEMPLATES 1
|
433
460
|
# endif // __has_feature(__cxx_variable_templates__)
|
434
461
|
# endif // (__cplusplus >= 201402)
|
435
|
-
#
|
436
|
-
# if defined(__GNUC__) && !defined(__INTEL_COMPILER)
|
462
|
+
# elif defined(__GNUC__) && !defined(__INTEL_COMPILER)
|
437
463
|
# if (__GNUC__ >= 6)
|
438
464
|
# if (__cplusplus >= 201402)
|
439
465
|
# define BOOST_ASIO_HAS_VARIABLE_TEMPLATES 1
|
@@ -457,8 +483,7 @@
|
|
457
483
|
# define BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES 1
|
458
484
|
# endif // __has_feature(__cxx_variable_templates__)
|
459
485
|
# endif // (__cplusplus >= 201703)
|
460
|
-
#
|
461
|
-
# if defined(__GNUC__)
|
486
|
+
# elif defined(__GNUC__)
|
462
487
|
# if ((__GNUC__ == 8) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 8)
|
463
488
|
# if (__cplusplus >= 201402)
|
464
489
|
# define BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES 1
|
@@ -480,8 +505,7 @@
|
|
480
505
|
# if (__cplusplus >= 201402)
|
481
506
|
# define BOOST_ASIO_HAS_CONSTANT_EXPRESSION_SFINAE 1
|
482
507
|
# endif // (__cplusplus >= 201402)
|
483
|
-
#
|
484
|
-
# if defined(__GNUC__) && !defined(__INTEL_COMPILER)
|
508
|
+
# elif defined(__GNUC__) && !defined(__INTEL_COMPILER)
|
485
509
|
# if (__GNUC__ >= 7)
|
486
510
|
# if (__cplusplus >= 201402)
|
487
511
|
# define BOOST_ASIO_HAS_CONSTANT_EXPRESSION_SFINAE 1
|
@@ -503,7 +527,11 @@
|
|
503
527
|
# if (__cplusplus >= 201103)
|
504
528
|
# define BOOST_ASIO_HAS_WORKING_EXPRESSION_SFINAE 1
|
505
529
|
# endif // (__cplusplus >= 201103)
|
506
|
-
#
|
530
|
+
# elif defined(BOOST_ASIO_MSVC) && (_MSC_VER >= 1929)
|
531
|
+
# if (_MSVC_LANG >= 202000)
|
532
|
+
# define BOOST_ASIO_HAS_WORKING_EXPRESSION_SFINAE 1
|
533
|
+
# endif // (_MSVC_LANG >= 202000)
|
534
|
+
# endif // defined(BOOST_ASIO_MSVC) && (_MSC_VER >= 1929)
|
507
535
|
# endif // !defined(BOOST_ASIO_DISABLE_WORKING_EXPRESSION_SFINAE)
|
508
536
|
#endif // !defined(BOOST_ASIO_HAS_WORKING_EXPRESSION_SFINAE)
|
509
537
|
|
@@ -514,8 +542,7 @@
|
|
514
542
|
# if __has_feature(__cxx_reference_qualified_functions__)
|
515
543
|
# define BOOST_ASIO_HAS_REF_QUALIFIED_FUNCTIONS 1
|
516
544
|
# endif // __has_feature(__cxx_reference_qualified_functions__)
|
517
|
-
#
|
518
|
-
# if defined(__GNUC__)
|
545
|
+
# elif defined(__GNUC__)
|
519
546
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
520
547
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
521
548
|
# define BOOST_ASIO_HAS_REF_QUALIFIED_FUNCTIONS 1
|
@@ -545,6 +572,52 @@
|
|
545
572
|
# endif // !defined(BOOST_ASIO_RVALUE_REF_QUAL)
|
546
573
|
#endif // defined(BOOST_ASIO_HAS_REF_QUALIFIED_FUNCTIONS)
|
547
574
|
|
575
|
+
// Support for the alignof operator.
|
576
|
+
#if !defined(BOOST_ASIO_HAS_ALIGNOF)
|
577
|
+
# if !defined(BOOST_ASIO_DISABLE_ALIGNOF)
|
578
|
+
# if (__cplusplus >= 201103)
|
579
|
+
# define BOOST_ASIO_HAS_ALIGNOF 1
|
580
|
+
# endif // (__cplusplus >= 201103)
|
581
|
+
# endif // !defined(BOOST_ASIO_DISABLE_ALIGNOF)
|
582
|
+
#endif // !defined(BOOST_ASIO_HAS_ALIGNOF)
|
583
|
+
|
584
|
+
#if defined(BOOST_ASIO_HAS_ALIGNOF)
|
585
|
+
# define BOOST_ASIO_ALIGNOF(T) alignof(T)
|
586
|
+
# if defined(__GNUC__)
|
587
|
+
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
588
|
+
# define BOOST_ASIO_DEFAULT_ALIGN alignof(std::max_align_t)
|
589
|
+
# else // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
590
|
+
# define BOOST_ASIO_DEFAULT_ALIGN alignof(max_align_t)
|
591
|
+
# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
592
|
+
# else // defined(__GNUC__)
|
593
|
+
# define BOOST_ASIO_DEFAULT_ALIGN alignof(std::max_align_t)
|
594
|
+
# endif // defined(__GNUC__)
|
595
|
+
#else // defined(BOOST_ASIO_HAS_ALIGNOF)
|
596
|
+
# define BOOST_ASIO_ALIGNOF(T) 1
|
597
|
+
# define BOOST_ASIO_DEFAULT_ALIGN 1
|
598
|
+
#endif // defined(BOOST_ASIO_HAS_ALIGNOF)
|
599
|
+
|
600
|
+
// Standard library support for aligned allocation.
|
601
|
+
#if !defined(BOOST_ASIO_HAS_STD_ALIGNED_ALLOC)
|
602
|
+
# if !defined(BOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC)
|
603
|
+
# if (__cplusplus >= 201703)
|
604
|
+
# if defined(__clang__)
|
605
|
+
# if defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
|
606
|
+
# if (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
|
607
|
+
# define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
|
608
|
+
# endif // (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
|
609
|
+
# elif defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)
|
610
|
+
# define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
|
611
|
+
# endif // defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)
|
612
|
+
# elif defined(__GNUC__)
|
613
|
+
# if defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)
|
614
|
+
# define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
|
615
|
+
# endif // defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)
|
616
|
+
# endif // defined(__GNUC__)
|
617
|
+
# endif // (__cplusplus >= 201703)
|
618
|
+
# endif // !defined(BOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC)
|
619
|
+
#endif // !defined(BOOST_ASIO_HAS_STD_ALIGNED_ALLOC)
|
620
|
+
|
548
621
|
// Standard library support for system errors.
|
549
622
|
# if !defined(BOOST_ASIO_DISABLE_STD_SYSTEM_ERROR)
|
550
623
|
# if defined(__clang__)
|
@@ -555,8 +628,7 @@
|
|
555
628
|
# define BOOST_ASIO_HAS_STD_SYSTEM_ERROR 1
|
556
629
|
# endif // __has_include(<system_error>)
|
557
630
|
# endif // (__cplusplus >= 201103)
|
558
|
-
#
|
559
|
-
# if defined(__GNUC__)
|
631
|
+
# elif defined(__GNUC__)
|
560
632
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4)
|
561
633
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
562
634
|
# define BOOST_ASIO_HAS_STD_SYSTEM_ERROR 1
|
@@ -605,8 +677,7 @@
|
|
605
677
|
# define BOOST_ASIO_HAS_STD_ARRAY 1
|
606
678
|
# endif // __has_include(<array>)
|
607
679
|
# endif // (__cplusplus >= 201103)
|
608
|
-
#
|
609
|
-
# if defined(__GNUC__)
|
680
|
+
# elif defined(__GNUC__)
|
610
681
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4)
|
611
682
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
612
683
|
# define BOOST_ASIO_HAS_STD_ARRAY 1
|
@@ -630,8 +701,7 @@
|
|
630
701
|
# elif (__cplusplus >= 201103)
|
631
702
|
# define BOOST_ASIO_HAS_STD_SHARED_PTR 1
|
632
703
|
# endif // (__cplusplus >= 201103)
|
633
|
-
#
|
634
|
-
# if defined(__GNUC__)
|
704
|
+
# elif defined(__GNUC__)
|
635
705
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4)
|
636
706
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
637
707
|
# define BOOST_ASIO_HAS_STD_SHARED_PTR 1
|
@@ -655,8 +725,7 @@
|
|
655
725
|
# elif (__cplusplus >= 201103)
|
656
726
|
# define BOOST_ASIO_HAS_STD_ALLOCATOR_ARG 1
|
657
727
|
# endif // (__cplusplus >= 201103)
|
658
|
-
#
|
659
|
-
# if defined(__GNUC__)
|
728
|
+
# elif defined(__GNUC__)
|
660
729
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4)
|
661
730
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
662
731
|
# define BOOST_ASIO_HAS_STD_ALLOCATOR_ARG 1
|
@@ -688,8 +757,7 @@
|
|
688
757
|
# endif // __has_include(<atomic>)
|
689
758
|
# endif // (__clang_major__ >= 10)
|
690
759
|
# endif // defined(__apple_build_version__) && defined(_LIBCPP_VERSION)
|
691
|
-
#
|
692
|
-
# if defined(__GNUC__)
|
760
|
+
# elif defined(__GNUC__)
|
693
761
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
694
762
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
695
763
|
# define BOOST_ASIO_HAS_STD_ATOMIC 1
|
@@ -717,8 +785,7 @@
|
|
717
785
|
# define BOOST_ASIO_HAS_STD_CHRONO 1
|
718
786
|
# endif // __has_include(<chrono>)
|
719
787
|
# endif // (__cplusplus >= 201103)
|
720
|
-
#
|
721
|
-
# if defined(__GNUC__)
|
788
|
+
# elif defined(__GNUC__)
|
722
789
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4)
|
723
790
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
724
791
|
# define BOOST_ASIO_HAS_STD_CHRONO 1
|
@@ -770,8 +837,7 @@
|
|
770
837
|
# elif (__cplusplus >= 201103)
|
771
838
|
# define BOOST_ASIO_HAS_STD_ADDRESSOF 1
|
772
839
|
# endif // (__cplusplus >= 201103)
|
773
|
-
#
|
774
|
-
# if defined(__GNUC__)
|
840
|
+
# elif defined(__GNUC__)
|
775
841
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4)
|
776
842
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
777
843
|
# define BOOST_ASIO_HAS_STD_ADDRESSOF 1
|
@@ -795,8 +861,7 @@
|
|
795
861
|
# elif (__cplusplus >= 201103)
|
796
862
|
# define BOOST_ASIO_HAS_STD_FUNCTION 1
|
797
863
|
# endif // (__cplusplus >= 201103)
|
798
|
-
#
|
799
|
-
# if defined(__GNUC__)
|
864
|
+
# elif defined(__GNUC__)
|
800
865
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
|
801
866
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
802
867
|
# define BOOST_ASIO_HAS_STD_FUNCTION 1
|
@@ -811,6 +876,30 @@
|
|
811
876
|
# endif // !defined(BOOST_ASIO_DISABLE_STD_FUNCTION)
|
812
877
|
#endif // !defined(BOOST_ASIO_HAS_STD_FUNCTION)
|
813
878
|
|
879
|
+
// Standard library support for the reference_wrapper class.
|
880
|
+
#if !defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER)
|
881
|
+
# if !defined(BOOST_ASIO_DISABLE_STD_REFERENCE_WRAPPER)
|
882
|
+
# if defined(__clang__)
|
883
|
+
# if defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
|
884
|
+
# define BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER 1
|
885
|
+
# elif (__cplusplus >= 201103)
|
886
|
+
# define BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER 1
|
887
|
+
# endif // (__cplusplus >= 201103)
|
888
|
+
# elif defined(__GNUC__)
|
889
|
+
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
|
890
|
+
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
891
|
+
# define BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER 1
|
892
|
+
# endif // (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
893
|
+
# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
|
894
|
+
# endif // defined(__GNUC__)
|
895
|
+
# if defined(BOOST_ASIO_MSVC)
|
896
|
+
# if (_MSC_VER >= 1700)
|
897
|
+
# define BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER 1
|
898
|
+
# endif // (_MSC_VER >= 1700)
|
899
|
+
# endif // defined(BOOST_ASIO_MSVC)
|
900
|
+
# endif // !defined(BOOST_ASIO_DISABLE_STD_REFERENCE_WRAPPER)
|
901
|
+
#endif // !defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER)
|
902
|
+
|
814
903
|
// Standard library support for type traits.
|
815
904
|
#if !defined(BOOST_ASIO_HAS_STD_TYPE_TRAITS)
|
816
905
|
# if !defined(BOOST_ASIO_DISABLE_STD_TYPE_TRAITS)
|
@@ -822,8 +911,7 @@
|
|
822
911
|
# define BOOST_ASIO_HAS_STD_TYPE_TRAITS 1
|
823
912
|
# endif // __has_include(<type_traits>)
|
824
913
|
# endif // (__cplusplus >= 201103)
|
825
|
-
#
|
826
|
-
# if defined(__GNUC__)
|
914
|
+
# elif defined(__GNUC__)
|
827
915
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4)
|
828
916
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
829
917
|
# define BOOST_ASIO_HAS_STD_TYPE_TRAITS 1
|
@@ -893,8 +981,7 @@
|
|
893
981
|
# elif (__cplusplus >= 201103)
|
894
982
|
# define BOOST_ASIO_HAS_CSTDINT 1
|
895
983
|
# endif // (__cplusplus >= 201103)
|
896
|
-
#
|
897
|
-
# if defined(__GNUC__)
|
984
|
+
# elif defined(__GNUC__)
|
898
985
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
|
899
986
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
900
987
|
# define BOOST_ASIO_HAS_CSTDINT 1
|
@@ -920,8 +1007,7 @@
|
|
920
1007
|
# define BOOST_ASIO_HAS_STD_THREAD 1
|
921
1008
|
# endif // __has_include(<thread>)
|
922
1009
|
# endif // (__cplusplus >= 201103)
|
923
|
-
#
|
924
|
-
# if defined(__GNUC__)
|
1010
|
+
# elif defined(__GNUC__)
|
925
1011
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
926
1012
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
927
1013
|
# define BOOST_ASIO_HAS_STD_THREAD 1
|
@@ -947,8 +1033,7 @@
|
|
947
1033
|
# define BOOST_ASIO_HAS_STD_MUTEX_AND_CONDVAR 1
|
948
1034
|
# endif // __has_include(<mutex>)
|
949
1035
|
# endif // (__cplusplus >= 201103)
|
950
|
-
#
|
951
|
-
# if defined(__GNUC__)
|
1036
|
+
# elif defined(__GNUC__)
|
952
1037
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
953
1038
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
954
1039
|
# define BOOST_ASIO_HAS_STD_MUTEX_AND_CONDVAR 1
|
@@ -974,8 +1059,7 @@
|
|
974
1059
|
# define BOOST_ASIO_HAS_STD_CALL_ONCE 1
|
975
1060
|
# endif // __has_include(<mutex>)
|
976
1061
|
# endif // (__cplusplus >= 201103)
|
977
|
-
#
|
978
|
-
# if defined(__GNUC__)
|
1062
|
+
# elif defined(__GNUC__)
|
979
1063
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
980
1064
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
981
1065
|
# define BOOST_ASIO_HAS_STD_CALL_ONCE 1
|
@@ -1001,8 +1085,7 @@
|
|
1001
1085
|
# define BOOST_ASIO_HAS_STD_FUTURE 1
|
1002
1086
|
# endif // __has_include(<future>)
|
1003
1087
|
# endif // (__cplusplus >= 201103)
|
1004
|
-
#
|
1005
|
-
# if defined(__GNUC__)
|
1088
|
+
# elif defined(__GNUC__)
|
1006
1089
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
1007
1090
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
1008
1091
|
# define BOOST_ASIO_HAS_STD_FUTURE 1
|
@@ -1067,8 +1150,7 @@
|
|
1067
1150
|
# endif // __has_include(<experimental/string_view>)
|
1068
1151
|
# endif // (__cplusplus >= 201402)
|
1069
1152
|
# endif // // defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
|
1070
|
-
#
|
1071
|
-
# if defined(__GNUC__)
|
1153
|
+
# elif defined(__GNUC__)
|
1072
1154
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
1073
1155
|
# if (__cplusplus >= 201402)
|
1074
1156
|
# define BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
@@ -1600,6 +1682,15 @@
|
|
1600
1682
|
# endif // !defined(BOOST_ASIO_DISABLE_BOOST_STATIC_CONSTANT)
|
1601
1683
|
#endif // !defined(BOOST_ASIO_STATIC_CONSTANT)
|
1602
1684
|
|
1685
|
+
// Boost align library.
|
1686
|
+
#if !defined(BOOST_ASIO_HAS_BOOST_ALIGN)
|
1687
|
+
# if !defined(BOOST_ASIO_DISABLE_BOOST_ALIGN)
|
1688
|
+
# if defined(BOOST_ASIO_HAS_BOOST_CONFIG) && (BOOST_VERSION >= 105600)
|
1689
|
+
# define BOOST_ASIO_HAS_BOOST_ALIGN 1
|
1690
|
+
# endif // defined(BOOST_ASIO_HAS_BOOST_CONFIG) && (BOOST_VERSION >= 105600)
|
1691
|
+
# endif // !defined(BOOST_ASIO_DISABLE_BOOST_ALIGN)
|
1692
|
+
#endif // !defined(BOOST_ASIO_HAS_BOOST_ALIGN)
|
1693
|
+
|
1603
1694
|
// Boost array library.
|
1604
1695
|
#if !defined(BOOST_ASIO_HAS_BOOST_ARRAY)
|
1605
1696
|
# if !defined(BOOST_ASIO_DISABLE_BOOST_ARRAY)
|
@@ -1754,15 +1845,14 @@
|
|
1754
1845
|
#if !defined(BOOST_ASIO_HAS_CO_AWAIT)
|
1755
1846
|
# if !defined(BOOST_ASIO_DISABLE_CO_AWAIT)
|
1756
1847
|
# if defined(BOOST_ASIO_MSVC)
|
1757
|
-
# if (_MSC_VER >= 1928) && (_MSVC_LANG >= 201705)
|
1848
|
+
# if (_MSC_VER >= 1928) && (_MSVC_LANG >= 201705) && !defined(__clang__)
|
1758
1849
|
# define BOOST_ASIO_HAS_CO_AWAIT 1
|
1759
1850
|
# elif (_MSC_FULL_VER >= 190023506)
|
1760
1851
|
# if defined(_RESUMABLE_FUNCTIONS_SUPPORTED)
|
1761
1852
|
# define BOOST_ASIO_HAS_CO_AWAIT 1
|
1762
1853
|
# endif // defined(_RESUMABLE_FUNCTIONS_SUPPORTED)
|
1763
1854
|
# endif // (_MSC_FULL_VER >= 190023506)
|
1764
|
-
#
|
1765
|
-
# if defined(__clang__)
|
1855
|
+
# elif defined(__clang__)
|
1766
1856
|
# if (__cplusplus >= 201703) && (__cpp_coroutines >= 201703)
|
1767
1857
|
# if __has_include(<experimental/coroutine>)
|
1768
1858
|
# define BOOST_ASIO_HAS_CO_AWAIT 1
|
@@ -1830,8 +1920,7 @@
|
|
1830
1920
|
# elif (__cplusplus >= 201103)
|
1831
1921
|
# define BOOST_ASIO_HAS_STD_HASH 1
|
1832
1922
|
# endif // (__cplusplus >= 201103)
|
1833
|
-
#
|
1834
|
-
# if defined(__GNUC__)
|
1923
|
+
# elif defined(__GNUC__)
|
1835
1924
|
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
1836
1925
|
# if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
1837
1926
|
# define BOOST_ASIO_HAS_STD_HASH 1
|
@@ -17,6 +17,8 @@
|
|
17
17
|
|
18
18
|
#include <boost/asio/detail/config.hpp>
|
19
19
|
#include <cstddef>
|
20
|
+
#include <boost/asio/associated_cancellation_slot.hpp>
|
21
|
+
#include <boost/asio/cancellation_type.hpp>
|
20
22
|
#include <boost/asio/error.hpp>
|
21
23
|
#include <boost/asio/execution_context.hpp>
|
22
24
|
#include <boost/asio/detail/bind_handler.hpp>
|
@@ -246,12 +248,22 @@ public:
|
|
246
248
|
void async_wait(implementation_type& impl,
|
247
249
|
Handler& handler, const IoExecutor& io_ex)
|
248
250
|
{
|
251
|
+
typename associated_cancellation_slot<Handler>::type slot
|
252
|
+
= boost::asio::get_associated_cancellation_slot(handler);
|
253
|
+
|
249
254
|
// Allocate and construct an operation to wrap the handler.
|
250
255
|
typedef wait_handler<Handler, IoExecutor> op;
|
251
256
|
typename op::ptr p = { boost::asio::detail::addressof(handler),
|
252
257
|
op::ptr::allocate(handler), 0 };
|
253
258
|
p.p = new (p.v) op(handler, io_ex);
|
254
259
|
|
260
|
+
// Optionally register for per-operation cancellation.
|
261
|
+
if (slot.is_connected())
|
262
|
+
{
|
263
|
+
p.p->cancellation_key_ =
|
264
|
+
&slot.template emplace<op_cancellation>(this, &impl.timer_data);
|
265
|
+
}
|
266
|
+
|
255
267
|
impl.might_have_pending_waits = true;
|
256
268
|
|
257
269
|
BOOST_ASIO_HANDLER_CREATION((scheduler_.context(),
|
@@ -281,6 +293,34 @@ private:
|
|
281
293
|
#endif // defined(BOOST_ASIO_WINDOWS_RUNTIME)
|
282
294
|
}
|
283
295
|
|
296
|
+
// Helper class used to implement per-operation cancellation.
|
297
|
+
class op_cancellation
|
298
|
+
{
|
299
|
+
public:
|
300
|
+
op_cancellation(deadline_timer_service* s,
|
301
|
+
typename timer_queue<Time_Traits>::per_timer_data* p)
|
302
|
+
: service_(s),
|
303
|
+
timer_data_(p)
|
304
|
+
{
|
305
|
+
}
|
306
|
+
|
307
|
+
void operator()(cancellation_type_t type)
|
308
|
+
{
|
309
|
+
if (!!(type &
|
310
|
+
(cancellation_type::terminal
|
311
|
+
| cancellation_type::partial
|
312
|
+
| cancellation_type::total)))
|
313
|
+
{
|
314
|
+
service_->scheduler_.cancel_timer_by_key(
|
315
|
+
service_->timer_queue_, timer_data_, this);
|
316
|
+
}
|
317
|
+
}
|
318
|
+
|
319
|
+
private:
|
320
|
+
deadline_timer_service* service_;
|
321
|
+
typename timer_queue<Time_Traits>::per_timer_data* timer_data_;
|
322
|
+
};
|
323
|
+
|
284
324
|
// The queue of timers.
|
285
325
|
timer_queue<Time_Traits> timer_queue_;
|
286
326
|
|
@@ -85,10 +85,7 @@ public:
|
|
85
85
|
per_descriptor_data& source_descriptor_data);
|
86
86
|
|
87
87
|
// Post a reactor operation for immediate completion.
|
88
|
-
void post_immediate_completion(reactor_op* op, bool is_continuation)
|
89
|
-
{
|
90
|
-
scheduler_.post_immediate_completion(op, is_continuation);
|
91
|
-
}
|
88
|
+
void post_immediate_completion(reactor_op* op, bool is_continuation);
|
92
89
|
|
93
90
|
// Start a new operation. The reactor operation will be performed when the
|
94
91
|
// given descriptor is flagged as ready, or an error has occurred.
|
@@ -101,6 +98,13 @@ public:
|
|
101
98
|
// operation_aborted error.
|
102
99
|
BOOST_ASIO_DECL void cancel_ops(socket_type descriptor, per_descriptor_data&);
|
103
100
|
|
101
|
+
// Cancel all operations associated with the given descriptor and key. The
|
102
|
+
// handlers associated with the descriptor will be invoked with the
|
103
|
+
// operation_aborted error.
|
104
|
+
BOOST_ASIO_DECL void cancel_ops_by_key(socket_type descriptor,
|
105
|
+
per_descriptor_data& descriptor_data,
|
106
|
+
int op_type, void* cancellation_key);
|
107
|
+
|
104
108
|
// Cancel any operations that are running against the descriptor and remove
|
105
109
|
// its registration from the reactor. The reactor resources associated with
|
106
110
|
// the descriptor must be released by calling cleanup_descriptor_data.
|
@@ -115,10 +115,7 @@ public:
|
|
115
115
|
per_descriptor_data& source_descriptor_data);
|
116
116
|
|
117
117
|
// Post a reactor operation for immediate completion.
|
118
|
-
void post_immediate_completion(
|
119
|
-
{
|
120
|
-
scheduler_.post_immediate_completion(op, is_continuation);
|
121
|
-
}
|
118
|
+
void post_immediate_completion(operation* op, bool is_continuation);
|
122
119
|
|
123
120
|
// Start a new operation. The reactor operation will be performed when the
|
124
121
|
// given descriptor is flagged as ready, or an error has occurred.
|
@@ -132,6 +129,13 @@ public:
|
|
132
129
|
BOOST_ASIO_DECL void cancel_ops(socket_type descriptor,
|
133
130
|
per_descriptor_data& descriptor_data);
|
134
131
|
|
132
|
+
// Cancel all operations associated with the given descriptor and key. The
|
133
|
+
// handlers associated with the descriptor will be invoked with the
|
134
|
+
// operation_aborted error.
|
135
|
+
BOOST_ASIO_DECL void cancel_ops_by_key(socket_type descriptor,
|
136
|
+
per_descriptor_data& descriptor_data,
|
137
|
+
int op_type, void* cancellation_key);
|
138
|
+
|
135
139
|
// Cancel any operations that are running against the descriptor and remove
|
136
140
|
// its registration from the reactor. The reactor resources associated with
|
137
141
|
// the descriptor must be released by calling cleanup_descriptor_data.
|
@@ -171,6 +175,12 @@ public:
|
|
171
175
|
typename timer_queue<Time_Traits>::per_timer_data& timer,
|
172
176
|
std::size_t max_cancelled = (std::numeric_limits<std::size_t>::max)());
|
173
177
|
|
178
|
+
// Cancel the timer operations associated with the given key.
|
179
|
+
template <typename Time_Traits>
|
180
|
+
void cancel_timer_by_key(timer_queue<Time_Traits>& queue,
|
181
|
+
typename timer_queue<Time_Traits>::per_timer_data* timer,
|
182
|
+
void* cancellation_key);
|
183
|
+
|
174
184
|
// Move the timer operations associated with the given timer.
|
175
185
|
template <typename Time_Traits>
|
176
186
|
void move_timer(timer_queue<Time_Traits>& queue,
|
@@ -34,6 +34,12 @@ using boost::function;
|
|
34
34
|
#endif // defined(BOOST_ASIO_HAS_STD_FUNCTION)
|
35
35
|
|
36
36
|
} // namespace detail
|
37
|
+
|
38
|
+
#if defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER)
|
39
|
+
using std::ref;
|
40
|
+
using std::reference_wrapper;
|
41
|
+
#endif // defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER)
|
42
|
+
|
37
43
|
} // namespace asio
|
38
44
|
} // namespace boost
|
39
45
|
|
@@ -51,21 +51,24 @@ inline void error_if_hooks_are_defined(Handler& h)
|
|
51
51
|
#endif // defined(BOOST_ASIO_NO_DEPRECATED)
|
52
52
|
|
53
53
|
template <typename Handler>
|
54
|
-
inline void* allocate(std::size_t s, Handler& h
|
54
|
+
inline void* allocate(std::size_t s, Handler& h,
|
55
|
+
std::size_t align = BOOST_ASIO_DEFAULT_ALIGN)
|
55
56
|
{
|
56
57
|
#if !defined(BOOST_ASIO_HAS_HANDLER_HOOKS)
|
57
|
-
return
|
58
|
+
return aligned_new(align, s);
|
58
59
|
#elif defined(BOOST_ASIO_NO_DEPRECATED)
|
59
60
|
// The asio_handler_allocate hook is no longer used to obtain memory.
|
60
61
|
(void)&error_if_hooks_are_defined<Handler>;
|
61
62
|
(void)h;
|
62
|
-
#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
63
|
+
# if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
63
64
|
return boost::asio::detail::thread_info_base::allocate(
|
64
|
-
boost::asio::detail::thread_context::top_of_thread_call_stack(),
|
65
|
-
|
66
|
-
|
67
|
-
|
65
|
+
boost::asio::detail::thread_context::top_of_thread_call_stack(),
|
66
|
+
s, align);
|
67
|
+
# else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
68
|
+
return aligned_new(align, s);
|
69
|
+
# endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
68
70
|
#else
|
71
|
+
(void)align;
|
69
72
|
using boost::asio::asio_handler_allocate;
|
70
73
|
return asio_handler_allocate(s, boost::asio::detail::addressof(h));
|
71
74
|
#endif
|
@@ -75,7 +78,7 @@ template <typename Handler>
|
|
75
78
|
inline void deallocate(void* p, std::size_t s, Handler& h)
|
76
79
|
{
|
77
80
|
#if !defined(BOOST_ASIO_HAS_HANDLER_HOOKS)
|
78
|
-
|
81
|
+
aligned_delete(p);
|
79
82
|
#elif defined(BOOST_ASIO_NO_DEPRECATED)
|
80
83
|
// The asio_handler_allocate hook is no longer used to obtain memory.
|
81
84
|
(void)&error_if_hooks_are_defined<Handler>;
|
@@ -85,7 +88,7 @@ inline void deallocate(void* p, std::size_t s, Handler& h)
|
|
85
88
|
boost::asio::detail::thread_context::top_of_thread_call_stack(), p, s);
|
86
89
|
#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
87
90
|
(void)s;
|
88
|
-
|
91
|
+
aligned_delete(p);
|
89
92
|
#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
|
90
93
|
#else
|
91
94
|
using boost::asio::asio_handler_deallocate;
|
@@ -125,7 +128,8 @@ public:
|
|
125
128
|
T* allocate(std::size_t n)
|
126
129
|
{
|
127
130
|
return static_cast<T*>(
|
128
|
-
boost_asio_handler_alloc_helpers::allocate(
|
131
|
+
boost_asio_handler_alloc_helpers::allocate(
|
132
|
+
sizeof(T) * n, handler_, BOOST_ASIO_ALIGNOF(T)));
|
129
133
|
}
|
130
134
|
|
131
135
|
void deallocate(T* p, std::size_t n)
|