passenger 6.0.10 → 6.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (448) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +84 -1
  3. data/CONTRIBUTORS +4 -0
  4. data/bin/passenger-install-nginx-module +2 -1
  5. data/build/common_library.rb +1 -1
  6. data/dev/copy_boost_headers +48 -16
  7. data/dev/index_cxx_dependencies.rb +1 -1
  8. data/dev/webpacketpp.patch +39 -0
  9. data/package.json +1 -1
  10. data/resources/mime.types +1 -0
  11. data/resources/templates/standalone/server.erb +1 -0
  12. data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +1 -0
  13. data/src/agent/Core/ApplicationPool/Options.h +5 -0
  14. data/src/agent/Core/Config.h +1 -1
  15. data/src/agent/Core/Controller/CheckoutSession.cpp +24 -13
  16. data/src/agent/Core/Controller/Config.h +5 -2
  17. data/src/agent/Core/Controller/InitRequest.cpp +2 -0
  18. data/src/agent/Core/Controller/InternalUtils.cpp +32 -6
  19. data/src/agent/Core/Controller.h +4 -1
  20. data/src/agent/Core/OptionParser.h +4 -0
  21. data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h +7 -0
  22. data/src/agent/Core/SpawningKit/Config.h +13 -0
  23. data/src/agent/Core/SpawningKit/Handshake/Prepare.h +4 -0
  24. data/src/agent/Core/SpawningKit/Spawner.h +1 -0
  25. data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp +4 -0
  26. data/src/agent/Watchdog/Config.h +1 -1
  27. data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp +5 -0
  28. data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp +5 -0
  29. data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp +18 -0
  30. data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp +3 -0
  31. data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp +3 -0
  32. data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp +11 -0
  33. data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp +7 -0
  34. data/src/apache2_module/DirConfig/AutoGeneratedStruct.h +17 -0
  35. data/src/apache2_module/Hooks.cpp +1 -0
  36. data/src/cxx_supportlib/Constants.h +1 -1
  37. data/src/cxx_supportlib/IOTools/IOUtils.cpp +4 -4
  38. data/src/cxx_supportlib/vendor-modified/boost/align/align.hpp +19 -0
  39. data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp +47 -0
  40. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp +54 -0
  41. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of_forward.hpp +20 -0
  42. data/src/cxx_supportlib/vendor-modified/boost/align/detail/align_cxx11.hpp +21 -0
  43. data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp +52 -0
  44. data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp +41 -0
  45. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of.hpp +31 -0
  46. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of_cxx11.hpp +23 -0
  47. data/src/cxx_supportlib/vendor-modified/boost/align/detail/element_type.hpp +91 -0
  48. data/src/cxx_supportlib/vendor-modified/boost/align/detail/integral_constant.hpp +53 -0
  49. data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp +28 -0
  50. data/src/cxx_supportlib/vendor-modified/boost/align/detail/min_size.hpp +26 -0
  51. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_allocator.hpp +53 -1
  52. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_cancellation_slot.hpp +179 -0
  53. data/src/cxx_supportlib/vendor-modified/boost/asio/associated_executor.hpp +57 -1
  54. data/src/cxx_supportlib/vendor-modified/boost/asio/associator.hpp +37 -0
  55. data/src/cxx_supportlib/vendor-modified/boost/asio/async_result.hpp +789 -106
  56. data/src/cxx_supportlib/vendor-modified/boost/asio/awaitable.hpp +1 -1
  57. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_datagram_socket.hpp +80 -0
  58. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_deadline_timer.hpp +10 -0
  59. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_raw_socket.hpp +80 -0
  60. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_seq_packet_socket.hpp +30 -0
  61. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket.hpp +20 -0
  62. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket_acceptor.hpp +90 -0
  63. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_stream_socket.hpp +60 -0
  64. data/src/cxx_supportlib/vendor-modified/boost/asio/basic_waitable_timer.hpp +10 -0
  65. data/src/cxx_supportlib/vendor-modified/boost/asio/bind_cancellation_slot.hpp +723 -0
  66. data/src/cxx_supportlib/vendor-modified/boost/asio/bind_executor.hpp +191 -12
  67. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_signal.hpp +361 -0
  68. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_state.hpp +237 -0
  69. data/src/cxx_supportlib/vendor-modified/boost/asio/cancellation_type.hpp +176 -0
  70. data/src/cxx_supportlib/vendor-modified/boost/asio/co_spawn.hpp +30 -2
  71. data/src/cxx_supportlib/vendor-modified/boost/asio/connect.hpp +60 -0
  72. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/base_from_cancellation_state.hpp +165 -0
  73. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/bind_handler.hpp +209 -76
  74. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp +149 -60
  75. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/deadline_timer_service.hpp +40 -0
  76. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/dev_poll_reactor.hpp +8 -4
  77. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/epoll_reactor.hpp +14 -4
  78. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/functional.hpp +6 -0
  79. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_alloc_helpers.hpp +14 -10
  80. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_type_requirements.hpp +21 -18
  81. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/handler_work.hpp +30 -19
  82. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.hpp +8 -0
  83. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/dev_poll_reactor.ipp +14 -0
  84. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.hpp +20 -0
  85. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/epoll_reactor.ipp +30 -0
  86. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.hpp +20 -0
  87. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/kqueue_reactor.ipp +29 -0
  88. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.hpp +24 -0
  89. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/select_reactor.ipp +19 -0
  90. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/strand_executor_service.hpp +3 -1
  91. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/timer_queue_ptime.ipp +6 -0
  92. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/kqueue_reactor.hpp +15 -5
  93. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/memory.hpp +60 -0
  94. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/pop_options.hpp +8 -0
  95. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/push_options.hpp +27 -0
  96. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_descriptor_service.hpp +93 -0
  97. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service.hpp +77 -0
  98. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_socket_service_base.hpp +111 -0
  99. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op.hpp +4 -0
  100. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op_queue.hpp +44 -0
  101. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/recycling_allocator.hpp +2 -1
  102. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_endpoint_op.hpp +2 -2
  103. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/select_reactor.hpp +14 -4
  104. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/thread_info_base.hpp +90 -24
  105. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue.hpp +30 -1
  106. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue_ptime.hpp +4 -0
  107. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/wait_op.hpp +5 -1
  108. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/work_dispatcher.hpp +5 -2
  109. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/any_executor.hpp +12 -12
  110. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/bulk_execute.hpp +10 -8
  111. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/connect.hpp +8 -8
  112. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/execute.hpp +7 -7
  113. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/schedule.hpp +7 -7
  114. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_done.hpp +7 -7
  115. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_error.hpp +7 -7
  116. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/set_value.hpp +13 -13
  117. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/start.hpp +7 -7
  118. data/src/cxx_supportlib/vendor-modified/boost/asio/execution/submit.hpp +8 -8
  119. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/append.hpp +73 -0
  120. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/as_tuple.hpp +133 -0
  121. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/awaitable_operators.hpp +538 -0
  122. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/cancellation_condition.hpp +157 -0
  123. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/coro.hpp +1057 -0
  124. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/deferred.hpp +607 -0
  125. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/completion_handler_erasure.hpp +160 -0
  126. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_promise_allocator.hpp +120 -0
  127. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/coro_traits.hpp +185 -0
  128. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/detail/partial_promise.hpp +181 -0
  129. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/append.hpp +219 -0
  130. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_single.hpp +14 -28
  131. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/as_tuple.hpp +248 -0
  132. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/deferred.hpp +106 -0
  133. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/parallel_group.hpp +434 -0
  134. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/prepend.hpp +219 -0
  135. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/impl/promise.hpp +100 -0
  136. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/parallel_group.hpp +217 -0
  137. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/prepend.hpp +73 -0
  138. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/promise.hpp +608 -0
  139. data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/use_coro.hpp +284 -0
  140. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/awaitable.hpp +344 -20
  141. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_read_stream.hpp +23 -54
  142. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/buffered_write_stream.hpp +23 -54
  143. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/co_spawn.hpp +66 -18
  144. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/compose.hpp +55 -5
  145. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/connect.hpp +68 -80
  146. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/defer.hpp +8 -4
  147. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/dispatch.hpp +8 -4
  148. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/handler_alloc_hook.ipp +3 -2
  149. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/post.hpp +8 -4
  150. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read.hpp +98 -113
  151. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_at.hpp +71 -82
  152. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_until.hpp +210 -266
  153. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/redirect_error.hpp +248 -30
  154. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/spawn.hpp +11 -21
  155. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/use_awaitable.hpp +15 -3
  156. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write.hpp +71 -87
  157. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/write_at.hpp +46 -68
  158. data/src/cxx_supportlib/vendor-modified/boost/asio/io_context.hpp +4 -4
  159. data/src/cxx_supportlib/vendor-modified/boost/asio/local/detail/impl/endpoint.ipp +2 -7
  160. data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_descriptor.hpp +10 -0
  161. data/src/cxx_supportlib/vendor-modified/boost/asio/posix/basic_stream_descriptor.hpp +23 -3
  162. data/src/cxx_supportlib/vendor-modified/boost/asio/prefer.hpp +21 -21
  163. data/src/cxx_supportlib/vendor-modified/boost/asio/query.hpp +9 -9
  164. data/src/cxx_supportlib/vendor-modified/boost/asio/read.hpp +88 -0
  165. data/src/cxx_supportlib/vendor-modified/boost/asio/read_at.hpp +44 -0
  166. data/src/cxx_supportlib/vendor-modified/boost/asio/read_until.hpp +132 -0
  167. data/src/cxx_supportlib/vendor-modified/boost/asio/require.hpp +21 -21
  168. data/src/cxx_supportlib/vendor-modified/boost/asio/require_concept.hpp +9 -9
  169. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/buffered_handshake_op.hpp +1 -1
  170. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/engine.hpp +5 -0
  171. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/handshake_op.hpp +1 -1
  172. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/impl/engine.ipp +14 -0
  173. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/io.hpp +36 -27
  174. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/read_op.hpp +1 -1
  175. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/shutdown_op.hpp +2 -2
  176. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/stream_core.hpp +37 -0
  177. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/write_op.hpp +1 -1
  178. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.ipp +14 -7
  179. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/stream.hpp +73 -1
  180. data/src/cxx_supportlib/vendor-modified/boost/asio/system_executor.hpp +4 -4
  181. data/src/cxx_supportlib/vendor-modified/boost/asio/this_coro.hpp +235 -0
  182. data/src/cxx_supportlib/vendor-modified/boost/asio/thread_pool.hpp +4 -4
  183. data/src/cxx_supportlib/vendor-modified/boost/asio/use_awaitable.hpp +7 -10
  184. data/src/cxx_supportlib/vendor-modified/boost/asio/version.hpp +1 -1
  185. data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_random_access_handle.hpp +20 -0
  186. data/src/cxx_supportlib/vendor-modified/boost/asio/windows/basic_stream_handle.hpp +20 -0
  187. data/src/cxx_supportlib/vendor-modified/boost/asio/write.hpp +88 -0
  188. data/src/cxx_supportlib/vendor-modified/boost/asio/write_at.hpp +44 -0
  189. data/src/cxx_supportlib/vendor-modified/boost/asio.hpp +6 -0
  190. data/src/cxx_supportlib/vendor-modified/boost/atomic/atomic_ref.hpp +14 -1
  191. data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/config.hpp +17 -13
  192. data/src/cxx_supportlib/vendor-modified/boost/atomic/ipc_atomic_ref.hpp +14 -1
  193. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx03.hpp +2 -5
  194. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx11.hpp +2 -5
  195. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx14.hpp +2 -2
  196. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx17.hpp +2 -2
  197. data/src/cxx_supportlib/vendor-modified/boost/config/assert_cxx20.hpp +56 -0
  198. data/src/cxx_supportlib/vendor-modified/boost/config/auto_link.hpp +1 -5
  199. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/common_edg.hpp +31 -11
  200. data/src/cxx_supportlib/vendor-modified/boost/config/detail/cxx_composite.hpp +20 -4
  201. data/src/cxx_supportlib/vendor-modified/boost/config/detail/select_platform_config.hpp +5 -0
  202. data/src/cxx_supportlib/vendor-modified/boost/config/detail/suffix.hpp +81 -0
  203. data/src/cxx_supportlib/vendor-modified/boost/config/platform/bsd.hpp +5 -8
  204. data/src/cxx_supportlib/vendor-modified/boost/config/platform/wasm.hpp +17 -0
  205. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/dinkumware.hpp +26 -0
  206. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libcpp.hpp +49 -0
  207. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libstdcpp3.hpp +46 -4
  208. data/src/cxx_supportlib/vendor-modified/boost/container/adaptive_pool.hpp +2 -2
  209. data/src/cxx_supportlib/vendor-modified/boost/container/allocator.hpp +1 -1
  210. data/src/cxx_supportlib/vendor-modified/boost/container/detail/adaptive_node_pool.hpp +2 -2
  211. data/src/cxx_supportlib/vendor-modified/boost/container/detail/node_pool.hpp +2 -2
  212. data/src/cxx_supportlib/vendor-modified/boost/container/detail/std_fwd.hpp +3 -0
  213. data/src/cxx_supportlib/vendor-modified/boost/container/devector.hpp +2 -2
  214. data/src/cxx_supportlib/vendor-modified/boost/container/new_allocator.hpp +1 -1
  215. data/src/cxx_supportlib/vendor-modified/boost/container/node_allocator.hpp +1 -1
  216. data/src/cxx_supportlib/vendor-modified/boost/container/pmr/polymorphic_allocator.hpp +6 -6
  217. data/src/cxx_supportlib/vendor-modified/boost/container/static_vector.hpp +4 -4
  218. data/src/cxx_supportlib/vendor-modified/boost/container/throw_exception.hpp +45 -38
  219. data/src/cxx_supportlib/vendor-modified/boost/container/vector.hpp +24 -0
  220. data/src/cxx_supportlib/vendor-modified/boost/core/ignore_unused.hpp +32 -2
  221. data/src/cxx_supportlib/vendor-modified/boost/core/uncaught_exceptions.hpp +7 -7
  222. data/src/cxx_supportlib/vendor-modified/boost/date_time/compiler_config.hpp +0 -24
  223. data/src/cxx_supportlib/vendor-modified/boost/date_time/posix_time/time_parsers.hpp +4 -0
  224. data/src/cxx_supportlib/vendor-modified/boost/intrusive/any_hook.hpp +4 -4
  225. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avl_set.hpp +83 -83
  226. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree.hpp +43 -43
  227. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree_algorithms.hpp +31 -31
  228. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bs_set.hpp +85 -85
  229. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree.hpp +68 -68
  230. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree_algorithms.hpp +72 -62
  231. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_list_algorithms.hpp +19 -20
  232. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_slist_algorithms.hpp +19 -19
  233. data/src/cxx_supportlib/vendor-modified/boost/intrusive/derivation_value_traits.hpp +4 -4
  234. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/any_node_and_algorithms.hpp +2 -2
  235. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/bstree_algorithms_base.hpp +3 -3
  236. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/common_slist_algorithms.hpp +5 -5
  237. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/config_begin.hpp +1 -0
  238. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/generic_hook.hpp +8 -8
  239. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hash_combine.hpp +2 -4
  240. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/hashtable_node.hpp +1 -1
  241. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/math.hpp +2 -50
  242. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/node_cloner_disposer.hpp +1 -1
  243. data/src/cxx_supportlib/vendor-modified/boost/intrusive/hashtable.hpp +71 -70
  244. data/src/cxx_supportlib/vendor-modified/boost/intrusive/linear_slist_algorithms.hpp +15 -14
  245. data/src/cxx_supportlib/vendor-modified/boost/intrusive/list.hpp +84 -82
  246. data/src/cxx_supportlib/vendor-modified/boost/intrusive/list_hook.hpp +10 -10
  247. data/src/cxx_supportlib/vendor-modified/boost/intrusive/member_value_traits.hpp +4 -4
  248. data/src/cxx_supportlib/vendor-modified/boost/intrusive/parent_from_member.hpp +2 -2
  249. data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_plus_bits.hpp +4 -4
  250. data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_traits.hpp +18 -18
  251. data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree.hpp +43 -43
  252. data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree_algorithms.hpp +26 -26
  253. data/src/cxx_supportlib/vendor-modified/boost/intrusive/set.hpp +85 -85
  254. data/src/cxx_supportlib/vendor-modified/boost/intrusive/set_hook.hpp +12 -12
  255. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sg_set.hpp +93 -93
  256. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree.hpp +51 -51
  257. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree_algorithms.hpp +24 -24
  258. data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist.hpp +104 -104
  259. data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist_hook.hpp +8 -6
  260. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splay_set.hpp +91 -91
  261. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree.hpp +46 -46
  262. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree_algorithms.hpp +31 -31
  263. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap.hpp +51 -51
  264. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_algorithms.hpp +18 -18
  265. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_set.hpp +97 -97
  266. data/src/cxx_supportlib/vendor-modified/boost/intrusive/trivial_value_traits.hpp +6 -4
  267. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set.hpp +63 -63
  268. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set_hook.hpp +15 -15
  269. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_numeric.hpp +4 -1
  270. data/src/cxx_supportlib/vendor-modified/boost/move/detail/config_begin.hpp +1 -0
  271. data/src/cxx_supportlib/vendor-modified/boost/move/detail/iterator_traits.hpp +1 -0
  272. data/src/cxx_supportlib/vendor-modified/boost/move/detail/nsec_clock.hpp +1 -1
  273. data/src/cxx_supportlib/vendor-modified/boost/operators.hpp +2 -0
  274. data/src/cxx_supportlib/vendor-modified/boost/regex/concepts.hpp +1 -1
  275. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex_parser.hpp +3 -0
  276. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/unicode_iterator.hpp +112 -31
  277. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/basic_regex_parser.hpp +3 -0
  278. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/mem_block_cache.hpp +4 -8
  279. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/unicode_iterator.hpp +0 -2
  280. data/src/cxx_supportlib/vendor-modified/boost/regex/v5/w32_regex_traits.hpp +6 -2
  281. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/shared_count.hpp +1 -1
  282. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_impl.hpp +22 -2
  283. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_obsolete.hpp +32 -0
  284. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/shared_ptr.hpp +59 -1
  285. data/src/cxx_supportlib/vendor-modified/boost/system/detail/config.hpp +9 -11
  286. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category.hpp +27 -21
  287. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category_impl.hpp +34 -3
  288. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_code.hpp +378 -36
  289. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_condition.hpp +97 -21
  290. data/src/cxx_supportlib/vendor-modified/boost/system/detail/interop_category.hpp +107 -0
  291. data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_same.hpp +33 -0
  292. data/src/cxx_supportlib/vendor-modified/boost/system/detail/snprintf.hpp +70 -0
  293. data/src/cxx_supportlib/vendor-modified/boost/system/detail/{to_std_category.hpp → std_category.hpp} +5 -55
  294. data/src/cxx_supportlib/vendor-modified/boost/system/detail/system_category_impl.hpp +2 -12
  295. data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +0 -33
  296. data/src/cxx_supportlib/vendor-modified/boost/utility/detail/result_of_variadic.hpp +190 -0
  297. data/src/cxx_supportlib/vendor-modified/boost/utility/result_of.hpp +20 -9
  298. data/src/cxx_supportlib/vendor-modified/boost/utility/string_view.hpp +3 -1
  299. data/src/cxx_supportlib/vendor-modified/boost/version.hpp +2 -2
  300. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/COPYING +0 -0
  301. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/changelog.md +0 -0
  302. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/readme.md +0 -0
  303. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/base64/base64.hpp +0 -0
  304. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/client.hpp +0 -0
  305. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/close.hpp +0 -0
  306. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/asio.hpp +0 -0
  307. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/asio_ssl.hpp +0 -0
  308. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/chrono.hpp +0 -0
  309. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/connection_hdl.hpp +0 -0
  310. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/cpp11.hpp +0 -0
  311. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/functional.hpp +2 -7
  312. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/md5.hpp +0 -0
  313. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/memory.hpp +0 -0
  314. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/network.hpp +0 -0
  315. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/platforms.hpp +0 -0
  316. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/random.hpp +0 -0
  317. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/regex.hpp +0 -0
  318. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/stdint.hpp +0 -0
  319. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/system_error.hpp +0 -0
  320. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/thread.hpp +0 -0
  321. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/time.hpp +0 -0
  322. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/common/type_traits.hpp +0 -0
  323. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/concurrency/basic.hpp +0 -0
  324. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/concurrency/none.hpp +0 -0
  325. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/asio.hpp +0 -0
  326. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/asio_client.hpp +0 -0
  327. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/asio_no_tls.hpp +0 -0
  328. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/asio_no_tls_client.hpp +0 -0
  329. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/boost_config.hpp +0 -0
  330. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/core.hpp +0 -0
  331. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/core_client.hpp +0 -0
  332. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/debug.hpp +0 -0
  333. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/debug_asio.hpp +0 -0
  334. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/debug_asio_no_tls.hpp +0 -0
  335. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/minimal_client.hpp +0 -0
  336. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/config/minimal_server.hpp +0 -0
  337. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/connection.hpp +0 -0
  338. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/connection_base.hpp +0 -0
  339. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/endpoint.hpp +0 -0
  340. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/endpoint_base.hpp +0 -0
  341. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/error.hpp +0 -0
  342. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/extensions/extension.hpp +0 -0
  343. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp +0 -0
  344. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp +0 -0
  345. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/frame.hpp +0 -0
  346. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/constants.hpp +0 -0
  347. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/impl/parser.hpp +0 -0
  348. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/impl/request.hpp +0 -0
  349. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/impl/response.hpp +0 -0
  350. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/parser.hpp +0 -0
  351. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/request.hpp +0 -0
  352. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/http/response.hpp +0 -0
  353. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/impl/connection_impl.hpp +0 -0
  354. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/impl/endpoint_impl.hpp +0 -0
  355. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/impl/utilities_impl.hpp +0 -0
  356. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/logger/basic.hpp +0 -0
  357. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/logger/levels.hpp +0 -0
  358. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/logger/stub.hpp +0 -0
  359. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/logger/syslog.hpp +0 -0
  360. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/message_buffer/alloc.hpp +0 -0
  361. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/message_buffer/message.hpp +0 -0
  362. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/message_buffer/pool.hpp +0 -0
  363. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/base.hpp +0 -0
  364. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/hybi00.hpp +0 -0
  365. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/hybi07.hpp +0 -0
  366. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/hybi08.hpp +0 -0
  367. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/hybi13.hpp +0 -0
  368. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/processors/processor.hpp +0 -0
  369. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/random/none.hpp +0 -0
  370. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/random/random_device.hpp +0 -0
  371. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/roles/client_endpoint.hpp +0 -0
  372. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/roles/server_endpoint.hpp +0 -0
  373. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/server.hpp +0 -0
  374. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/sha1/sha1.hpp +0 -0
  375. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/base.hpp +0 -0
  376. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/connection.hpp +0 -0
  377. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/endpoint.hpp +0 -0
  378. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/security/base.hpp +0 -0
  379. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/security/none.hpp +0 -0
  380. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/asio/security/tls.hpp +0 -0
  381. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/base/connection.hpp +0 -0
  382. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/base/endpoint.hpp +0 -0
  383. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/debug/base.hpp +0 -0
  384. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/debug/connection.hpp +0 -0
  385. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/debug/endpoint.hpp +0 -0
  386. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/iostream/base.hpp +0 -0
  387. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/iostream/connection.hpp +0 -0
  388. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/iostream/endpoint.hpp +0 -0
  389. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/stub/base.hpp +0 -0
  390. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/stub/connection.hpp +0 -0
  391. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/transport/stub/endpoint.hpp +0 -0
  392. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/uri.hpp +0 -0
  393. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/utf8_validator.hpp +0 -0
  394. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/utilities.hpp +0 -0
  395. data/src/cxx_supportlib/{vendor-copy → vendor-modified}/websocketpp/websocketpp/version.hpp +0 -0
  396. data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c +16 -0
  397. data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +12 -0
  398. data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +24 -0
  399. data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +10 -0
  400. data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +39 -0
  401. data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +26 -0
  402. data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +6 -0
  403. data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +8 -0
  404. data/src/nginx_module/ngx_http_passenger_module.c +1 -0
  405. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js +50 -29
  406. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js +20 -20
  407. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js +11 -11
  408. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js +3 -3
  409. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js +8 -2
  410. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js +2 -1
  411. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js +174 -146
  412. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/console.js +4 -2
  413. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/file.js +15 -5
  414. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/http.js +14 -4
  415. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports.js +26 -24
  416. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston.js +5 -5
  417. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/package.json +4 -13
  418. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/colors/package.json +19 -33
  419. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/cycle/package.json +11 -29
  420. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/eyes/package.json +12 -40
  421. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/package.json +3 -12
  422. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js +49 -24
  423. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json +4 -16
  424. data/src/nodejs_supportlib/vendor-copy/winston/package.json +11 -55
  425. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +3 -2
  426. data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb +6 -0
  427. data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb +3 -2
  428. data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb +8 -1
  429. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +12 -0
  430. data/src/ruby_supportlib/phusion_passenger/packaging.rb +1 -0
  431. data/src/ruby_supportlib/phusion_passenger/platform_info/binary_compatibility.rb +7 -5
  432. data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/libs.rb +6 -2
  433. data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb +2 -1
  434. data/src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb +1 -1
  435. data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb +17 -3
  436. data/src/ruby_supportlib/phusion_passenger/platform_info/pcre.rb +65 -0
  437. data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb +18 -18
  438. data/src/ruby_supportlib/phusion_passenger/request_handler.rb +4 -1
  439. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +7 -1
  440. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +1 -0
  441. data/src/ruby_supportlib/phusion_passenger.rb +5 -5
  442. metadata +148 -105
  443. data/src/cxx_supportlib/vendor-modified/boost/system/detail/is_generic_value.hpp +0 -125
  444. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js +0 -601
  445. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/webhook.js +0 -146
  446. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/LICENSE +0 -19
  447. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js +0 -136
  448. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json +0 -56
