passenger 6.0.11 → 6.0.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (359) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +83 -1
  3. data/CONTRIBUTORS +3 -0
  4. data/bin/passenger-install-nginx-module +1 -1
  5. data/bin/passenger-status +29 -4
  6. data/build/test_basics.rb +2 -2
  7. data/dev/copy_boost_headers +30 -15
  8. data/doc/templates/markdown.html.erb +2 -6
  9. data/package.json +19 -17
  10. data/resources/mime.types +1 -0
  11. data/resources/templates/error_renderer/with_details/dist/bundle.js +2 -33
  12. data/resources/templates/error_renderer/with_details/dist/styles.css +2 -2
  13. data/resources/templates/error_renderer/with_details/src/index.html.template +0 -2
  14. data/resources/templates/error_renderer/with_details/webpack.config.js +13 -16
  15. data/resources/templates/error_renderer/without_details/dist/bundle.js +0 -1
  16. data/resources/templates/error_renderer/without_details/dist/styles.css +1 -1
  17. data/resources/templates/error_renderer/without_details/webpack.config.js +13 -16
  18. data/resources/templates/standalone/server.erb +1 -0
  19. data/src/agent/Core/ApiServer.h +35 -0
  20. data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +1 -0
  21. data/src/agent/Core/ApplicationPool/Options.h +5 -0
  22. data/src/agent/Core/ApplicationPool/Pool.h +9 -1
  23. data/src/agent/Core/Config.h +2 -1
  24. data/src/agent/Core/Controller/CheckoutSession.cpp +24 -13
  25. data/src/agent/Core/Controller/Config.h +6 -2
  26. data/src/agent/Core/Controller/InitRequest.cpp +2 -0
  27. data/src/agent/Core/Controller/InternalUtils.cpp +32 -6
  28. data/src/agent/Core/Controller.h +4 -1
  29. data/src/agent/Core/OptionParser.h +4 -0
  30. data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h +7 -0
  31. data/src/agent/Core/SpawningKit/Config.h +13 -0
  32. data/src/agent/Core/SpawningKit/Handshake/Prepare.h +4 -0
  33. data/src/agent/Core/SpawningKit/Spawner.h +1 -0
  34. data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp +4 -0
  35. data/src/agent/Watchdog/Config.h +2 -1
  36. data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp +5 -0
  37. data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp +5 -0
  38. data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp +18 -0
  39. data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp +3 -0
  40. data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp +3 -0
  41. data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp +11 -0
  42. data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp +7 -0
  43. data/src/apache2_module/DirConfig/AutoGeneratedStruct.h +17 -0
  44. data/src/apache2_module/Hooks.cpp +1 -0
  45. data/src/cxx_supportlib/Constants.h +1 -1
  46. data/src/cxx_supportlib/IOTools/IOUtils.cpp +4 -4
  47. data/src/cxx_supportlib/vendor-modified/boost/align/align.hpp +19 -0
  48. data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp +47 -0
  49. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp +54 -0
  50. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of_forward.hpp +20 -0
  51. data/src/cxx_supportlib/vendor-modified/boost/align/detail/align_cxx11.hpp +21 -0
  52. data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp +52 -0
  53. data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp +41 -0
  54. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of.hpp +31 -0
  55. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of_cxx11.hpp +23 -0
  56. data/src/cxx_supportlib/vendor-modified/boost/align/detail/element_type.hpp +91 -0
  57. data/src/cxx_supportlib/vendor-modified/boost/align/detail/integral_constant.hpp +53 -0
  58. data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp +28 -0
  59. data/src/cxx_supportlib/vendor-modified/boost/align/detail/min_size.hpp +26 -0
  60. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_allocator.hpp +53 -1
  61. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_cancellation_slot.hpp +179 -0
  62. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_executor.hpp +57 -1
  63. data/src/cxx_supportlib/vendor-modified/boost/asio/associator.hpp +37 -0
  64. data/src/cxx_supportlib/vendor-modified/boost/asio/async_result.hpp +789 -106
  65. data/src/cxx_supportlib/vendor-modified/boost/asio/awaitable.hpp +1 -1
  66. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_datagram_socket.hpp +80 -0
  67. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_deadline_timer.hpp +10 -0
  68. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_raw_socket.hpp +80 -0
  69. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_seq_packet_socket.hpp +30 -0
  70. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket.hpp +20 -0
  71. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket_acceptor.hpp +90 -0
  72. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_stream_socket.hpp +60 -0
  73. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_waitable_timer.hpp +10 -0
  74. data/src/cxx_supportlib/vendor-modified/boost/asio/bind_cancellation_slot.hpp +723 -0
  75. data/src/cxx_supportlib/vendor-modified/boost/asio/bind_executor.hpp +191 -12
  76. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_signal.hpp +361 -0
  77. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_state.hpp +237 -0
  78. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_type.hpp +176 -0
  79. data/src/cxx_supportlib/vendor-modified/boost/asio/co_spawn.hpp +30 -2
  80. data/src/cxx_supportlib/vendor-modified/boost/asio/connect.hpp +60 -0
  81. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/base_from_cancellation_state.hpp +165 -0
  82. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/bind_handler.hpp +209 -76
  83. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp +149 -60
  84. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/deadline_timer_service.hpp +40 -0
  85. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/dev_poll_reactor.hpp +8 -4
  86. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/epoll_reactor.hpp +14 -4
  87. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/functional.hpp +6 -0
  88. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_alloc_helpers.hpp +14 -10
  89. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_type_requirements.hpp +21 -18
  90. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_work.hpp +30 -19
  91. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.hpp +8 -0
  92. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.ipp +14 -0
  93. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.hpp +20 -0
  94. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.ipp +30 -0
  95. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.hpp +20 -0
  96. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.ipp +29 -0
  97. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.hpp +24 -0
  98. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.ipp +19 -0
  99. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/strand_executor_service.hpp +3 -1
  100. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/timer_queue_ptime.ipp +6 -0
  101. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/kqueue_reactor.hpp +15 -5
  102. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/memory.hpp +60 -0
  103. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/pop_options.hpp +8 -0
  104. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/push_options.hpp +27 -0
  105. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_descriptor_service.hpp +93 -0
  106. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service.hpp +77 -0
  107. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service_base.hpp +111 -0
  108. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op.hpp +4 -0
  109. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op_queue.hpp +44 -0
  110. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/recycling_allocator.hpp +2 -1
  111. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_endpoint_op.hpp +2 -2
  112. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/select_reactor.hpp +14 -4
  113. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/thread_info_base.hpp +90 -24
  114. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue.hpp +30 -1
  115. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue_ptime.hpp +4 -0
  116. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/wait_op.hpp +5 -1
  117. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/work_dispatcher.hpp +5 -2
  118. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/any_executor.hpp +12 -12
  119. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/bulk_execute.hpp +10 -8
  120. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/connect.hpp +8 -8
  121. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/execute.hpp +7 -7
  122. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/schedule.hpp +7 -7
  123. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_done.hpp +7 -7
  124. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_error.hpp +7 -7
  125. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_value.hpp +13 -13
  126. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/start.hpp +7 -7
  127. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/submit.hpp +8 -8
  128. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/append.hpp +73 -0
  129. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/as_tuple.hpp +133 -0
  130. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/awaitable_operators.hpp +538 -0
  131. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/cancellation_condition.hpp +157 -0
  132. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/coro.hpp +1057 -0
  133. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/deferred.hpp +607 -0
  134. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/completion_handler_erasure.hpp +160 -0
  135. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_promise_allocator.hpp +120 -0
  136. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_traits.hpp +185 -0
  137. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/partial_promise.hpp +181 -0
  138. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/append.hpp +219 -0
  139. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_single.hpp +14 -28
  140. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_tuple.hpp +248 -0
  141. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/deferred.hpp +106 -0
  142. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/parallel_group.hpp +434 -0
  143. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/prepend.hpp +219 -0
  144. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/promise.hpp +100 -0
  145. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/parallel_group.hpp +217 -0
  146. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/prepend.hpp +73 -0
  147. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/promise.hpp +608 -0
  148. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/use_coro.hpp +284 -0
  149. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/awaitable.hpp +344 -20
  150. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_read_stream.hpp +23 -54
  151. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_write_stream.hpp +23 -54
  152. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/co_spawn.hpp +66 -18
  153. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/compose.hpp +55 -5
  154. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/connect.hpp +68 -80
  155. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/defer.hpp +8 -4
  156. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/dispatch.hpp +8 -4
  157. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/handler_alloc_hook.ipp +3 -2
  158. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/post.hpp +8 -4
  159. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read.hpp +98 -113
  160. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_at.hpp +71 -82
  161. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_until.hpp +210 -266
  162. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/redirect_error.hpp +248 -30
  163. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/spawn.hpp +11 -21
  164. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/use_awaitable.hpp +15 -3
  165. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write.hpp +71 -87
  166. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write_at.hpp +46 -68
  167. data/src/cxx_supportlib/vendor-modified/boost/asio/io_context.hpp +4 -4
  168. data/src/cxx_supportlib/vendor-modified/boost/asio/local/detail/impl/endpoint.ipp +2 -7
  169. data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_descriptor.hpp +10 -0
  170. data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_stream_descriptor.hpp +23 -3
  171. data/src/cxx_supportlib/vendor-modified/boost/asio/prefer.hpp +21 -21
  172. data/src/cxx_supportlib/vendor-modified/boost/asio/query.hpp +9 -9
  173. data/src/cxx_supportlib/vendor-modified/boost/asio/read.hpp +88 -0
  174. data/src/cxx_supportlib/vendor-modified/boost/asio/read_at.hpp +44 -0
  175. data/src/cxx_supportlib/vendor-modified/boost/asio/read_until.hpp +132 -0
  176. data/src/cxx_supportlib/vendor-modified/boost/asio/require.hpp +21 -21
  177. data/src/cxx_supportlib/vendor-modified/boost/asio/require_concept.hpp +9 -9
  178. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/buffered_handshake_op.hpp +1 -1
  179. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/engine.hpp +5 -0
  180. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/handshake_op.hpp +1 -1
  181. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/impl/engine.ipp +14 -0
  182. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/io.hpp +36 -27
  183. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/read_op.hpp +1 -1
  184. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/shutdown_op.hpp +2 -2
  185. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/stream_core.hpp +37 -0
  186. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/write_op.hpp +1 -1
  187. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.ipp +14 -7
  188. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/stream.hpp +73 -1
  189. data/src/cxx_supportlib/vendor-modified/boost/asio/system_executor.hpp +4 -4
  190. data/src/cxx_supportlib/vendor-modified/boost/asio/this_coro.hpp +235 -0
  191. data/src/cxx_supportlib/vendor-modified/boost/asio/thread_pool.hpp +4 -4
  192. data/src/cxx_supportlib/vendor-modified/boost/asio/use_awaitable.hpp +7 -10
  193. data/src/cxx_supportlib/vendor-modified/boost/asio/version.hpp +1 -1
  194. data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_random_access_handle.hpp +20 -0
  195. data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_stream_handle.hpp +20 -0
  196. data/src/cxx_supportlib/vendor-modified/boost/asio/write.hpp +88 -0
  197. data/src/cxx_supportlib/vendor-modified/boost/asio/write_at.hpp +44 -0
  198. data/src/cxx_supportlib/vendor-modified/boost/asio.hpp +6 -0
  199. data/src/cxx_supportlib/vendor-modified/boost/atomic/atomic_ref.hpp +14 -1
  200. data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/config.hpp +17 -13
  201. data/src/cxx_supportlib/vendor-modified/boost/atomic/ipc_atomic_ref.hpp +14 -1
  202. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx03.hpp +2 -5
  203. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx11.hpp +2 -5
  204. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx14.hpp +2 -2
  205. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx17.hpp +2 -2
  206. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx20.hpp +56 -0
  207. data/src/cxx_supportlib/vendor-modified/boost/config/auto_link.hpp +1 -5
  208. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/common_edg.hpp +31 -11
  209. data/src/cxx_supportlib/vendor-modified/boost/config/detail/cxx_composite.hpp +20 -4
  210. data/src/cxx_supportlib/vendor-modified/boost/config/detail/select_platform_config.hpp +5 -0
  211. data/src/cxx_supportlib/vendor-modified/boost/config/detail/suffix.hpp +81 -0
  212. data/src/cxx_supportlib/vendor-modified/boost/config/platform/bsd.hpp +5 -8
  213. data/src/cxx_supportlib/vendor-modified/boost/config/platform/wasm.hpp +17 -0
  214. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/dinkumware.hpp +26 -0
  215. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libcpp.hpp +49 -0
  216. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libstdcpp3.hpp +46 -4
  217. data/src/cxx_supportlib/vendor-modified/boost/container/adaptive_pool.hpp +2 -2
  218. data/src/cxx_supportlib/vendor-modified/boost/container/allocator.hpp +1 -1
  219. data/src/cxx_supportlib/vendor-modified/boost/container/detail/adaptive_node_pool.hpp +2 -2
  220. data/src/cxx_supportlib/vendor-modified/boost/container/detail/node_pool.hpp +2 -2
  221. data/src/cxx_supportlib/vendor-modified/boost/container/detail/std_fwd.hpp +3 -0
  222. data/src/cxx_supportlib/vendor-modified/boost/container/devector.hpp +2 -2
  223. data/src/cxx_supportlib/vendor-modified/boost/container/new_allocator.hpp +1 -1
  224. data/src/cxx_supportlib/vendor-modified/boost/container/node_allocator.hpp +1 -1
  225. data/src/cxx_supportlib/vendor-modified/boost/container/pmr/polymorphic_allocator.hpp +6 -6
  226. data/src/cxx_supportlib/vendor-modified/boost/container/static_vector.hpp +4 -4
  227. data/src/cxx_supportlib/vendor-modified/boost/container/throw_exception.hpp +45 -38
  228. data/src/cxx_supportlib/vendor-modified/boost/container/vector.hpp +24 -0
  229. data/src/cxx_supportlib/vendor-modified/boost/core/ignore_unused.hpp +32 -2
  230. data/src/cxx_supportlib/vendor-modified/boost/core/uncaught_exceptions.hpp +7 -7
  231. data/src/cxx_supportlib/vendor-modified/boost/date_time/compiler_config.hpp +0 -24
  232. data/src/cxx_supportlib/vendor-modified/boost/date_time/posix_time/time_parsers.hpp +4 -0
  233. data/src/cxx_supportlib/vendor-modified/boost/intrusive/any_hook.hpp +4 -4
  234. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avl_set.hpp +83 -83
  235. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree.hpp +43 -43
  236. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree_algorithms.hpp +31 -31
  237. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bs_set.hpp +85 -85
  238. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree.hpp +68 -68
  239. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree_algorithms.hpp +72 -62
  240. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_list_algorithms.hpp +19 -20
  241. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_slist_algorithms.hpp +19 -19
  242. data/src/cxx_supportlib/vendor-modified/boost/intrusive/derivation_value_traits.hpp +4 -4
  243. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/any_node_and_algorithms.hpp +2 -2
  244. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/bstree_algorithms_base.hpp +3 -3
  245. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/common_slist_algorithms.hpp +5 -5
  246. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/config_begin.hpp +1 -0
  247. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/generic_hook.hpp +8 -8
  248. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hash_combine.hpp +2 -4
  249. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hashtable_node.hpp +1 -1
  250. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/math.hpp +2 -50
  251. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/node_cloner_disposer.hpp +1 -1
  252. data/src/cxx_supportlib/vendor-modified/boost/intrusive/hashtable.hpp +71 -70
  253. data/src/cxx_supportlib/vendor-modified/boost/intrusive/linear_slist_algorithms.hpp +15 -14
  254. data/src/cxx_supportlib/vendor-modified/boost/intrusive/list.hpp +84 -82
  255. data/src/cxx_supportlib/vendor-modified/boost/intrusive/list_hook.hpp +10 -10
  256. data/src/cxx_supportlib/vendor-modified/boost/intrusive/member_value_traits.hpp +4 -4
  257. data/src/cxx_supportlib/vendor-modified/boost/intrusive/parent_from_member.hpp +2 -2
  258. data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_plus_bits.hpp +4 -4
  259. data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_traits.hpp +18 -18
  260. data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree.hpp +43 -43
  261. data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree_algorithms.hpp +26 -26
  262. data/src/cxx_supportlib/vendor-modified/boost/intrusive/set.hpp +85 -85
  263. data/src/cxx_supportlib/vendor-modified/boost/intrusive/set_hook.hpp +12 -12
  264. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sg_set.hpp +93 -93
  265. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree.hpp +51 -51
  266. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree_algorithms.hpp +24 -24
  267. data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist.hpp +104 -104
  268. data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist_hook.hpp +8 -6
  269. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splay_set.hpp +91 -91
  270. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree.hpp +46 -46
  271. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree_algorithms.hpp +31 -31
  272. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap.hpp +51 -51
  273. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_algorithms.hpp +18 -18
  274. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_set.hpp +97 -97
  275. data/src/cxx_supportlib/vendor-modified/boost/intrusive/trivial_value_traits.hpp +6 -4
  276. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set.hpp +63 -63
  277. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set_hook.hpp +15 -15
  278. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_numeric.hpp +4 -1
  279. data/src/cxx_supportlib/vendor-modified/boost/move/detail/config_begin.hpp +1 -0
  280. data/src/cxx_supportlib/vendor-modified/boost/move/detail/iterator_traits.hpp +1 -0
  281. data/src/cxx_supportlib/vendor-modified/boost/move/detail/nsec_clock.hpp +1 -1
  282. data/src/cxx_supportlib/vendor-modified/boost/operators.hpp +2 -0
  283. data/src/cxx_supportlib/vendor-modified/boost/regex/concepts.hpp +1 -1
  284. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex_parser.hpp +3 -0
  285. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/unicode_iterator.hpp +112 -31
  286. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/basic_regex_parser.hpp +3 -0
  287. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/mem_block_cache.hpp +4 -8
  288. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/unicode_iterator.hpp +0 -2
  289. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/w32_regex_traits.hpp +6 -2
  290. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/shared_count.hpp +1 -1
  291. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_impl.hpp +22 -2
  292. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/shared_ptr.hpp +59 -1
  293. data/src/cxx_supportlib/vendor-modified/boost/system/detail/config.hpp +9 -11
  294. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category.hpp +27 -21
  295. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category_impl.hpp +34 -3
  296. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_code.hpp +378 -36
  297. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_condition.hpp +97 -21
  298. data/src/cxx_supportlib/vendor-modified/boost/system/detail/interop_category.hpp +107 -0
  299. data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_same.hpp +33 -0
  300. data/src/cxx_supportlib/vendor-modified/boost/system/detail/snprintf.hpp +70 -0
  301. data/src/cxx_supportlib/vendor-modified/boost/system/detail/{to_std_category.hpp → std_category.hpp} +5 -55
  302. data/src/cxx_supportlib/vendor-modified/boost/system/detail/system_category_impl.hpp +2 -12
  303. data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +0 -33
  304. data/src/cxx_supportlib/vendor-modified/boost/utility/detail/result_of_variadic.hpp +190 -0
  305. data/src/cxx_supportlib/vendor-modified/boost/utility/result_of.hpp +20 -9
  306. data/src/cxx_supportlib/vendor-modified/boost/utility/string_view.hpp +3 -1
  307. data/src/cxx_supportlib/vendor-modified/boost/version.hpp +2 -2
  308. data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c +16 -0
  309. data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +12 -0
  310. data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +24 -0
  311. data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +10 -0
  312. data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +39 -0
  313. data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +26 -0
  314. data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +6 -0
  315. data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +8 -0
  316. data/src/nginx_module/ngx_http_passenger_module.c +1 -0
  317. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js +50 -29
  318. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js +20 -20
  319. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js +11 -11
  320. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js +3 -3
  321. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js +8 -2
  322. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js +2 -1
  323. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js +174 -146
  324. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/console.js +4 -2
  325. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/file.js +15 -5
  326. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/http.js +14 -4
  327. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports.js +26 -24
  328. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston.js +5 -5
  329. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/package.json +4 -13
  330. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/colors/package.json +19 -33
  331. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/cycle/package.json +11 -29
  332. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/eyes/package.json +12 -40
  333. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/package.json +3 -12
  334. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js +49 -24
  335. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json +4 -16
  336. data/src/nodejs_supportlib/vendor-copy/winston/package.json +11 -55
  337. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +3 -2
  338. data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb +6 -0
  339. data/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb +16 -12
  340. data/src/ruby_supportlib/phusion_passenger/console_text_template.rb +7 -2
  341. data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb +8 -1
  342. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +12 -0
  343. data/src/ruby_supportlib/phusion_passenger/packaging.rb +2 -1
  344. data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb +2 -1
  345. data/src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb +1 -1
  346. data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb +8 -0
  347. data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb +18 -18
  348. data/src/ruby_supportlib/phusion_passenger/request_handler.rb +4 -1
  349. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +7 -1
  350. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +1 -0
  351. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +28 -17
  352. data/src/ruby_supportlib/phusion_passenger.rb +5 -5
  353. metadata +49 -9
  354. data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_generic_value.hpp +0 -125
  355. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js +0 -601
  356. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/webhook.js +0 -146
  357. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/LICENSE +0 -19
  358. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js +0 -136
  359. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json +0 -56
