passenger 6.0.11 → 6.0.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +83 -1
- data/CONTRIBUTORS +3 -0
- data/bin/passenger-install-nginx-module +1 -1
- data/bin/passenger-status +29 -4
- data/build/test_basics.rb +2 -2
- data/dev/copy_boost_headers +30 -15
- data/doc/templates/markdown.html.erb +2 -6
- data/package.json +19 -17
- data/resources/mime.types +1 -0
- data/resources/templates/error_renderer/with_details/dist/bundle.js +2 -33
- data/resources/templates/error_renderer/with_details/dist/styles.css +2 -2
- data/resources/templates/error_renderer/with_details/src/index.html.template +0 -2
- data/resources/templates/error_renderer/with_details/webpack.config.js +13 -16
- data/resources/templates/error_renderer/without_details/dist/bundle.js +0 -1
- data/resources/templates/error_renderer/without_details/dist/styles.css +1 -1
- data/resources/templates/error_renderer/without_details/webpack.config.js +13 -16
- data/resources/templates/standalone/server.erb +1 -0
- data/src/agent/Core/ApiServer.h +35 -0
- data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +1 -0
- data/src/agent/Core/ApplicationPool/Options.h +5 -0
- data/src/agent/Core/ApplicationPool/Pool.h +9 -1
- data/src/agent/Core/Config.h +2 -1
- data/src/agent/Core/Controller/CheckoutSession.cpp +24 -13
- data/src/agent/Core/Controller/Config.h +6 -2
- data/src/agent/Core/Controller/InitRequest.cpp +2 -0
- data/src/agent/Core/Controller/InternalUtils.cpp +32 -6
- data/src/agent/Core/Controller.h +4 -1
- data/src/agent/Core/OptionParser.h +4 -0
- data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h +7 -0
- data/src/agent/Core/SpawningKit/Config.h +13 -0
- data/src/agent/Core/SpawningKit/Handshake/Prepare.h +4 -0
- data/src/agent/Core/SpawningKit/Spawner.h +1 -0
- data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp +4 -0
- data/src/agent/Watchdog/Config.h +2 -1
- data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp +5 -0
- data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp +5 -0
- data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp +18 -0
- data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp +3 -0
- data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp +3 -0
- data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp +11 -0
- data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp +7 -0
- data/src/apache2_module/DirConfig/AutoGeneratedStruct.h +17 -0
- data/src/apache2_module/Hooks.cpp +1 -0
- 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/align.hpp +19 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp +47 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp +54 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of_forward.hpp +20 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/align_cxx11.hpp +21 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp +52 -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/alignment_of.hpp +31 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of_cxx11.hpp +23 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/element_type.hpp +91 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/integral_constant.hpp +53 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp +28 -0
- data/src/cxx_supportlib/vendor-modified/boost/align/detail/min_size.hpp +26 -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 +16 -0
- data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +12 -0
- data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +24 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +10 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +39 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +26 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +6 -0
- data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +8 -0
- data/src/nginx_module/ngx_http_passenger_module.c +1 -0
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js +50 -29
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js +20 -20
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js +11 -11
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js +3 -3
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js +8 -2
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js +2 -1
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js +174 -146
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/console.js +4 -2
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/file.js +15 -5
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/http.js +14 -4
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports.js +26 -24
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston.js +5 -5
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/package.json +4 -13
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/colors/package.json +19 -33
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/cycle/package.json +11 -29
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/eyes/package.json +12 -40
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/package.json +3 -12
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js +49 -24
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json +4 -16
- data/src/nodejs_supportlib/vendor-copy/winston/package.json +11 -55
- data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +3 -2
- data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb +6 -0
- data/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb +16 -12
- data/src/ruby_supportlib/phusion_passenger/console_text_template.rb +7 -2
- data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb +8 -1
- data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +12 -0
- data/src/ruby_supportlib/phusion_passenger/packaging.rb +2 -1
- data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb +2 -1
- 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/thread_handler.rb +18 -18
- data/src/ruby_supportlib/phusion_passenger/request_handler.rb +4 -1
- data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +7 -1
- data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +1 -0
- data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +28 -17
- data/src/ruby_supportlib/phusion_passenger.rb +5 -5
- metadata +49 -9
- data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_generic_value.hpp +0 -125
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js +0 -601
- data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/webhook.js +0 -146
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/LICENSE +0 -19
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js +0 -136
- data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json +0 -56
@@ -19,7 +19,7 @@
|
|
19
19
|
#include <boost/asio/detail/type_traits.hpp>
|
20
20
|
#include <boost/asio/detail/variadic_templates.hpp>
|
21
21
|
#include <boost/asio/associated_executor.hpp>
|
22
|
-
#include <boost/asio/
|
22
|
+
#include <boost/asio/associator.hpp>
|
23
23
|
#include <boost/asio/async_result.hpp>
|
24
24
|
#include <boost/asio/execution/executor.hpp>
|
25
25
|
#include <boost/asio/execution_context.hpp>
|
@@ -516,26 +516,204 @@ template <typename T, typename Executor>
|
|
516
516
|
struct uses_executor<executor_binder<T, Executor>, Executor>
|
517
517
|
: true_type {};
|
518
518
|
|
519
|
-
|
520
|
-
|
519
|
+
namespace detail {
|
520
|
+
|
521
|
+
template <typename TargetAsyncResult, typename Executor, typename = void>
|
522
|
+
struct executor_binder_async_result_completion_handler_type
|
523
|
+
{
|
524
|
+
};
|
525
|
+
|
526
|
+
template <typename TargetAsyncResult, typename Executor>
|
527
|
+
struct executor_binder_async_result_completion_handler_type<
|
528
|
+
TargetAsyncResult, Executor,
|
529
|
+
typename void_type<
|
530
|
+
typename TargetAsyncResult::completion_handler_type
|
531
|
+
>::type>
|
521
532
|
{
|
522
|
-
public:
|
523
533
|
typedef executor_binder<
|
524
|
-
typename
|
534
|
+
typename TargetAsyncResult::completion_handler_type, Executor>
|
525
535
|
completion_handler_type;
|
536
|
+
};
|
526
537
|
|
527
|
-
|
538
|
+
template <typename TargetAsyncResult, typename = void>
|
539
|
+
struct executor_binder_async_result_return_type
|
540
|
+
{
|
541
|
+
};
|
542
|
+
|
543
|
+
template <typename TargetAsyncResult>
|
544
|
+
struct executor_binder_async_result_return_type<
|
545
|
+
TargetAsyncResult,
|
546
|
+
typename void_type<
|
547
|
+
typename TargetAsyncResult::return_type
|
548
|
+
>::type>
|
549
|
+
{
|
550
|
+
typedef typename TargetAsyncResult::return_type return_type;
|
551
|
+
};
|
528
552
|
|
553
|
+
} // namespace detail
|
554
|
+
|
555
|
+
template <typename T, typename Executor, typename Signature>
|
556
|
+
class async_result<executor_binder<T, Executor>, Signature> :
|
557
|
+
public detail::executor_binder_async_result_completion_handler_type<
|
558
|
+
async_result<T, Signature>, Executor>,
|
559
|
+
public detail::executor_binder_async_result_return_type<
|
560
|
+
async_result<T, Signature> >
|
561
|
+
{
|
562
|
+
public:
|
529
563
|
explicit async_result(executor_binder<T, Executor>& b)
|
530
564
|
: target_(b.get())
|
531
565
|
{
|
532
566
|
}
|
533
567
|
|
534
|
-
return_type get()
|
568
|
+
typename async_result<T, Signature>::return_type get()
|
535
569
|
{
|
536
570
|
return target_.get();
|
537
571
|
}
|
538
572
|
|
573
|
+
template <typename Initiation>
|
574
|
+
struct init_wrapper
|
575
|
+
{
|
576
|
+
template <typename Init>
|
577
|
+
init_wrapper(const Executor& ex, BOOST_ASIO_MOVE_ARG(Init) init)
|
578
|
+
: ex_(ex),
|
579
|
+
initiation_(BOOST_ASIO_MOVE_CAST(Init)(init))
|
580
|
+
{
|
581
|
+
}
|
582
|
+
|
583
|
+
#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
584
|
+
|
585
|
+
template <typename Handler, typename... Args>
|
586
|
+
void operator()(
|
587
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler,
|
588
|
+
BOOST_ASIO_MOVE_ARG(Args)... args)
|
589
|
+
{
|
590
|
+
BOOST_ASIO_MOVE_CAST(Initiation)(initiation_)(
|
591
|
+
executor_binder<typename decay<Handler>::type, Executor>(
|
592
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)),
|
593
|
+
BOOST_ASIO_MOVE_CAST(Args)(args)...);
|
594
|
+
}
|
595
|
+
|
596
|
+
template <typename Handler, typename... Args>
|
597
|
+
void operator()(
|
598
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler,
|
599
|
+
BOOST_ASIO_MOVE_ARG(Args)... args) const
|
600
|
+
{
|
601
|
+
initiation_(
|
602
|
+
executor_binder<typename decay<Handler>::type, Executor>(
|
603
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)),
|
604
|
+
BOOST_ASIO_MOVE_CAST(Args)(args)...);
|
605
|
+
}
|
606
|
+
|
607
|
+
#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
608
|
+
|
609
|
+
template <typename Handler>
|
610
|
+
void operator()(
|
611
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler)
|
612
|
+
{
|
613
|
+
BOOST_ASIO_MOVE_CAST(Initiation)(initiation_)(
|
614
|
+
executor_binder<typename decay<Handler>::type, Executor>(
|
615
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)));
|
616
|
+
}
|
617
|
+
|
618
|
+
template <typename Handler>
|
619
|
+
void operator()(
|
620
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler) const
|
621
|
+
{
|
622
|
+
initiation_(
|
623
|
+
executor_binder<typename decay<Handler>::type, Executor>(
|
624
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)));
|
625
|
+
}
|
626
|
+
|
627
|
+
#define BOOST_ASIO_PRIVATE_INIT_WRAPPER_DEF(n) \
|
628
|
+
template <typename Handler, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
|
629
|
+
void operator()( \
|
630
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler, \
|
631
|
+
BOOST_ASIO_VARIADIC_MOVE_PARAMS(n)) \
|
632
|
+
{ \
|
633
|
+
BOOST_ASIO_MOVE_CAST(Initiation)(initiation_)( \
|
634
|
+
executor_binder<typename decay<Handler>::type, Executor>( \
|
635
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)), \
|
636
|
+
BOOST_ASIO_VARIADIC_MOVE_ARGS(n)); \
|
637
|
+
} \
|
638
|
+
\
|
639
|
+
template <typename Handler, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
|
640
|
+
void operator()( \
|
641
|
+
BOOST_ASIO_MOVE_ARG(Handler) handler, \
|
642
|
+
BOOST_ASIO_VARIADIC_MOVE_PARAMS(n)) const \
|
643
|
+
{ \
|
644
|
+
initiation_( \
|
645
|
+
executor_binder<typename decay<Handler>::type, Executor>( \
|
646
|
+
executor_arg_t(), ex_, BOOST_ASIO_MOVE_CAST(Handler)(handler)), \
|
647
|
+
BOOST_ASIO_VARIADIC_MOVE_ARGS(n)); \
|
648
|
+
} \
|
649
|
+
/**/
|
650
|
+
BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_INIT_WRAPPER_DEF)
|
651
|
+
#undef BOOST_ASIO_PRIVATE_INIT_WRAPPER_DEF
|
652
|
+
|
653
|
+
#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
654
|
+
|
655
|
+
Executor ex_;
|
656
|
+
Initiation initiation_;
|
657
|
+
};
|
658
|
+
|
659
|
+
#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
660
|
+
|
661
|
+
template <typename Initiation, typename RawCompletionToken, typename... Args>
|
662
|
+
static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
|
663
|
+
(async_result<T, Signature>::initiate(
|
664
|
+
declval<init_wrapper<typename decay<Initiation>::type> >(),
|
665
|
+
declval<T>(), declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
|
666
|
+
initiate(
|
667
|
+
BOOST_ASIO_MOVE_ARG(Initiation) initiation,
|
668
|
+
BOOST_ASIO_MOVE_ARG(RawCompletionToken) token,
|
669
|
+
BOOST_ASIO_MOVE_ARG(Args)... args)
|
670
|
+
{
|
671
|
+
return async_initiate<T, Signature>(
|
672
|
+
init_wrapper<typename decay<Initiation>::type>(
|
673
|
+
token.get_executor(), BOOST_ASIO_MOVE_CAST(Initiation)(initiation)),
|
674
|
+
token.get(), BOOST_ASIO_MOVE_CAST(Args)(args)...);
|
675
|
+
}
|
676
|
+
|
677
|
+
#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
678
|
+
|
679
|
+
template <typename Initiation, typename RawCompletionToken>
|
680
|
+
static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
|
681
|
+
(async_result<T, Signature>::initiate(
|
682
|
+
declval<init_wrapper<typename decay<Initiation>::type> >(),
|
683
|
+
declval<T>())))
|
684
|
+
initiate(
|
685
|
+
BOOST_ASIO_MOVE_ARG(Initiation) initiation,
|
686
|
+
BOOST_ASIO_MOVE_ARG(RawCompletionToken) token)
|
687
|
+
{
|
688
|
+
return async_initiate<T, Signature>(
|
689
|
+
init_wrapper<typename decay<Initiation>::type>(
|
690
|
+
token.get_executor(), BOOST_ASIO_MOVE_CAST(Initiation)(initiation)),
|
691
|
+
token.get());
|
692
|
+
}
|
693
|
+
|
694
|
+
#define BOOST_ASIO_PRIVATE_INITIATE_DEF(n) \
|
695
|
+
template <typename Initiation, typename RawCompletionToken, \
|
696
|
+
BOOST_ASIO_VARIADIC_TPARAMS(n)> \
|
697
|
+
static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature, \
|
698
|
+
(async_result<T, Signature>::initiate( \
|
699
|
+
declval<init_wrapper<typename decay<Initiation>::type> >(), \
|
700
|
+
declval<T>(), BOOST_ASIO_VARIADIC_MOVE_DECLVAL(n)))) \
|
701
|
+
initiate( \
|
702
|
+
BOOST_ASIO_MOVE_ARG(Initiation) initiation, \
|
703
|
+
BOOST_ASIO_MOVE_ARG(RawCompletionToken) token, \
|
704
|
+
BOOST_ASIO_VARIADIC_MOVE_PARAMS(n)) \
|
705
|
+
{ \
|
706
|
+
return async_initiate<T, Signature>( \
|
707
|
+
init_wrapper<typename decay<Initiation>::type>( \
|
708
|
+
token.get_executor(), BOOST_ASIO_MOVE_CAST(Initiation)(initiation)), \
|
709
|
+
token.get(), BOOST_ASIO_VARIADIC_MOVE_ARGS(n)); \
|
710
|
+
} \
|
711
|
+
/**/
|
712
|
+
BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_INITIATE_DEF)
|
713
|
+
#undef BOOST_ASIO_PRIVATE_INITIATE_DEF
|
714
|
+
|
715
|
+
#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
716
|
+
|
539
717
|
private:
|
540
718
|
async_result(const async_result&) BOOST_ASIO_DELETED;
|
541
719
|
async_result& operator=(const async_result&) BOOST_ASIO_DELETED;
|
@@ -543,15 +721,16 @@ private:
|
|
543
721
|
async_result<T, Signature> target_;
|
544
722
|
};
|
545
723
|
|
546
|
-
template <typename
|
547
|
-
|
724
|
+
template <template <typename, typename> class Associator,
|
725
|
+
typename T, typename Executor, typename DefaultCandidate>
|
726
|
+
struct associator<Associator, executor_binder<T, Executor>, DefaultCandidate>
|
548
727
|
{
|
549
|
-
typedef typename
|
728
|
+
typedef typename Associator<T, DefaultCandidate>::type type;
|
550
729
|
|
551
730
|
static type get(const executor_binder<T, Executor>& b,
|
552
|
-
const
|
731
|
+
const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
|
553
732
|
{
|
554
|
-
return
|
733
|
+
return Associator<T, DefaultCandidate>::get(b.get(), c);
|
555
734
|
}
|
556
735
|
};
|
557
736
|
|
@@ -0,0 +1,361 @@
|
|
1
|
+
//
|
2
|
+
// cancellation_signal.hpp
|
3
|
+
// ~~~~~~~~~~~~~~~~~~~~~~~
|
4
|
+
//
|
5
|
+
// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
6
|
+
//
|
7
|
+
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
8
|
+
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
9
|
+
//
|
10
|
+
|
11
|
+
#ifndef BOOST_ASIO_CANCELLATION_SIGNAL_HPP
|
12
|
+
#define BOOST_ASIO_CANCELLATION_SIGNAL_HPP
|
13
|
+
|
14
|
+
#if defined(_MSC_VER) && (_MSC_VER >= 1200)
|
15
|
+
# pragma once
|
16
|
+
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
|
17
|
+
|
18
|
+
#include <boost/asio/detail/config.hpp>
|
19
|
+
#include <cassert>
|
20
|
+
#include <new>
|
21
|
+
#include <utility>
|
22
|
+
#include <boost/asio/cancellation_type.hpp>
|
23
|
+
#include <boost/asio/detail/cstddef.hpp>
|
24
|
+
#include <boost/asio/detail/thread_context.hpp>
|
25
|
+
#include <boost/asio/detail/thread_info_base.hpp>
|
26
|
+
#include <boost/asio/detail/type_traits.hpp>
|
27
|
+
#include <boost/asio/detail/variadic_templates.hpp>
|
28
|
+
|
29
|
+
#include <boost/asio/detail/push_options.hpp>
|
30
|
+
|
31
|
+
namespace boost {
|
32
|
+
namespace asio {
|
33
|
+
namespace detail {
|
34
|
+
|
35
|
+
class cancellation_handler_base
|
36
|
+
{
|
37
|
+
public:
|
38
|
+
virtual void call(cancellation_type_t) = 0;
|
39
|
+
virtual std::pair<void*, std::size_t> destroy() BOOST_ASIO_NOEXCEPT = 0;
|
40
|
+
|
41
|
+
protected:
|
42
|
+
~cancellation_handler_base() {}
|
43
|
+
};
|
44
|
+
|
45
|
+
template <typename Handler>
|
46
|
+
class cancellation_handler
|
47
|
+
: public cancellation_handler_base
|
48
|
+
{
|
49
|
+
public:
|
50
|
+
#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
51
|
+
template <typename... Args>
|
52
|
+
cancellation_handler(std::size_t size, BOOST_ASIO_MOVE_ARG(Args)... args)
|
53
|
+
: handler_(BOOST_ASIO_MOVE_CAST(Args)(args)...),
|
54
|
+
size_(size)
|
55
|
+
{
|
56
|
+
}
|
57
|
+
#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
58
|
+
cancellation_handler(std::size_t size)
|
59
|
+
: handler_(),
|
60
|
+
size_(size)
|
61
|
+
{
|
62
|
+
}
|
63
|
+
|
64
|
+
#define BOOST_ASIO_PRIVATE_HANDLER_CTOR_DEF(n) \
|
65
|
+
template <BOOST_ASIO_VARIADIC_TPARAMS(n)> \
|
66
|
+
cancellation_handler(std::size_t size, BOOST_ASIO_VARIADIC_MOVE_PARAMS(n)) \
|
67
|
+
: handler_(BOOST_ASIO_VARIADIC_MOVE_ARGS(n)), \
|
68
|
+
size_(size) \
|
69
|
+
{ \
|
70
|
+
} \
|
71
|
+
/**/
|
72
|
+
BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_HANDLER_CTOR_DEF)
|
73
|
+
#undef BOOST_ASIO_PRIVATE_HANDLER_CTOR_DEF
|
74
|
+
#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
75
|
+
|
76
|
+
void call(cancellation_type_t type)
|
77
|
+
{
|
78
|
+
handler_(type);
|
79
|
+
}
|
80
|
+
|
81
|
+
std::pair<void*, std::size_t> destroy() BOOST_ASIO_NOEXCEPT
|
82
|
+
{
|
83
|
+
std::pair<void*, std::size_t> mem(this, size_);
|
84
|
+
this->cancellation_handler::~cancellation_handler();
|
85
|
+
return mem;
|
86
|
+
}
|
87
|
+
|
88
|
+
Handler& handler() BOOST_ASIO_NOEXCEPT
|
89
|
+
{
|
90
|
+
return handler_;
|
91
|
+
}
|
92
|
+
|
93
|
+
private:
|
94
|
+
~cancellation_handler()
|
95
|
+
{
|
96
|
+
}
|
97
|
+
|
98
|
+
Handler handler_;
|
99
|
+
std::size_t size_;
|
100
|
+
};
|
101
|
+
|
102
|
+
} // namespace detail
|
103
|
+
|
104
|
+
class cancellation_slot;
|
105
|
+
|
106
|
+
/// A cancellation signal with a single slot.
|
107
|
+
class cancellation_signal
|
108
|
+
{
|
109
|
+
public:
|
110
|
+
BOOST_ASIO_CONSTEXPR cancellation_signal()
|
111
|
+
: handler_(0)
|
112
|
+
{
|
113
|
+
}
|
114
|
+
|
115
|
+
~cancellation_signal()
|
116
|
+
{
|
117
|
+
if (handler_)
|
118
|
+
{
|
119
|
+
std::pair<void*, std::size_t> mem = handler_->destroy();
|
120
|
+
detail::thread_info_base::deallocate(
|
121
|
+
detail::thread_info_base::cancellation_signal_tag(),
|
122
|
+
detail::thread_context::top_of_thread_call_stack(),
|
123
|
+
mem.first, mem.second);
|
124
|
+
}
|
125
|
+
}
|
126
|
+
|
127
|
+
/// Emits the signal and causes invocation of the slot's handler, if any.
|
128
|
+
void emit(cancellation_type_t type)
|
129
|
+
{
|
130
|
+
if (handler_)
|
131
|
+
handler_->call(type);
|
132
|
+
}
|
133
|
+
|
134
|
+
/// Returns the single slot associated with the signal.
|
135
|
+
/**
|
136
|
+
* The signal object must remain valid for as long the slot may be used.
|
137
|
+
* Destruction of the signal invalidates the slot.
|
138
|
+
*/
|
139
|
+
cancellation_slot slot() BOOST_ASIO_NOEXCEPT;
|
140
|
+
|
141
|
+
private:
|
142
|
+
cancellation_signal(const cancellation_signal&) BOOST_ASIO_DELETED;
|
143
|
+
cancellation_signal& operator=(const cancellation_signal&) BOOST_ASIO_DELETED;
|
144
|
+
|
145
|
+
detail::cancellation_handler_base* handler_;
|
146
|
+
};
|
147
|
+
|
148
|
+
/// A slot associated with a cancellation signal.
|
149
|
+
class cancellation_slot
|
150
|
+
{
|
151
|
+
public:
|
152
|
+
/// Creates a slot that is not connected to any cancellation signal.
|
153
|
+
BOOST_ASIO_CONSTEXPR cancellation_slot()
|
154
|
+
: handler_(0)
|
155
|
+
{
|
156
|
+
}
|
157
|
+
|
158
|
+
#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES) \
|
159
|
+
|| defined(GENERATING_DOCUMENTATION)
|
160
|
+
/// Installs a handler into the slot, constructing the new object directly.
|
161
|
+
/**
|
162
|
+
* Destroys any existing handler in the slot, then installs the new handler,
|
163
|
+
* constructing it with the supplied @c args.
|
164
|
+
*
|
165
|
+
* The handler is a function object to be called when the signal is emitted.
|
166
|
+
* The signature of the handler must be
|
167
|
+
* @code void handler(boost::asio::cancellation_type_t); @endcode
|
168
|
+
*
|
169
|
+
* @param args Arguments to be passed to the @c CancellationHandler object's
|
170
|
+
* constructor.
|
171
|
+
*
|
172
|
+
* @returns A reference to the newly installed handler.
|
173
|
+
*
|
174
|
+
* @note Handlers installed into the slot via @c emplace are not required to
|
175
|
+
* be copy constructible or move constructible.
|
176
|
+
*/
|
177
|
+
template <typename CancellationHandler, typename... Args>
|
178
|
+
CancellationHandler& emplace(BOOST_ASIO_MOVE_ARG(Args)... args)
|
179
|
+
{
|
180
|
+
typedef detail::cancellation_handler<CancellationHandler>
|
181
|
+
cancellation_handler_type;
|
182
|
+
auto_delete_helper del = { prepare_memory(
|
183
|
+
sizeof(cancellation_handler_type),
|
184
|
+
BOOST_ASIO_ALIGNOF(CancellationHandler)) };
|
185
|
+
cancellation_handler_type* handler_obj =
|
186
|
+
new (del.mem.first) cancellation_handler_type(
|
187
|
+
del.mem.second, BOOST_ASIO_MOVE_CAST(Args)(args)...);
|
188
|
+
del.mem.first = 0;
|
189
|
+
*handler_ = handler_obj;
|
190
|
+
return handler_obj->handler();
|
191
|
+
}
|
192
|
+
#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
193
|
+
// || defined(GENERATING_DOCUMENTATION)
|
194
|
+
template <typename CancellationHandler>
|
195
|
+
CancellationHandler& emplace()
|
196
|
+
{
|
197
|
+
typedef detail::cancellation_handler<CancellationHandler>
|
198
|
+
cancellation_handler_type;
|
199
|
+
auto_delete_helper del = { prepare_memory(
|
200
|
+
sizeof(cancellation_handler_type),
|
201
|
+
BOOST_ASIO_ALIGNOF(CancellationHandler)) };
|
202
|
+
cancellation_handler_type* handler_obj =
|
203
|
+
new (del.mem.first) cancellation_handler_type(del.mem.second);
|
204
|
+
del.mem.first = 0;
|
205
|
+
*handler_ = handler_obj;
|
206
|
+
return handler_obj->handler();
|
207
|
+
}
|
208
|
+
|
209
|
+
#define BOOST_ASIO_PRIVATE_HANDLER_EMPLACE_DEF(n) \
|
210
|
+
template <typename CancellationHandler, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
|
211
|
+
CancellationHandler& emplace(BOOST_ASIO_VARIADIC_MOVE_PARAMS(n)) \
|
212
|
+
{ \
|
213
|
+
typedef detail::cancellation_handler<CancellationHandler> \
|
214
|
+
cancellation_handler_type; \
|
215
|
+
auto_delete_helper del = { prepare_memory( \
|
216
|
+
sizeof(cancellation_handler_type), \
|
217
|
+
BOOST_ASIO_ALIGNOF(CancellationHandler)) }; \
|
218
|
+
cancellation_handler_type* handler_obj = \
|
219
|
+
new (del.mem.first) cancellation_handler_type( \
|
220
|
+
del.mem.second, BOOST_ASIO_VARIADIC_MOVE_ARGS(n)); \
|
221
|
+
del.mem.first = 0; \
|
222
|
+
*handler_ = handler_obj; \
|
223
|
+
return handler_obj->handler(); \
|
224
|
+
} \
|
225
|
+
/**/
|
226
|
+
BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_HANDLER_EMPLACE_DEF)
|
227
|
+
#undef BOOST_ASIO_PRIVATE_HANDLER_EMPLACE_DEF
|
228
|
+
#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
|
229
|
+
|
230
|
+
/// Installs a handler into the slot.
|
231
|
+
/**
|
232
|
+
* Destroys any existing handler in the slot, then installs the new handler,
|
233
|
+
* constructing it as a decay-copy of the supplied handler.
|
234
|
+
*
|
235
|
+
* The handler is a function object to be called when the signal is emitted.
|
236
|
+
* The signature of the handler must be
|
237
|
+
* @code void handler(boost::asio::cancellation_type_t); @endcode
|
238
|
+
*
|
239
|
+
* @param handler The handler to be installed.
|
240
|
+
*
|
241
|
+
* @returns A reference to the newly installed handler.
|
242
|
+
*/
|
243
|
+
template <typename CancellationHandler>
|
244
|
+
typename decay<CancellationHandler>::type& assign(
|
245
|
+
BOOST_ASIO_MOVE_ARG(CancellationHandler) handler)
|
246
|
+
{
|
247
|
+
return this->emplace<typename decay<CancellationHandler>::type>(
|
248
|
+
BOOST_ASIO_MOVE_CAST(CancellationHandler)(handler));
|
249
|
+
}
|
250
|
+
|
251
|
+
/// Clears the slot.
|
252
|
+
/**
|
253
|
+
* Destroys any existing handler in the slot.
|
254
|
+
*/
|
255
|
+
void clear()
|
256
|
+
{
|
257
|
+
if (handler_ != 0 && *handler_ != 0)
|
258
|
+
{
|
259
|
+
std::pair<void*, std::size_t> mem = (*handler_)->destroy();
|
260
|
+
detail::thread_info_base::deallocate(
|
261
|
+
detail::thread_info_base::cancellation_signal_tag(),
|
262
|
+
detail::thread_context::top_of_thread_call_stack(),
|
263
|
+
mem.first, mem.second);
|
264
|
+
*handler_ = 0;
|
265
|
+
}
|
266
|
+
}
|
267
|
+
|
268
|
+
/// Returns whether the slot is connected to a signal.
|
269
|
+
BOOST_ASIO_CONSTEXPR bool is_connected() const BOOST_ASIO_NOEXCEPT
|
270
|
+
{
|
271
|
+
return handler_ != 0;
|
272
|
+
}
|
273
|
+
|
274
|
+
/// Returns whether the slot is connected and has an installed handler.
|
275
|
+
BOOST_ASIO_CONSTEXPR bool has_handler() const BOOST_ASIO_NOEXCEPT
|
276
|
+
{
|
277
|
+
return handler_ != 0 && *handler_ != 0;
|
278
|
+
}
|
279
|
+
|
280
|
+
/// Compare two slots for equality.
|
281
|
+
friend BOOST_ASIO_CONSTEXPR bool operator==(const cancellation_slot& lhs,
|
282
|
+
const cancellation_slot& rhs) BOOST_ASIO_NOEXCEPT
|
283
|
+
{
|
284
|
+
return lhs.handler_ == rhs.handler_;
|
285
|
+
}
|
286
|
+
|
287
|
+
/// Compare two slots for inequality.
|
288
|
+
friend BOOST_ASIO_CONSTEXPR bool operator!=(const cancellation_slot& lhs,
|
289
|
+
const cancellation_slot& rhs) BOOST_ASIO_NOEXCEPT
|
290
|
+
{
|
291
|
+
return lhs.handler_ != rhs.handler_;
|
292
|
+
}
|
293
|
+
|
294
|
+
private:
|
295
|
+
friend class cancellation_signal;
|
296
|
+
|
297
|
+
BOOST_ASIO_CONSTEXPR cancellation_slot(int,
|
298
|
+
detail::cancellation_handler_base** handler)
|
299
|
+
: handler_(handler)
|
300
|
+
{
|
301
|
+
}
|
302
|
+
|
303
|
+
std::pair<void*, std::size_t> prepare_memory(
|
304
|
+
std::size_t size, std::size_t align)
|
305
|
+
{
|
306
|
+
assert(handler_);
|
307
|
+
std::pair<void*, std::size_t> mem;
|
308
|
+
if (*handler_)
|
309
|
+
{
|
310
|
+
mem = (*handler_)->destroy();
|
311
|
+
*handler_ = 0;
|
312
|
+
}
|
313
|
+
if (size > mem.second
|
314
|
+
|| reinterpret_cast<std::size_t>(mem.first) % align != 0)
|
315
|
+
{
|
316
|
+
if (mem.first)
|
317
|
+
{
|
318
|
+
detail::thread_info_base::deallocate(
|
319
|
+
detail::thread_info_base::cancellation_signal_tag(),
|
320
|
+
detail::thread_context::top_of_thread_call_stack(),
|
321
|
+
mem.first, mem.second);
|
322
|
+
}
|
323
|
+
mem.first = detail::thread_info_base::allocate(
|
324
|
+
detail::thread_info_base::cancellation_signal_tag(),
|
325
|
+
detail::thread_context::top_of_thread_call_stack(),
|
326
|
+
size, align);
|
327
|
+
mem.second = size;
|
328
|
+
}
|
329
|
+
return mem;
|
330
|
+
}
|
331
|
+
|
332
|
+
struct auto_delete_helper
|
333
|
+
{
|
334
|
+
std::pair<void*, std::size_t> mem;
|
335
|
+
|
336
|
+
~auto_delete_helper()
|
337
|
+
{
|
338
|
+
if (mem.first)
|
339
|
+
{
|
340
|
+
detail::thread_info_base::deallocate(
|
341
|
+
detail::thread_info_base::cancellation_signal_tag(),
|
342
|
+
detail::thread_context::top_of_thread_call_stack(),
|
343
|
+
mem.first, mem.second);
|
344
|
+
}
|
345
|
+
}
|
346
|
+
};
|
347
|
+
|
348
|
+
detail::cancellation_handler_base** handler_;
|
349
|
+
};
|
350
|
+
|
351
|
+
inline cancellation_slot cancellation_signal::slot() BOOST_ASIO_NOEXCEPT
|
352
|
+
{
|
353
|
+
return cancellation_slot(0, &handler_);
|
354
|
+
}
|
355
|
+
|
356
|
+
} // namespace asio
|
357
|
+
} // namespace boost
|
358
|
+
|
359
|
+
#include <boost/asio/detail/pop_options.hpp>
|
360
|
+
|
361
|
+
#endif // BOOST_ASIO_CANCELLATION_SIGNAL_HPP
|