@@ -57,7 +57,8 @@ public:
57
57
  boost::asio::require(ex, execution::blocking.never),
58
58
  execution::relationship.continuation,
59
59
  execution::allocator(alloc)),
60
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
60
+ boost::asio::detail::bind_handler(
61
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
61
62
  }
62
63
 
63
64
  template <typename CompletionHandler>
@@ -78,7 +79,8 @@ public:
78
79
  typename associated_allocator<handler_t>::type alloc(
79
80
  (get_associated_allocator)(handler));
80
81
 
81
- ex.defer(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
82
+ ex.defer(boost::asio::detail::bind_handler(
83
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
82
84
  }
83
85
  };
84
86
 
@@ -122,7 +124,8 @@ public:
122
124
  boost::asio::require(ex_, execution::blocking.never),
123
125
  execution::relationship.continuation,
124
126
  execution::allocator(alloc)),
125
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
127
+ boost::asio::detail::bind_handler(
128
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
126
129
  }
127
130
 
128
131
  template <typename CompletionHandler>
@@ -176,7 +179,8 @@ public:
176
179
  typename associated_allocator<handler_t>::type alloc(
177
180
  (get_associated_allocator)(handler));
178
181
 
179
- ex_.defer(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
182
+ ex_.defer(boost::asio::detail::bind_handler(
183
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
180
184
  }
181
185
 
182
186
  template <typename CompletionHandler>
@@ -54,7 +54,8 @@ public:
54
54
  boost::asio::prefer(ex,
55
55
  execution::blocking.possibly,
56
56
  execution::allocator(alloc)),
57
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
57
+ boost::asio::detail::bind_handler(
58
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
58
59
  }
59
60
 
60
61
  template <typename CompletionHandler>
@@ -75,7 +76,8 @@ public:
75
76
  typename associated_allocator<handler_t>::type alloc(
76
77
  (get_associated_allocator)(handler));
77
78
 
78
- ex.dispatch(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
79
+ ex.dispatch(boost::asio::detail::bind_handler(
80
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
79
81
  }
80
82
  };
81
83
 
@@ -118,7 +120,8 @@ public:
118
120
  boost::asio::prefer(ex_,
119
121
  execution::blocking.possibly,
120
122
  execution::allocator(alloc)),
121
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
123
+ boost::asio::detail::bind_handler(
124
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
122
125
  }
123
126
 
124
127
  template <typename CompletionHandler>
@@ -171,7 +174,8 @@ public:
171
174
  typename associated_allocator<handler_t>::type alloc(
172
175
  (get_associated_allocator)(handler));
173
176
 
174
- ex_.dispatch(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
177
+ ex_.dispatch(boost::asio::detail::bind_handler(
178
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
175
179
  }
176
180
 
177
181
  template <typename CompletionHandler>
@@ -16,6 +16,7 @@
16
16
  #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
17
17
 
18
18
  #include <boost/asio/detail/config.hpp>
19
+ #include <boost/asio/detail/memory.hpp>
19
20
  #include <boost/asio/detail/thread_context.hpp>
20
21
  #include <boost/asio/detail/thread_info_base.hpp>
21
22
  #include <boost/asio/handler_alloc_hook.hpp>
@@ -35,7 +36,7 @@ asio_handler_allocate(std::size_t size, ...)
35
36
  return detail::thread_info_base::allocate(
36
37
  detail::thread_context::top_of_thread_call_stack(), size);
37
38
  #else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
38
- return ::operator new(size);
39
+ return aligned_new(BOOST_ASIO_DEFAULT_ALIGN, size);
39
40
  #endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
40
41
  }
41
42
 
@@ -51,7 +52,7 @@ asio_handler_deallocate(void* pointer, std::size_t size, ...)
51
52
  detail::thread_context::top_of_thread_call_stack(), pointer, size);
52
53
  #else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
53
54
  (void)size;
54
- ::operator delete(pointer);
55
+ aligned_delete(pointer)
55
56
  #endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
56
57
  }
57
58
 
@@ -57,7 +57,8 @@ public:
57
57
  boost::asio::require(ex, execution::blocking.never),
58
58
  execution::relationship.fork,
59
59
  execution::allocator(alloc)),
60
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
60
+ boost::asio::detail::bind_handler(
61
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
61
62
  }
62
63
 
63
64
  template <typename CompletionHandler>
@@ -78,7 +79,8 @@ public:
78
79
  typename associated_allocator<handler_t>::type alloc(
79
80
  (get_associated_allocator)(handler));
80
81
 
81
- ex.post(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
82
+ ex.post(boost::asio::detail::bind_handler(
83
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
82
84
  }
83
85
  };
84
86
 
@@ -122,7 +124,8 @@ public:
122
124
  boost::asio::require(ex_, execution::blocking.never),
123
125
  execution::relationship.fork,
124
126
  execution::allocator(alloc)),
125
- BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler));
127
+ boost::asio::detail::bind_handler(
128
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)));
126
129
  }