@@ -107,7 +107,7 @@ struct require_result
107
107
 
108
108
  #else // defined(GENERATING_DOCUMENTATION)
109
109
 
110
- namespace asio_require_fn {
110
+ namespace boost_asio_require_fn {
111
111
 
112
112
  using boost::asio::conditional;
113
113
  using boost::asio::decay;
@@ -406,26 +406,26 @@ struct static_instance
406
406
  template <typename T>
407
407
  const T static_instance<T>::instance = {};
408
408
 
409
- } // namespace asio_require_fn
409
+ } // namespace boost_asio_require_fn
410
410
  namespace boost {
411
411
  namespace asio {
412
412
  namespace {
413
413
 
414
- static BOOST_ASIO_CONSTEXPR const asio_require_fn::impl&
415
- require = asio_require_fn::static_instance<>::instance;
414
+ static BOOST_ASIO_CONSTEXPR const boost_asio_require_fn::impl&
415
+ require = boost_asio_require_fn::static_instance<>::instance;
416
416
 
417
417
  } // namespace
418
418
 
419
- typedef asio_require_fn::impl require_t;
419
+ typedef boost_asio_require_fn::impl require_t;
420
420
 
421
421
  #if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
422
422
 
423
423
  template <typename T, typename... Properties>
424
424
  struct can_require :
425
425
  integral_constant<bool,
426
- asio_require_fn::call_traits<
426
+ boost_asio_require_fn::call_traits<
427
427
  require_t, T, void(Properties...)>::overload
428
- != asio_require_fn::ill_formed>
428
+ != boost_asio_require_fn::ill_formed>
429
429
  {
430
430
  };
431
431
 
@@ -435,24 +435,24 @@ template <typename T, typename P0 = void,
435
435
  typename P1 = void, typename P2 = void>
436
436
  struct can_require :
437
437
  integral_constant<bool,
438
- asio_require_fn::call_traits<require_t, T, void(P0, P1, P2)>::overload
439
- != asio_require_fn::ill_formed>
438
+ boost_asio_require_fn::call_traits<require_t, T, void(P0, P1, P2)>::overload
439
+ != boost_asio_require_fn::ill_formed>
440
440
  {
441
441
  };
442
442
 
443
443
  template <typename T, typename P0, typename P1>
444
444
  struct can_require<T, P0, P1> :
445
445
  integral_constant<bool,
446
- asio_require_fn::call_traits<require_t, T, void(P0, P1)>::overload
447
- != asio_require_fn::ill_formed>
446
+ boost_asio_require_fn::call_traits<require_t, T, void(P0, P1)>::overload
447
+ != boost_asio_require_fn::ill_formed>
448
448
  {
449
449
  };
450
450
 
451
451
  template <typename T, typename P0>
452
452
  struct can_require<T, P0> :
453
453
  integral_constant<bool,
454
- asio_require_fn::call_traits<require_t, T, void(P0)>::overload
455
- != asio_require_fn::ill_formed>
454
+ boost_asio_require_fn::call_traits<require_t, T, void(P0)>::overload
455
+ != boost_asio_require_fn::ill_formed>
456
456
  {
457
457
  };
458
458
 
@@ -477,7 +477,7 @@ constexpr bool can_require_v
477
477
  template <typename T, typename... Properties>
478
478
  struct is_nothrow_require :
479
479
  integral_constant<bool,
480
- asio_require_fn::call_traits<
480
+ boost_asio_require_fn::call_traits<
481
481
  require_t, T, void(Properties...)>::is_noexcept>
482
482
  {
483
483
  };
@@ -488,7 +488,7 @@ template <typename T, typename P0 = void,
488
488
  typename P1 = void, typename P2 = void>
489
489
  struct is_nothrow_require :
490
490
  integral_constant<bool,
491
- asio_require_fn::call_traits<
491
+ boost_asio_require_fn::call_traits<
492
492
  require_t, T, void(P0, P1, P2)>::is_noexcept>
493
493
  {
494
494
  };
@@ -496,7 +496,7 @@ struct is_nothrow_require :
496
496
  template <typename T, typename P0, typename P1>
497
497
  struct is_nothrow_require<T, P0, P1> :
498
498
  integral_constant<bool,
499
- asio_require_fn::call_traits<
499
+ boost_asio_require_fn::call_traits<
500
500
  require_t, T, void(P0, P1)>::is_noexcept>
501
501
  {
502
502
  };
@@ -504,7 +504,7 @@ struct is_nothrow_require<T, P0, P1> :
504
504
  template <typename T, typename P0>
505
505
  struct is_nothrow_require<T, P0> :
506
506
  integral_constant<bool,
507
- asio_require_fn::call_traits<
507
+ boost_asio_require_fn::call_traits<
508
508
  require_t, T, void(P0)>::is_noexcept>
509
509
  {
510
510
  };
@@ -530,7 +530,7 @@ constexpr bool is_nothrow_require_v
530
530
  template <typename T, typename... Properties>
531
531
  struct require_result
532
532
  {
533
- typedef typename asio_require_fn::call_traits<
533
+ typedef typename boost_asio_require_fn::call_traits<
534
534
  require_t, T, void(Properties...)>::result_type type;
535
535
  };
536
536
 
@@ -540,21 +540,21 @@ template <typename T, typename P0 = void,
540
540
  typename P1 = void, typename P2 = void>
541
541
  struct require_result
542
542
  {
543
- typedef typename asio_require_fn::call_traits<
543
+ typedef typename boost_asio_require_fn::call_traits<
544
544
  require_t, T, void(P0, P1, P2)>::result_type type;
545
545
  };
546
546
 
547
547
  template <typename T, typename P0, typename P1>
548
548
  struct require_result<T, P0, P1>
549
549
  {
550
- typedef typename asio_require_fn::call_traits<
550
+ typedef typename boost_asio_require_fn::call_traits<
551
551
  require_t, T, void(P0, P1)>::result_type type;
552
552
  };
553
553
 
554
554
  template <typename T, typename P0>
555
555
  struct require_result<T, P0>
556
556
  {
557
- typedef typename asio_require_fn::call_traits<
557
+ typedef typename boost_asio_require_fn::call_traits<
558
558
  require_t, T, void(P0)>::result_type type;
559
559
  };
560
560
 
@@ -107,7 +107,7 @@ struct require_concept_result
107
107
 
108
108
  #else // defined(GENERATING_DOCUMENTATION)
109
109
 
110
- namespace asio_require_concept_fn {
110
+ namespace boost_asio_require_concept_fn {
111
111
 
112
112
  using boost::asio::conditional;
113
113
  using boost::asio::decay;
@@ -294,24 +294,24 @@ struct static_instance
294
294
  template <typename T>
295
295
  const T static_instance<T>::instance = {};
296
296
 
297
- } // namespace asio_require_concept_fn
297
+ } // namespace boost_asio_require_concept_fn
298
298
  namespace boost {
299
299
  namespace asio {
300
300
  namespace {
301
301
 
302
- static BOOST_ASIO_CONSTEXPR const asio_require_concept_fn::impl&
303
- require_concept = asio_require_concept_fn::static_instance<>::instance;
302
+ static BOOST_ASIO_CONSTEXPR const boost_asio_require_concept_fn::impl&
303
+ require_concept = boost_asio_require_concept_fn::static_instance<>::instance;
304
304
 
305
305
  } // namespace
306
306
 
307
- typedef asio_require_concept_fn::impl require_concept_t;
307
+ typedef boost_asio_require_concept_fn::impl require_concept_t;
308
308
 
309
309
  template <typename T, typename Property>
310
310
  struct can_require_concept :
311
311
  integral_constant<bool,
312
- asio_require_concept_fn::call_traits<
312
+ boost_asio_require_concept_fn::call_traits<
313
313
  require_concept_t, T, void(Property)>::overload !=
314
- asio_require_concept_fn::ill_formed>
314
+ boost_asio_require_concept_fn::ill_formed>
315
315
  {
316
316
  };
317
317
 
@@ -326,7 +326,7 @@ constexpr bool can_require_concept_v
326
326
  template <typename T, typename Property>
327
327
  struct is_nothrow_require_concept :
328
328
  integral_constant<bool,
329
- asio_require_concept_fn::call_traits<
329
+ boost_asio_require_concept_fn::call_traits<
330
330
  require_concept_t, T, void(Property)>::is_noexcept>
331
331
  {
332
332
  };
@@ -342,7 +342,7 @@ constexpr bool is_nothrow_require_concept_v
342
342
  template <typename T, typename Property>
343
343
  struct require_concept_result
344
344
  {
345
- typedef typename asio_require_concept_fn::call_traits<
345
+ typedef typename boost_asio_require_concept_fn::call_traits<
346
346
  require_concept_t, T, void(Property)>::result_type type;
347
347
  };
348
348
 
@@ -57,7 +57,7 @@ public:
57
57
  const boost::system::error_code& ec,
58
58
  const std::size_t& bytes_transferred) const
59
59
  {
60
- handler(ec, bytes_transferred);
60
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(ec, bytes_transferred);
61
61
  }
62
62
 
63
63
  private:
@@ -67,6 +67,11 @@ public:
67
67
  // Destructor.
68
68
  BOOST_ASIO_DECL ~engine();
69
69
 
70
+ #if defined(BOOST_ASIO_HAS_MOVE)
71
+ // Move assign from another engine.
72
+ BOOST_ASIO_DECL engine& operator=(engine&& other) BOOST_ASIO_NOEXCEPT;
73
+ #endif // defined(BOOST_ASIO_HAS_MOVE)
74
+
70
75
  // Get the underlying implementation in the native type.
71
76
  BOOST_ASIO_DECL SSL* native_handle();
72
77
 
@@ -52,7 +52,7 @@ public:
52
52
  const boost::system::error_code& ec,
53
53
  const std::size_t&) const
54
54
  {
55
- handler(ec);
55
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(ec);
56
56
  }
57
57
 
58
58
  private:
@@ -81,6 +81,20 @@ engine::~engine()
81
81
  ::SSL_free(ssl_);
82
82
  }
83
83
 
84
+ #if defined(BOOST_ASIO_HAS_MOVE)
85
+ engine& engine::operator=(engine&& other) BOOST_ASIO_NOEXCEPT
86
+ {
87
+ if (this != &other)
88
+ {
89
+ ssl_ = other.ssl_;
90
+ ext_bio_ = other.ext_bio_;
91
+ other.ssl_ = 0;
92
+ other.ext_bio_ = 0;
93
+ }
94
+ return *this;
95
+ }
96
+ #endif // defined(BOOST_ASIO_HAS_MOVE)
97
+
84
98
  SSL* engine::native_handle()
85
99
  {
86
100
  return ssl_;
@@ -17,6 +17,7 @@
17
17
 
18
18
  #include <boost/asio/detail/config.hpp>
19
19
 
20
+ #include <boost/asio/detail/base_from_cancellation_state.hpp>
20
21
  #include <boost/asio/detail/handler_tracking.hpp>
21
22
  #include <boost/asio/ssl/detail/engine.hpp>
22
23
  #include <boost/asio/ssl/detail/stream_core.hpp>
@@ -95,11 +96,13 @@ std::size_t io(Stream& next_layer, stream_core& core,
95
96
 
96
97
  template <typename Stream, typename Operation, typename Handler>
97
98
  class io_op
99
+ : public boost::asio::detail::base_from_cancellation_state<Handler>
98
100
  {
99
101
  public:
100
102
  io_op(Stream& next_layer, stream_core& core,
101
103
  const Operation& op, Handler& handler)
102
- : next_layer_(next_layer),
104
+ : boost::asio::detail::base_from_cancellation_state<Handler>(handler),
105
+ next_layer_(next_layer),
103
106
  core_(core),
104
107
  op_(op),
105
108
  start_(0),
@@ -111,7 +114,8 @@ public:
111
114
 
112
115
  #if defined(BOOST_ASIO_HAS_MOVE)
113
116
  io_op(const io_op& other)
114
- : next_layer_(other.next_layer_),
117
+ : boost::asio::detail::base_from_cancellation_state<Handler>(other),
118
+ next_layer_(other.next_layer_),
115
119
  core_(other.core_),
116
120
  op_(other.op_),
117
121
  start_(other.start_),
@@ -123,7 +127,11 @@ public:
123
127
  }
124
128
 
125
129
  io_op(io_op&& other)
126
- : next_layer_(other.next_layer_),
130
+ : boost::asio::detail::base_from_cancellation_state<Handler>(
131
+ BOOST_ASIO_MOVE_CAST(
132
+ boost::asio::detail::base_from_cancellation_state<Handler>)(
133
+ other)),
134
+ next_layer_(other.next_layer_),
127
135
  core_(other.core_),
128
136
  op_(BOOST_ASIO_MOVE_CAST(Operation)(other.op_)),
129
137
  start_(other.start_),
@@ -263,6 +271,13 @@ public:
263
271
  // Release any waiting read operations.
264
272
  core_.pending_read_.expires_at(core_.neg_infin());
265
273
 
274
+ // Check for cancellation before continuing.
275
+ if (this->cancelled() != cancellation_type::none)
276
+ {
277
+ ec_ = boost::asio::error::operation_aborted;
278
+ break;
279
+ }
280
+
266
281
  // Try the operation again.
267
282
  continue;
268
283
 
@@ -271,6 +286,13 @@ public:
271
286
  // Release any waiting write operations.
272
287
  core_.pending_write_.expires_at(core_.neg_infin());
273
288
 
289
+ // Check for cancellation before continuing.
290
+ if (this->cancelled() != cancellation_type::none)
291
+ {
292
+ ec_ = boost::asio::error::operation_aborted;
293
+ break;
294
+ }
295
+
274
296
  // Try the operation again.
275
297
  continue;
276
298
 
@@ -381,32 +403,19 @@ inline void async_io(Stream& next_layer, stream_core& core,
381
403
  } // namespace detail
382
404
  } // namespace ssl
383
405
 
384
- template <typename Stream, typename Operation,
385
- typename Handler, typename Allocator>
386
- struct associated_allocator<
387
- ssl::detail::io_op<Stream, Operation, Handler>, Allocator>
406
+ template <template <typename, typename> class Associator,
407
+ typename Stream, typename Operation,
408
+ typename Handler, typename DefaultCandidate>
409
+ struct associator<Associator,
410
+ ssl::detail::io_op<Stream, Operation, Handler>,
411
+ DefaultCandidate>
412
+ : Associator<Handler, DefaultCandidate>
388
413
  {
389
- typedef typename associated_allocator<Handler, Allocator>::type type;
390
-
391
- static type get(const ssl::detail::io_op<Stream, Operation, Handler>& h,
392
- const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT
393
- {
394
- return associated_allocator<Handler, Allocator>::get(h.handler_, a);
395
- }
396
- };
397
-
398
- template <typename Stream, typename Operation,
399
- typename Handler, typename Executor>
400
- struct associated_executor<
401
- ssl::detail::io_op<Stream, Operation, Handler>, Executor>
402
- : detail::associated_executor_forwarding_base<Handler, Executor>
403
- {
404
- typedef typename associated_executor<Handler, Executor>::type type;
405
-
406
- static type get(const ssl::detail::io_op<Stream, Operation, Handler>& h,
407
- const Executor& ex = Executor()) BOOST_ASIO_NOEXCEPT
414
+ static typename Associator<Handler, DefaultCandidate>::type get(
415
+ const ssl::detail::io_op<Stream, Operation, Handler>& h,
416
+ const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
408
417
  {
409
- return associated_executor<Handler, Executor>::get(h.handler_, ex);
418
+ return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
410
419
  }
411
420
  };
412
421
 
@@ -57,7 +57,7 @@ public:
57
57
  const boost::system::error_code& ec,
58
58
  const std::size_t& bytes_transferred) const
59
59
  {
60
- handler(ec, bytes_transferred);
60
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(ec, bytes_transferred);
61
61
  }
62
62
 
63
63
  private:
@@ -52,11 +52,11 @@ public:
52
52
  // The engine only generates an eof when the shutdown notification has
53
53
  // been received from the peer. This indicates that the shutdown has
54
54
  // completed successfully, and thus need not be passed on to the handler.
55
- handler(boost::system::error_code());
55
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(boost::system::error_code());
56
56
  }
57
57
  else
58
58
  {
59
- handler(ec);
59
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(ec);
60
60
  }
61
61
  }
62
62
  };