127
130
 
128
131
  template <typename CompletionHandler>
@@ -176,7 +179,8 @@ public:
176
179
  typename associated_allocator<handler_t>::type alloc(
177
180
  (get_associated_allocator)(handler));
178
181
 
179
- ex_.post(BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler), alloc);
182
+ ex_.post(boost::asio::detail::bind_handler(
183
+ BOOST_ASIO_MOVE_CAST(CompletionHandler)(handler)), alloc);
180
184
  }
181
185
 
182
186
  template <typename CompletionHandler>
@@ -16,11 +16,11 @@
16
16
  #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
17
17
 
18
18
  #include <algorithm>
19
- #include <boost/asio/associated_allocator.hpp>
20
- #include <boost/asio/associated_executor.hpp>
19
+ #include <boost/asio/associator.hpp>
21
20
  #include <boost/asio/buffer.hpp>
22
21
  #include <boost/asio/completion_condition.hpp>
23
22
  #include <boost/asio/detail/array_fwd.hpp>
23
+ #include <boost/asio/detail/base_from_cancellation_state.hpp>
24
24
  #include <boost/asio/detail/base_from_completion_cond.hpp>
25
25
  #include <boost/asio/detail/bind_handler.hpp>
26
26
  #include <boost/asio/detail/consuming_buffers.hpp>