@@ -90,6 +90,43 @@ struct stream_core
90
90
  {
91
91
  }
92
92
 
93
+ #if defined(BOOST_ASIO_HAS_MOVE)
94
+ stream_core& operator=(stream_core&& other)
95
+ {
96
+ if (this != &other)
97
+ {
98
+ engine_ = BOOST_ASIO_MOVE_CAST(engine)(other.engine_);
99
+ #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
100
+ pending_read_ =
101
+ BOOST_ASIO_MOVE_CAST(boost::asio::deadline_timer)(
102
+ other.pending_read_);
103
+ pending_write_ =
104
+ BOOST_ASIO_MOVE_CAST(boost::asio::deadline_timer)(
105
+ other.pending_write_);
106
+ #else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
107
+ pending_read_ =
108
+ BOOST_ASIO_MOVE_CAST(boost::asio::steady_timer)(
109
+ other.pending_read_);
110
+ pending_write_ =
111
+ BOOST_ASIO_MOVE_CAST(boost::asio::steady_timer)(
112
+ other.pending_write_);
113
+ #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
114
+ output_buffer_space_ =
115
+ BOOST_ASIO_MOVE_CAST(std::vector<unsigned char>)(
116
+ other.output_buffer_space_);
117
+ output_buffer_ = other.output_buffer_;
118
+ input_buffer_space_ =
119
+ BOOST_ASIO_MOVE_CAST(std::vector<unsigned char>)(
120
+ other.input_buffer_space_);
121
+ input_ = other.input_;
122
+ other.output_buffer_ = boost::asio::mutable_buffer(0, 0);
123
+ other.input_buffer_ = boost::asio::mutable_buffer(0, 0);
124
+ other.input_ = boost::asio::const_buffer(0, 0);
125
+ }
126
+ return *this;
127
+ }
128
+ #endif // defined(BOOST_ASIO_HAS_MOVE)
129
+
93
130
  // The SSL engine.