@@ -324,13 +324,15 @@ namespace detail
324
324
  typename MutableBufferIterator, typename CompletionCondition,
325
325
  typename ReadHandler>
326
326
  class read_op
327
- : detail::base_from_completion_cond<CompletionCondition>
327
+ : public base_from_cancellation_state<ReadHandler>,
328
+ base_from_completion_cond<CompletionCondition>
328
329
  {
329
330
  public:
330
331
  read_op(AsyncReadStream& stream, const MutableBufferSequence& buffers,
331
332
  CompletionCondition& completion_condition, ReadHandler& handler)
332
- : detail::base_from_completion_cond<
333
- CompletionCondition>(completion_condition),
333
+ : base_from_cancellation_state<ReadHandler>(
334
+ handler, enable_partial_cancellation()),
335
+ base_from_completion_cond<CompletionCondition>(completion_condition),
334
336
  stream_(stream),
335
337
  buffers_(buffers),
336
338
  start_(0),
@@ -340,7 +342,8 @@ namespace detail
340
342
 
341
343
  #if defined(BOOST_ASIO_HAS_MOVE)
342
344
  read_op(const read_op& other)
343
- : detail::base_from_completion_cond<CompletionCondition>(other),
345
+ : base_from_cancellation_state<ReadHandler>(other),
346
+ base_from_completion_cond<CompletionCondition>(other),
344
347
  stream_(other.stream_),
345
348
  buffers_(other.buffers_),
346
349
  start_(other.start_),
@@ -349,8 +352,11 @@ namespace detail
349
352
  }