94
131
  engine engine_;
95
132
 
@@ -61,7 +61,7 @@ public:
61
61
  const boost::system::error_code& ec,
62
62
  const std::size_t& bytes_transferred) const
63
63
  {
64
- handler(ec, bytes_transferred);
64
+ BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler)(ec, bytes_transferred);
65
65
  }
66
66
 
67
67
  private:
@@ -398,7 +398,8 @@ context::~context()
398
398
  if (handle_)
399
399
  {
400
400
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
401
- && !defined(LIBRESSL_VERSION_NUMBER)) \
401
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
402
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
402
403
  || defined(BOOST_ASIO_USE_WOLFSSL)
403
404
  void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
404
405
  #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
@@ -411,7 +412,8 @@ context::~context()
411
412
  cb_userdata);
412
413
  delete callback;
413
414
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
414
- && !defined(LIBRESSL_VERSION_NUMBER)) \
415
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
416
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
415
417
  || defined(BOOST_ASIO_USE_WOLFSSL)
416
418
  ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
417
419
  #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
@@ -760,7 +762,8 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain(
760
762
  if (bio.p)
761
763
  {
762
764
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
763
- && !defined(LIBRESSL_VERSION_NUMBER)) \
765
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
766
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
764
767
  || defined(BOOST_ASIO_USE_WOLFSSL)
765
768
  pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
766
769
  void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -789,7 +792,8 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain(
789
792
  }
790
793
 
791
794
  #if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
792
- && !defined(LIBRESSL_VERSION_NUMBER)) \
795
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
796
+ || LIBRESSL_VERSION_NUMBER >= 0x2090100fL)) \
793
797
  || defined(BOOST_ASIO_USE_WOLFSSL)
794
798
  ::SSL_CTX_clear_chain_certs(handle_);
795
799
  #else
@@ -868,7 +872,8 @@ BOOST_ASIO_SYNC_OP_VOID context::use_private_key(
868
872
  ::ERR_clear_error();
869
873
 
870
874
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
871
- && !defined(LIBRESSL_VERSION_NUMBER)) \
875
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
876
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
872
877
  || defined(BOOST_ASIO_USE_WOLFSSL)
873
878
  pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
874
879
  void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -937,7 +942,8 @@ BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key(
937
942
  ::ERR_clear_error();
938
943
 
939
944
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
940
- && !defined(LIBRESSL_VERSION_NUMBER)) \
945
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
946
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
941
947
  || defined(BOOST_ASIO_USE_WOLFSSL)
942
948
  pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
943
949
  void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -1178,7 +1184,8 @@ BOOST_ASIO_SYNC_OP_VOID context::do_set_password_callback(
1178
1184
  detail::password_callback_base* callback, boost::system::error_code& ec)
1179
1185
  {
1180
1186
  #if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
1181
- && !defined(LIBRESSL_VERSION_NUMBER)) \
1187
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
1188
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)) \
1182
1189
  || defined(BOOST_ASIO_USE_WOLFSSL)
1183
1190
  void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