350
353
 
351
354
  read_op(read_op&& other)
352
- : detail::base_from_completion_cond<CompletionCondition>(
353
- BOOST_ASIO_MOVE_CAST(detail::base_from_completion_cond<
355
+ : base_from_cancellation_state<ReadHandler>(
356
+ BOOST_ASIO_MOVE_CAST(base_from_cancellation_state<
357
+ ReadHandler>)(other)),
358
+ base_from_completion_cond<CompletionCondition>(
359
+ BOOST_ASIO_MOVE_CAST(base_from_completion_cond<
354
360
  CompletionCondition>)(other)),
355
361
  stream_(other.stream_),
356
362
  buffers_(BOOST_ASIO_MOVE_CAST(buffers_type)(other.buffers_)),
@@ -360,7 +366,7 @@ namespace detail
360
366
  }
361
367
  #endif // defined(BOOST_ASIO_HAS_MOVE)
362
368
 
363
- void operator()(const boost::system::error_code& ec,
369
+ void operator()(boost::system::error_code ec,
364
370
  std::size_t bytes_transferred, int start = 0)
365
371
  {
366
372
  std::size_t max_size;
@@ -368,7 +374,7 @@ namespace detail
368
374
  {
369
375
  case 1:
370
376
  max_size = this->check_for_completion(ec, buffers_.total_consumed());
371
- do
377
+ for (;;)
372
378
  {
373
379
  {
374
380
  BOOST_ASIO_HANDLER_LOCATION((__FILE__, __LINE__, "async_read"));
@@ -380,9 +386,18 @@ namespace detail
380
386
  if ((!ec && bytes_transferred == 0) || buffers_.empty())
381
387
  break;
382
388
  max_size = this->check_for_completion(ec, buffers_.total_consumed());
383
- } while (max_size > 0);
389
+ if (max_size == 0)
390
+ break;
391
+ if (this->cancelled() != cancellation_type::none)
392
+ {
393
+ ec = error::operation_aborted;
394
+ break;
395
+ }
396
+ }
384
397
 
385
- handler_(ec, buffers_.total_consumed());
398
+ BOOST_ASIO_MOVE_OR_LVALUE(ReadHandler)(handler_)(
399
+ static_cast<const boost::system::error_code&>(ec),
400
+ static_cast<const std::size_t&>(buffers_.total_consumed()));
386
401
  }
387
402
  }
388
403
 
@@ -523,42 +538,22 @@ namespace detail
523
538
 
524
539
  #if !defined(GENERATING_DOCUMENTATION)
525
540
 
526
- template <typename AsyncReadStream, typename MutableBufferSequence,
527
- typename MutableBufferIterator, typename CompletionCondition,
528
- typename ReadHandler, typename Allocator>
529
- struct associated_allocator<
530
- detail::read_op<AsyncReadStream, MutableBufferSequence,
531
- MutableBufferIterator, CompletionCondition, ReadHandler>,
532
- Allocator>
533
- {
534
- typedef typename associated_allocator<ReadHandler, Allocator>::type type;
535
-
536
- static type get(
537
- const detail::read_op<AsyncReadStream, MutableBufferSequence,
538
- MutableBufferIterator, CompletionCondition, ReadHandler>& h,
539
- const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT
540
- {
541
- return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a);
542
- }
543
- };
544
-
545
- template <typename AsyncReadStream, typename MutableBufferSequence,
541
+ template <template <typename, typename> class Associator,
542
+ typename AsyncReadStream, typename MutableBufferSequence,
546
543
  typename MutableBufferIterator, typename CompletionCondition,
547
- typename ReadHandler, typename Executor>
548
- struct associated_executor<
544
+ typename ReadHandler, typename DefaultCandidate>
545
+ struct associator<Associator,
549
546
  detail::read_op<AsyncReadStream, MutableBufferSequence,
550
547
  MutableBufferIterator, CompletionCondition, ReadHandler>,
551
- Executor>
552
- : detail::associated_executor_forwarding_base<ReadHandler, Executor>
548
+ DefaultCandidate>
549
+ : Associator<ReadHandler, DefaultCandidate>
553
550
  {
554
- typedef typename associated_executor<ReadHandler, Executor>::type type;
555
-
556
- static type get(
551
+ static typename Associator<ReadHandler, DefaultCandidate>::type get(
557
552
  const detail::read_op<AsyncReadStream, MutableBufferSequence,
558
553
  MutableBufferIterator, CompletionCondition, ReadHandler>& h,
559
- const Executor& ex = Executor()) BOOST_ASIO_NOEXCEPT
554
+ const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
560
555
  {
561
- return associated_executor<ReadHandler, Executor>::get(h.handler_, ex);
556
+ return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c);
562
557
  }
563
558
  };
564
559
 
@@ -607,15 +602,17 @@ namespace detail
607
602
  template <typename AsyncReadStream, typename DynamicBuffer_v1,
608
603
  typename CompletionCondition, typename ReadHandler>
609
604
  class read_dynbuf_v1_op
610
- : detail::base_from_completion_cond<CompletionCondition>
605
+ : public base_from_cancellation_state<ReadHandler>,
606
+ base_from_completion_cond<CompletionCondition>
611
607
  {
612
608
  public:
613
609
  template <typename BufferSequence>
614
610
  read_dynbuf_v1_op(AsyncReadStream& stream,
615
611
  BOOST_ASIO_MOVE_ARG(BufferSequence) buffers,
616
612
  CompletionCondition& completion_condition, ReadHandler& handler)
617
- : detail::base_from_completion_cond<
618
- CompletionCondition>(completion_condition),
613
+ : base_from_cancellation_state<ReadHandler>(
614
+ handler, enable_partial_cancellation()),
615
+ base_from_completion_cond<CompletionCondition>(completion_condition),
619
616
  stream_(stream),
620
617
  buffers_(BOOST_ASIO_MOVE_CAST(BufferSequence)(buffers)),
621
618
  start_(0),
@@ -626,7 +623,8 @@ namespace detail
626
623
 
627
624
  #if defined(BOOST_ASIO_HAS_MOVE)
628
625
  read_dynbuf_v1_op(const read_dynbuf_v1_op& other)
629
- : detail::base_from_completion_cond<CompletionCondition>(other),
626
+ : base_from_cancellation_state<ReadHandler>(other),
627
+ base_from_completion_cond<CompletionCondition>(other),
630
628
  stream_(other.stream_),
631
629
  buffers_(other.buffers_),
632
630
  start_(other.start_),
@@ -636,8 +634,11 @@ namespace detail
636
634
  }
637
635
 
638
636
  read_dynbuf_v1_op(read_dynbuf_v1_op&& other)
639
- : detail::base_from_completion_cond<CompletionCondition>(
640
- BOOST_ASIO_MOVE_CAST(detail::base_from_completion_cond<
637
+ : base_from_cancellation_state<ReadHandler>(
638
+ BOOST_ASIO_MOVE_CAST(base_from_cancellation_state<
639
+ ReadHandler>)(other)),
640
+ base_from_completion_cond<CompletionCondition>(
641
+ BOOST_ASIO_MOVE_CAST(base_from_completion_cond<
641
642
  CompletionCondition>)(other)),
642
643
  stream_(other.stream_),
643
644
  buffers_(BOOST_ASIO_MOVE_CAST(DynamicBuffer_v1)(other.buffers_)),
@@ -648,7 +649,7 @@ namespace detail
648
649
  }
649
650
  #endif // defined(BOOST_ASIO_HAS_MOVE)
650
651
 
651
- void operator()(const boost::system::error_code& ec,
652
+ void operator()(boost::system::error_code ec,
652
653
  std::size_t bytes_transferred, int start = 0)
653
654
  {
654
655
  std::size_t max_size, bytes_available;
@@ -679,9 +680,16 @@ namespace detail
679
680
  buffers_.max_size() - buffers_.size()));
680
681
  if ((!ec && bytes_transferred == 0) || bytes_available == 0)
681
682
  break;
683
+ if (this->cancelled() != cancellation_type::none)
684
+ {
685
+ ec = error::operation_aborted;
686
+ break;
687
+ }
682
688
  }
683
689
 
684
- handler_(ec, static_cast<const std::size_t&>(total_transferred_));
690
+ BOOST_ASIO_MOVE_OR_LVALUE(ReadHandler)(handler_)(
691
+ static_cast<const boost::system::error_code&>(ec),
692
+ static_cast<const std::size_t&>(total_transferred_));
685
693
  }
686
694
  }
687
695
 
@@ -806,40 +814,22 @@ namespace detail
806
814
 
807
815
  #if !defined(GENERATING_DOCUMENTATION)
808
816
 
809
- template <typename AsyncReadStream, typename DynamicBuffer_v1,
810
- typename CompletionCondition, typename ReadHandler, typename Allocator>
811
- struct associated_allocator<
812
- detail::read_dynbuf_v1_op<AsyncReadStream,
813
- DynamicBuffer_v1, CompletionCondition, ReadHandler>,
814
- Allocator>
815
- {
816
- typedef typename associated_allocator<ReadHandler, Allocator>::type type;
817
-
818
- static type get(
819
- const detail::read_dynbuf_v1_op<AsyncReadStream,
820
- DynamicBuffer_v1, CompletionCondition, ReadHandler>& h,
821
- const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT
822
- {
823
- return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a);
824
- }
825
- };
826
-
827
- template <typename AsyncReadStream, typename DynamicBuffer_v1,
828
- typename CompletionCondition, typename ReadHandler, typename Executor>
829
- struct associated_executor<
817
+ template <template <typename, typename> class Associator,
818
+ typename AsyncReadStream, typename DynamicBuffer_v1,
819
+ typename CompletionCondition, typename ReadHandler,
820
+ typename DefaultCandidate>
821
+ struct associator<Associator,
830
822
  detail::read_dynbuf_v1_op<AsyncReadStream,