1184
1191
  ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
@@ -116,13 +116,30 @@ public:
116
116
  * @param other The other stream object from which the move will occur. Must
117
117
  * have no outstanding asynchronous operations associated with it. Following
118
118
  * the move, @c other has a valid but unspecified state where the only safe
119
- * operation is destruction.
119
+ * operation is destruction, or use as the target of a move assignment.
120
120
  */
121
121
  stream(stream&& other)
122
122
  : next_layer_(BOOST_ASIO_MOVE_CAST(Stream)(other.next_layer_)),
123
123
  core_(BOOST_ASIO_MOVE_CAST(detail::stream_core)(other.core_))
124
124
  {
125
125
  }
126
+
127
+ /// Move-assign a stream from another.
128
+ /**
129
+ * @param other The other stream object from which the move will occur. Must
130
+ * have no outstanding asynchronous operations associated with it. Following
131
+ * the move, @c other has a valid but unspecified state where the only safe
132
+ * operation is destruction, or use as the target of a move assignment.
133
+ */
134
+ stream& operator=(stream&& other)
135
+ {
136
+ if (this != &other)
137
+ {
138
+ next_layer_ = BOOST_ASIO_MOVE_CAST(Stream)(other.next_layer_);
139
+ core_ = BOOST_ASIO_MOVE_CAST(detail::stream_core)(other.core_);
140
+ }
141
+ return *this;
142
+ }
126
143
  #endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