831
823
  DynamicBuffer_v1, CompletionCondition, ReadHandler>,
832
- Executor>
833
- : detail::associated_executor_forwarding_base<ReadHandler, Executor>
824
+ DefaultCandidate>
825
+ : Associator<ReadHandler, DefaultCandidate>
834
826
  {
835
- typedef typename associated_executor<ReadHandler, Executor>::type type;
836
-
837
- static type get(
827
+ static typename Associator<ReadHandler, DefaultCandidate>::type get(
838
828
  const detail::read_dynbuf_v1_op<AsyncReadStream,
839
829
  DynamicBuffer_v1, CompletionCondition, ReadHandler>& h,
840
- const Executor& ex = Executor()) BOOST_ASIO_NOEXCEPT
830
+ const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
841
831
  {
842
- return associated_executor<ReadHandler, Executor>::get(h.handler_, ex);
832
+ return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c);
843
833
  }
844
834
  };
845
835
 
@@ -928,15 +918,17 @@ namespace detail
928
918
  template <typename AsyncReadStream, typename DynamicBuffer_v2,
929
919
  typename CompletionCondition, typename ReadHandler>
930
920
  class read_dynbuf_v2_op
931
- : detail::base_from_completion_cond<CompletionCondition>
921
+ : public base_from_cancellation_state<ReadHandler>,
922
+ base_from_completion_cond<CompletionCondition>
932
923
  {
933
924
  public:
934
925
  template <typename BufferSequence>
935
926
  read_dynbuf_v2_op(AsyncReadStream& stream,
936
927
  BOOST_ASIO_MOVE_ARG(BufferSequence) buffers,
937
928
  CompletionCondition& completion_condition, ReadHandler& handler)
938
- : detail::base_from_completion_cond<
939
- CompletionCondition>(completion_condition),
929
+ : base_from_cancellation_state<ReadHandler>(
930
+ handler, enable_partial_cancellation()),
931
+ base_from_completion_cond<CompletionCondition>(completion_condition),
940
932
  stream_(stream),
941
933
  buffers_(BOOST_ASIO_MOVE_CAST(BufferSequence)(buffers)),
942
934
  start_(0),
@@ -948,7 +940,8 @@ namespace detail
948
940
 
949
941
  #if defined(BOOST_ASIO_HAS_MOVE)
950
942
  read_dynbuf_v2_op(const read_dynbuf_v2_op& other)
951
- : detail::base_from_completion_cond<CompletionCondition>(other),
943
+ : base_from_cancellation_state<ReadHandler>(other),
944
+ base_from_completion_cond<CompletionCondition>(other),
952
945
  stream_(other.stream_),
953
946
  buffers_(other.buffers_),
954
947
  start_(other.start_),
@@ -959,8 +952,11 @@ namespace detail
959
952
  }