127
144
 
128
145
  /// Destructor.
@@ -445,6 +462,17 @@ public:
445
462
  * @code void handler(
446
463
  * const boost::system::error_code& error // Result of operation.
447
464
  * ); @endcode
465
+ *
466
+ * @par Per-Operation Cancellation
467
+ * This asynchronous operation supports cancellation for the following
468
+ * boost::asio::cancellation_type values:
469
+ *
470
+ * @li @c cancellation_type::terminal
471
+ *
472
+ * @li @c cancellation_type::partial
473
+ *
474
+ * if they are also supported by the @c Stream type's @c async_read_some and
475
+ * @c async_write_some operations.
448
476
  */
449
477
  template <
450
478
  BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
@@ -481,6 +509,17 @@ public:
481
509
  * const boost::system::error_code& error, // Result of operation.
482
510
  * std::size_t bytes_transferred // Amount of buffers used in handshake.
483
511
  * ); @endcode
512
+ *
513
+ * @par Per-Operation Cancellation
514
+ * This asynchronous operation supports cancellation for the following
515
+ * boost::asio::cancellation_type values:
516
+ *
517
+ * @li @c cancellation_type::terminal
518
+ *
519
+ * @li @c cancellation_type::partial
520
+ *
521
+ * if they are also supported by the @c Stream type's @c async_read_some and
522
+ * @c async_write_some operations.
484
523
  */