960
953
 
961
954
  read_dynbuf_v2_op(read_dynbuf_v2_op&& other)
962
- : detail::base_from_completion_cond<CompletionCondition>(
963
- BOOST_ASIO_MOVE_CAST(detail::base_from_completion_cond<
955
+ : base_from_cancellation_state<ReadHandler>(
956
+ BOOST_ASIO_MOVE_CAST(base_from_cancellation_state<
957
+ ReadHandler>)(other)),
958
+ base_from_completion_cond<CompletionCondition>(
959
+ BOOST_ASIO_MOVE_CAST(base_from_completion_cond<
964
960
  CompletionCondition>)(other)),
965
961
  stream_(other.stream_),
966
962
  buffers_(BOOST_ASIO_MOVE_CAST(DynamicBuffer_v2)(other.buffers_)),
@@ -972,7 +968,7 @@ namespace detail
972
968
  }
973
969
  #endif // defined(BOOST_ASIO_HAS_MOVE)
974
970
 
975
- void operator()(const boost::system::error_code& ec,
971
+ void operator()(boost::system::error_code ec,
976
972
  std::size_t bytes_transferred, int start = 0)
977
973
  {
978
974
  std::size_t max_size, pos;
@@ -1005,9 +1001,16 @@ namespace detail
1005
1001
  buffers_.max_size() - buffers_.size()));
1006
1002
  if ((!ec && bytes_transferred == 0) || bytes_available_ == 0)
1007
1003
  break;
1004
+ if (this->cancelled() != cancellation_type::none)
1005
+ {
1006
+ ec = error::operation_aborted;
1007
+ break;
1008
+ }
1008
1009
  }
1009
1010
 
1010
- handler_(ec, static_cast<const std::size_t&>(total_transferred_));
1011
+ BOOST_ASIO_MOVE_OR_LVALUE(ReadHandler)(handler_)(
1012
+ static_cast<const boost::system::error_code&>(ec),
1013
+ static_cast<const std::size_t&>(total_transferred_));
1011
1014
  }
1012
1015
  }
1013
1016
 
@@ -1133,40 +1136,22 @@ namespace detail
1133
1136
 
1134
1137
  #if !defined(GENERATING_DOCUMENTATION)
1135
1138
 
1136
- template <typename AsyncReadStream, typename DynamicBuffer_v2,
1137
- typename CompletionCondition, typename ReadHandler, typename Allocator>
1138
- struct associated_allocator<
1139
+ template <template <typename, typename> class Associator,
1140
+ typename AsyncReadStream, typename DynamicBuffer_v2,
1141
+ typename CompletionCondition, typename ReadHandler,
1142
+ typename DefaultCandidate>
1143
+ struct associator<Associator,
1139
1144
  detail::read_dynbuf_v2_op<AsyncReadStream,
1140
1145
  DynamicBuffer_v2, CompletionCondition, ReadHandler>,
1141
- Allocator>
1146
+ DefaultCandidate>
1147
+ : Associator<ReadHandler, DefaultCandidate>
1142
1148
  {
1143
- typedef typename associated_allocator<ReadHandler, Allocator>::type type;
1144
-
1145
- static type get(
1146
- const detail::read_dynbuf_v2_op<AsyncReadStream,
1147
- DynamicBuffer_v2, CompletionCondition, ReadHandler>& h,
1148
- const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT
1149
- {
1150
- return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a);
1151
- }
1152
- };
1153
-
1154
- template <typename AsyncReadStream, typename DynamicBuffer_v2,
1155
- typename CompletionCondition, typename ReadHandler, typename Executor>
1156
- struct associated_executor<
1157
- detail::read_dynbuf_v2_op<AsyncReadStream,
1158
- DynamicBuffer_v2, CompletionCondition, ReadHandler>,
1159
- Executor>
1160
- : detail::associated_executor_forwarding_base<ReadHandler, Executor>
1161
- {
1162
- typedef typename associated_executor<ReadHandler, Executor>::type type;
1163
-
1164
- static type get(
1149
+ static typename Associator<ReadHandler, DefaultCandidate>::type get(
1165
1150
  const detail::read_dynbuf_v2_op<AsyncReadStream,
1166
1151
  DynamicBuffer_v2, CompletionCondition, ReadHandler>& h,
1167
- const Executor& ex = Executor()) BOOST_ASIO_NOEXCEPT
1152
+ const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
1168
1153
  {
1169
- return associated_executor<ReadHandler, Executor>::get(h.handler_, ex);
1154
+ return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c);
1170
1155
  }
1171
1156
  };
1172
1157