485
524
  template <typename ConstBufferSequence,
486
525
  BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
@@ -535,6 +574,17 @@ public:
535
574
  * @code void handler(
536
575
  * const boost::system::error_code& error // Result of operation.
537
576
  * ); @endcode
577
+ *
578
+ * @par Per-Operation Cancellation
579
+ * This asynchronous operation supports cancellation for the following
580
+ * boost::asio::cancellation_type values:
581
+ *
582
+ * @li @c cancellation_type::terminal
583
+ *
584
+ * @li @c cancellation_type::partial
585
+ *
586
+ * if they are also supported by the @c Stream type's @c async_read_some and
587
+ * @c async_write_some operations.
538
588
  */
539
589
  template <
540
590
  BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
@@ -622,6 +672,17 @@ public:
622
672
  * the peer. Consider using the @ref async_write function if you need to
623
673
  * ensure that all data is written before the asynchronous operation
624
674
  * completes.
675
+ *
676
+ * @par Per-Operation Cancellation
677
+ * This asynchronous operation supports cancellation for the following
678
+ * boost::asio::cancellation_type values:
679
+ *
680
+ * @li @c cancellation_type::terminal
681
+ *
682
+ * @li @c cancellation_type::partial
683
+ *
684
+ * if they are also supported by the @c Stream type's @c async_read_some and
685
+ * @c async_write_some operations.
625
686
  */
626
687
  template <typename ConstBufferSequence,
627
688
  BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
@@ -709,6 +770,17 @@ public:
709
770
  * number of bytes. Consider using the @ref async_read function if you need to
710
771
  * ensure that the requested amount of data is read before the asynchronous
711
772
  * operation completes.
773
+ *
774
+ * @par Per-Operation Cancellation
775
+ * This asynchronous operation supports cancellation for the following
776
+ * boost::asio::cancellation_type values:
777
+ *
778
+ * @li @c cancellation_type::terminal
779
+ *
780
+ * @li @c cancellation_type::partial
781
+ *
782
+ * if they are also supported by the @c Stream type's @c async_read_some and
783
+ * @c async_write_some operations.
712
784
  */
713
785
  template <typename MutableBufferSequence,
714
786
  BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
@@ -47,8 +47,8 @@ public:
47
47
 
48
48
  #if !defined(GENERATING_DOCUMENTATION)
49
49
  private:
50
- friend struct asio_require_fn::impl;
51
- friend struct asio_prefer_fn::impl;
50
+ friend struct boost_asio_require_fn::impl;
51
+ friend struct boost_asio_prefer_fn::impl;
52
52
  #endif // !defined(GENERATING_DOCUMENTATION)
53
53
 
54
54
  /// Obtain an executor with the @c blocking.possibly property.
@@ -178,7 +178,7 @@ private:
178
178
 
179
179
  #if !defined(GENERATING_DOCUMENTATION)
180
180
  private:
181
- friend struct asio_query_fn::impl;
181
+ friend struct boost_asio_query_fn::impl;
182
182
  friend struct boost::asio::execution::detail::blocking_t<0>;
183
183
  friend struct boost::asio::execution::detail::mapping_t<0>;
184
184
  friend struct boost::asio::execution::detail::outstanding_work_t<0>;
@@ -317,7 +317,7 @@ public:
317
317
 
318
318
  #if !defined(GENERATING_DOCUMENTATION)
319
319
  private:
320
- friend struct asio_execution_execute_fn::impl;
320
+ friend struct boost_asio_execution_execute_fn::impl;
321
321
  #endif // !defined(GENERATING_DOCUMENTATION)
322
322
 
323
323
  /// Execution function.