passenger 6.0.1 → 6.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (453) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +145 -18
  3. data/CONTRIBUTORS +6 -0
  4. data/bin/passenger-install-nginx-module +1 -1
  5. data/bin/passenger-status +15 -0
  6. data/build/misc.rb +3 -1
  7. data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb +56 -3
  8. data/dev/copy_boost_headers +1 -0
  9. data/package.json +1 -1
  10. data/passenger.gemspec +9 -1
  11. data/resources/templates/error_renderer/with_details/src/bootstrap/bootstrap.css +0 -0
  12. data/resources/templates/error_renderer/with_details/src/bootstrap/bootstrap.js +0 -0
  13. data/resources/templates/error_renderer/with_details/src/bootstrap/config.json +0 -0
  14. data/resources/templates/standalone/http.erb +2 -0
  15. data/resources/templates/standalone/server.erb +1 -0
  16. data/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp +1 -1
  17. data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +1 -0
  18. data/src/agent/Core/ApplicationPool/Options.h +10 -0
  19. data/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp +1 -1
  20. data/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp +1 -1
  21. data/src/agent/Core/Config.h +14 -1
  22. data/src/agent/Core/Controller.h +1 -0
  23. data/src/agent/Core/Controller/Config.h +5 -1
  24. data/src/agent/Core/Controller/ForwardResponse.cpp +13 -0
  25. data/src/agent/Core/Controller/InitRequest.cpp +3 -0
  26. data/src/agent/Core/Controller/InitializationAndShutdown.cpp +1 -0
  27. data/src/agent/Core/CoreMain.cpp +2 -1
  28. data/src/agent/Core/OptionParser.h +3 -0
  29. data/src/agent/Core/SpawningKit/Context.h +1 -0
  30. data/src/agent/Core/SpawningKit/Handshake/Prepare.h +1 -1
  31. data/src/agent/Core/SpawningKit/Handshake/WorkDir.h +5 -2
  32. data/src/agent/TempDirToucher/TempDirToucherMain.cpp +2 -0
  33. data/src/agent/Watchdog/Config.h +15 -1
  34. data/src/agent/Watchdog/WatchdogMain.cpp +7 -0
  35. data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp +10 -0
  36. data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp +10 -0
  37. data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp +30 -0
  38. data/src/apache2_module/Hooks.cpp +6 -0
  39. data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp +20 -0
  40. data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h +24 -0
  41. data/src/cxx_supportlib/Constants.h +2 -1
  42. data/src/cxx_supportlib/LoggingKit/Config.h +2 -0
  43. data/src/cxx_supportlib/LoggingKit/Implementation.cpp +15 -9
  44. data/src/cxx_supportlib/ServerKit/HttpChunkedBodyParser.h +1 -1
  45. data/src/cxx_supportlib/SystemTools/ContainerHelpers.h +20 -19
  46. data/src/cxx_supportlib/WebSocketCommandReverseServer.h +11 -7
  47. data/src/cxx_supportlib/oxt/system_calls.cpp +10 -10
  48. data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/finder.hpp +0 -4
  49. data/src/cxx_supportlib/vendor-modified/boost/asio/buffer.hpp +46 -37
  50. data/src/cxx_supportlib/vendor-modified/boost/asio/connect.hpp +16 -15
  51. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp +45 -26
  52. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/future.hpp +33 -0
  53. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/impl/socket_ops.ipp +1 -1
  54. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/is_buffer_sequence.hpp +38 -14
  55. data/src/cxx_supportlib/vendor-modified/boost/asio/detail/timer_queue.hpp +2 -0
  56. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/io_context.hpp +1 -1
  57. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/read_until.hpp +3 -1
  58. data/src/cxx_supportlib/vendor-modified/boost/asio/impl/use_future.hpp +0 -1
  59. data/src/cxx_supportlib/vendor-modified/boost/asio/ip/bad_address_cast.hpp +6 -1
  60. data/src/cxx_supportlib/vendor-modified/boost/asio/ip/basic_resolver.hpp +6 -4
  61. data/src/cxx_supportlib/vendor-modified/boost/asio/ip/basic_resolver_results.hpp +4 -4
  62. data/src/cxx_supportlib/vendor-modified/boost/asio/packaged_task.hpp +3 -3
  63. data/src/cxx_supportlib/vendor-modified/boost/asio/read.hpp +4 -4
  64. data/src/cxx_supportlib/vendor-modified/boost/asio/read_at.hpp +4 -4
  65. data/src/cxx_supportlib/vendor-modified/boost/asio/read_until.hpp +8 -6
  66. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/context_base.hpp +17 -0
  67. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.ipp +50 -5
  68. data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/stream.hpp +2 -1
  69. data/src/cxx_supportlib/vendor-modified/boost/asio/thread_pool.hpp +1 -1
  70. data/src/cxx_supportlib/vendor-modified/boost/asio/use_future.hpp +3 -2
  71. data/src/cxx_supportlib/vendor-modified/boost/asio/version.hpp +1 -1
  72. data/src/cxx_supportlib/vendor-modified/boost/asio/write.hpp +4 -3
  73. data/src/cxx_supportlib/vendor-modified/boost/asio/write_at.hpp +5 -3
  74. data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/ops_gcc_x86_dcas.hpp +13 -12
  75. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/mac/chrono.hpp +10 -10
  76. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp +34 -34
  77. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/mac/thread_clock.hpp +4 -4
  78. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/posix/chrono.hpp +8 -8
  79. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp +27 -27
  80. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/inlined/posix/thread_clock.hpp +4 -4
  81. data/src/cxx_supportlib/vendor-modified/boost/chrono/detail/system.hpp +5 -4
  82. data/src/cxx_supportlib/vendor-modified/boost/chrono/io/time_point_io.hpp +1 -1
  83. data/src/cxx_supportlib/vendor-modified/boost/circular_buffer.hpp +3 -3
  84. data/src/cxx_supportlib/vendor-modified/boost/circular_buffer/allocators.hpp +89 -0
  85. data/src/cxx_supportlib/vendor-modified/boost/circular_buffer/base.hpp +83 -74
  86. data/src/cxx_supportlib/vendor-modified/boost/circular_buffer/details.hpp +21 -33
  87. data/src/cxx_supportlib/vendor-modified/boost/circular_buffer/space_optimized.hpp +5 -5
  88. data/src/cxx_supportlib/vendor-modified/boost/concept/assert.hpp +1 -1
  89. data/src/cxx_supportlib/vendor-modified/boost/concept/detail/general.hpp +3 -3
  90. data/src/cxx_supportlib/vendor-modified/boost/concept/detail/has_constraints.hpp +3 -3
  91. data/src/cxx_supportlib/vendor-modified/boost/concept/usage.hpp +1 -1
  92. data/src/cxx_supportlib/vendor-modified/boost/concept_check.hpp +19 -19
  93. data/src/cxx_supportlib/vendor-modified/boost/config/auto_link.hpp +8 -0
  94. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/borland.hpp +5 -2
  95. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/clang.hpp +5 -1
  96. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/codegear.hpp +6 -2
  97. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/comeau.hpp +1 -1
  98. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/common_edg.hpp +4 -0
  99. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/cray.hpp +368 -52
  100. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/digitalmars.hpp +4 -1
  101. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/gcc.hpp +6 -3
  102. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/gcc_xml.hpp +3 -0
  103. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/greenhills.hpp +1 -1
  104. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/hp_acc.hpp +1 -1
  105. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/intel.hpp +6 -1
  106. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/kai.hpp +1 -1
  107. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/metrowerks.hpp +4 -1
  108. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/mpw.hpp +4 -1
  109. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/nvcc.hpp +3 -3
  110. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/pathscale.hpp +3 -0
  111. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/sunpro_cc.hpp +3 -0
  112. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/vacpp.hpp +4 -1
  113. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/visualc.hpp +9 -4
  114. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/xlcpp.hpp +4 -0
  115. data/src/cxx_supportlib/vendor-modified/boost/config/compiler/xlcpp_zos.hpp +1 -0
  116. data/src/cxx_supportlib/vendor-modified/boost/config/detail/select_compiler_config.hpp +1 -2
  117. data/src/cxx_supportlib/vendor-modified/boost/config/detail/suffix.hpp +13 -0
  118. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/dinkumware.hpp +2 -2
  119. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libcpp.hpp +14 -4
  120. data/src/cxx_supportlib/vendor-modified/boost/config/stdlib/libstdcpp3.hpp +4 -4
  121. data/src/cxx_supportlib/vendor-modified/boost/container/adaptive_pool.hpp +262 -2
  122. data/src/cxx_supportlib/vendor-modified/boost/container/allocator.hpp +4 -3
  123. data/src/cxx_supportlib/vendor-modified/boost/container/allocator_traits.hpp +1 -1
  124. data/src/cxx_supportlib/vendor-modified/boost/container/deque.hpp +7 -0
  125. data/src/cxx_supportlib/vendor-modified/boost/container/detail/adaptive_node_pool.hpp +22 -19
  126. data/src/cxx_supportlib/vendor-modified/boost/container/detail/adaptive_node_pool_impl.hpp +833 -459
  127. data/src/cxx_supportlib/vendor-modified/boost/container/detail/advanced_insert_int.hpp +24 -6
  128. data/src/cxx_supportlib/vendor-modified/boost/container/detail/allocator_version_traits.hpp +2 -1
  129. data/src/cxx_supportlib/vendor-modified/boost/container/detail/compare_functors.hpp +61 -5
  130. data/src/cxx_supportlib/vendor-modified/boost/container/detail/copy_move_algo.hpp +33 -8
  131. data/src/cxx_supportlib/vendor-modified/boost/container/detail/flat_tree.hpp +132 -41
  132. data/src/cxx_supportlib/vendor-modified/boost/container/detail/iterator.hpp +16 -0
  133. data/src/cxx_supportlib/vendor-modified/boost/container/detail/math_functions.hpp +54 -0
  134. data/src/cxx_supportlib/vendor-modified/boost/container/detail/mpl.hpp +58 -0
  135. data/src/cxx_supportlib/vendor-modified/boost/container/detail/multiallocation_chain.hpp +28 -23
  136. data/src/cxx_supportlib/vendor-modified/boost/container/detail/node_alloc_holder.hpp +167 -115
  137. data/src/cxx_supportlib/vendor-modified/boost/container/detail/pair.hpp +55 -0
  138. data/src/cxx_supportlib/vendor-modified/boost/container/detail/std_fwd.hpp +3 -0
  139. data/src/cxx_supportlib/vendor-modified/boost/container/detail/thread_mutex.hpp +181 -0
  140. data/src/cxx_supportlib/vendor-modified/boost/container/detail/tree.hpp +167 -29
  141. data/src/cxx_supportlib/vendor-modified/boost/container/detail/type_traits.hpp +2 -0
  142. data/src/cxx_supportlib/vendor-modified/boost/container/detail/variadic_templates_tools.hpp +1 -1
  143. data/src/cxx_supportlib/vendor-modified/boost/container/detail/workaround.hpp +18 -0
  144. data/src/cxx_supportlib/vendor-modified/boost/container/flat_map.hpp +389 -3
  145. data/src/cxx_supportlib/vendor-modified/boost/container/flat_set.hpp +262 -0
  146. data/src/cxx_supportlib/vendor-modified/boost/container/list.hpp +52 -8
  147. data/src/cxx_supportlib/vendor-modified/boost/container/map.hpp +364 -0
  148. data/src/cxx_supportlib/vendor-modified/boost/container/pmr/monotonic_buffer_resource.hpp +4 -2
  149. data/src/cxx_supportlib/vendor-modified/boost/container/pmr/resource_adaptor.hpp +1 -1
  150. data/src/cxx_supportlib/vendor-modified/boost/container/pmr/synchronized_pool_resource.hpp +3 -2
  151. data/src/cxx_supportlib/vendor-modified/boost/container/set.hpp +286 -6
  152. data/src/cxx_supportlib/vendor-modified/boost/container/slist.hpp +56 -8
  153. data/src/cxx_supportlib/vendor-modified/boost/container/small_vector.hpp +43 -6
  154. data/src/cxx_supportlib/vendor-modified/boost/container/stable_vector.hpp +100 -31
  155. data/src/cxx_supportlib/vendor-modified/boost/container/static_vector.hpp +2 -1
  156. data/src/cxx_supportlib/vendor-modified/boost/container/string.hpp +126 -69
  157. data/src/cxx_supportlib/vendor-modified/boost/container/vector.hpp +75 -51
  158. data/src/cxx_supportlib/vendor-modified/boost/core/empty_value.hpp +136 -0
  159. data/src/cxx_supportlib/vendor-modified/boost/core/exchange.hpp +49 -0
  160. data/src/cxx_supportlib/vendor-modified/boost/core/explicit_operator_bool.hpp +9 -0
  161. data/src/cxx_supportlib/vendor-modified/boost/core/lightweight_test.hpp +101 -130
  162. data/src/cxx_supportlib/vendor-modified/boost/core/lightweight_test_trait.hpp +2 -2
  163. data/src/cxx_supportlib/vendor-modified/boost/core/noncopyable.hpp +16 -1
  164. data/src/cxx_supportlib/vendor-modified/boost/core/quick_exit.hpp +59 -0
  165. data/src/cxx_supportlib/vendor-modified/boost/core/ref.hpp +2 -1
  166. data/src/cxx_supportlib/vendor-modified/boost/core/swap.hpp +9 -2
  167. data/src/cxx_supportlib/vendor-modified/boost/core/typeinfo.hpp +26 -10
  168. data/src/cxx_supportlib/vendor-modified/boost/date_time/compiler_config.hpp +5 -0
  169. data/src/cxx_supportlib/vendor-modified/boost/date_time/posix_time/posix_time_duration.hpp +3 -3
  170. data/src/cxx_supportlib/vendor-modified/boost/date_time/time_duration.hpp +1 -1
  171. data/src/cxx_supportlib/vendor-modified/boost/detail/basic_pointerbuf.hpp +1 -1
  172. data/src/cxx_supportlib/vendor-modified/boost/detail/indirect_traits.hpp +38 -47
  173. data/src/cxx_supportlib/vendor-modified/boost/detail/lcast_precision.hpp +5 -5
  174. data/src/cxx_supportlib/vendor-modified/boost/detail/reference_content.hpp +7 -7
  175. data/src/cxx_supportlib/vendor-modified/boost/exception/exception.hpp +62 -58
  176. data/src/cxx_supportlib/vendor-modified/boost/function.hpp +1 -1
  177. data/src/cxx_supportlib/vendor-modified/boost/function/function_base.hpp +29 -29
  178. data/src/cxx_supportlib/vendor-modified/boost/function/function_template.hpp +38 -40
  179. data/src/cxx_supportlib/vendor-modified/boost/integer/common_factor_rt.hpp +4 -4
  180. data/src/cxx_supportlib/vendor-modified/boost/intrusive/avltree_algorithms.hpp +44 -44
  181. data/src/cxx_supportlib/vendor-modified/boost/intrusive/bstree_algorithms.hpp +39 -39
  182. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_list_algorithms.hpp +15 -15
  183. data/src/cxx_supportlib/vendor-modified/boost/intrusive/circular_slist_algorithms.hpp +7 -7
  184. data/src/cxx_supportlib/vendor-modified/boost/intrusive/derivation_value_traits.hpp +1 -1
  185. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/any_node_and_algorithms.hpp +14 -14
  186. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/avltree_node.hpp +9 -9
  187. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/common_slist_algorithms.hpp +7 -7
  188. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/list_iterator.hpp +1 -1
  189. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/list_node.hpp +2 -2
  190. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/node_cloner_disposer.hpp +2 -2
  191. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/rbtree_node.hpp +6 -6
  192. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/simple_disposers.hpp +1 -1
  193. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/slist_iterator.hpp +1 -1
  194. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/slist_node.hpp +1 -1
  195. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/tree_iterator.hpp +1 -1
  196. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/tree_node.hpp +3 -3
  197. data/src/cxx_supportlib/vendor-modified/boost/intrusive/detail/tree_value_compare.hpp +33 -14
  198. data/src/cxx_supportlib/vendor-modified/boost/intrusive/hashtable.hpp +12 -12
  199. data/src/cxx_supportlib/vendor-modified/boost/intrusive/linear_slist_algorithms.hpp +4 -4
  200. data/src/cxx_supportlib/vendor-modified/boost/intrusive/pointer_plus_bits.hpp +3 -0
  201. data/src/cxx_supportlib/vendor-modified/boost/intrusive/rbtree_algorithms.hpp +39 -39
  202. data/src/cxx_supportlib/vendor-modified/boost/intrusive/sgtree_algorithms.hpp +61 -61
  203. data/src/cxx_supportlib/vendor-modified/boost/intrusive/slist.hpp +4 -4
  204. data/src/cxx_supportlib/vendor-modified/boost/intrusive/splaytree_algorithms.hpp +66 -66
  205. data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap_algorithms.hpp +54 -54
  206. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set.hpp +6 -2
  207. data/src/cxx_supportlib/vendor-modified/boost/intrusive/unordered_set_hook.hpp +3 -3
  208. data/src/cxx_supportlib/vendor-modified/boost/iterator/advance.hpp +1 -1
  209. data/src/cxx_supportlib/vendor-modified/boost/iterator/distance.hpp +65 -0
  210. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast.hpp +1 -1
  211. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/bad_lexical_cast.hpp +1 -1
  212. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_lexical.hpp +23 -23
  213. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_lexical_streams.hpp +4 -4
  214. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_numeric.hpp +13 -13
  215. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/inf_nan.hpp +1 -1
  216. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/is_character.hpp +5 -4
  217. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_char_constants.hpp +1 -1
  218. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_unsigned_converters.hpp +5 -5
  219. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/widest_char.hpp +5 -2
  220. data/src/cxx_supportlib/vendor-modified/boost/lexical_cast/try_lexical_convert.hpp +18 -13
  221. data/src/cxx_supportlib/vendor-modified/boost/libs/regex/src/cregex.cpp +4 -4
  222. data/src/cxx_supportlib/vendor-modified/boost/libs/system/src/error_code.cpp +16 -5
  223. data/src/cxx_supportlib/vendor-modified/boost/libs/thread/src/future.cpp +1 -1
  224. data/src/cxx_supportlib/vendor-modified/boost/libs/thread/src/pthread/thread.cpp +14 -8
  225. data/src/cxx_supportlib/vendor-modified/boost/libs/thread/src/tss_null.cpp +2 -2
  226. data/src/cxx_supportlib/vendor-modified/boost/math/special_functions/detail/fp_traits.hpp +13 -13
  227. data/src/cxx_supportlib/vendor-modified/boost/math/special_functions/math_fwd.hpp +27 -0
  228. data/src/cxx_supportlib/vendor-modified/boost/math/tools/config.hpp +1 -1
  229. data/src/cxx_supportlib/vendor-modified/boost/move/algo/adaptive_merge.hpp +29 -6
  230. data/src/cxx_supportlib/vendor-modified/boost/move/algo/adaptive_sort.hpp +12 -3
  231. data/src/cxx_supportlib/vendor-modified/boost/move/algo/detail/adaptive_sort_merge.hpp +1 -1
  232. data/src/cxx_supportlib/vendor-modified/boost/move/algo/move.hpp +1 -1
  233. data/src/cxx_supportlib/vendor-modified/boost/move/algorithm.hpp +1 -1
  234. data/src/cxx_supportlib/vendor-modified/boost/move/core.hpp +8 -8
  235. data/src/cxx_supportlib/vendor-modified/boost/move/detail/meta_utils.hpp +2 -0
  236. data/src/cxx_supportlib/vendor-modified/boost/move/detail/type_traits.hpp +3 -3
  237. data/src/cxx_supportlib/vendor-modified/boost/mpl/assert.hpp +23 -3
  238. data/src/cxx_supportlib/vendor-modified/boost/optional/detail/experimental_traits.hpp +9 -3
  239. data/src/cxx_supportlib/vendor-modified/boost/optional/detail/old_optional_implementation.hpp +10 -11
  240. data/src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_reference_spec.hpp +20 -1
  241. data/src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_trivially_copyable_base.hpp +3 -3
  242. data/src/cxx_supportlib/vendor-modified/boost/optional/optional.hpp +211 -101
  243. data/src/cxx_supportlib/vendor-modified/boost/parameter/python.hpp +5 -6
  244. data/src/cxx_supportlib/vendor-modified/boost/pool/detail/mutex.hpp +119 -25
  245. data/src/cxx_supportlib/vendor-modified/boost/predef/architecture.h +1 -0
  246. data/src/cxx_supportlib/vendor-modified/boost/predef/architecture/arm.h +5 -0
  247. data/src/cxx_supportlib/vendor-modified/boost/predef/architecture/ptx.h +44 -0
  248. data/src/cxx_supportlib/vendor-modified/boost/predef/compiler.h +1 -0
  249. data/src/cxx_supportlib/vendor-modified/boost/predef/compiler/compaq.h +1 -1
  250. data/src/cxx_supportlib/vendor-modified/boost/predef/compiler/nvcc.h +73 -0
  251. data/src/cxx_supportlib/vendor-modified/boost/predef/detail/endian_compat.h +3 -1
  252. data/src/cxx_supportlib/vendor-modified/boost/predef/language.h +1 -0
  253. data/src/cxx_supportlib/vendor-modified/boost/predef/language/cuda.h +52 -0
  254. data/src/cxx_supportlib/vendor-modified/boost/predef/make.h +4 -0
  255. data/src/cxx_supportlib/vendor-modified/boost/predef/os/cygwin.h +6 -1
  256. data/src/cxx_supportlib/vendor-modified/boost/predef/other/endian.h +1 -2
  257. data/src/cxx_supportlib/vendor-modified/boost/predef/version.h +1 -1
  258. data/src/cxx_supportlib/vendor-modified/boost/preprocessor/config/config.hpp +17 -8
  259. data/src/cxx_supportlib/vendor-modified/boost/preprocessor/stringize.hpp +4 -0
  260. data/src/cxx_supportlib/vendor-modified/boost/preprocessor/wstringize.hpp +4 -0
  261. data/src/cxx_supportlib/vendor-modified/boost/random/detail/gray_coded_qrng.hpp +166 -0
  262. data/src/cxx_supportlib/vendor-modified/boost/random/detail/niederreiter_base2_table.hpp +513 -0
  263. data/src/cxx_supportlib/vendor-modified/boost/random/detail/qrng_base.hpp +291 -0
  264. data/src/cxx_supportlib/vendor-modified/boost/random/detail/sobol_table.hpp +4106 -0
  265. data/src/cxx_supportlib/vendor-modified/boost/random/faure.hpp +367 -0
  266. data/src/cxx_supportlib/vendor-modified/boost/random/niederreiter_base2.hpp +360 -0
  267. data/src/cxx_supportlib/vendor-modified/boost/random/sobol.hpp +237 -0
  268. data/src/cxx_supportlib/vendor-modified/boost/range/as_literal.hpp +43 -0
  269. data/src/cxx_supportlib/vendor-modified/boost/range/begin.hpp +13 -5
  270. data/src/cxx_supportlib/vendor-modified/boost/range/concepts.hpp +1 -1
  271. data/src/cxx_supportlib/vendor-modified/boost/range/detail/common.hpp +1 -3
  272. data/src/cxx_supportlib/vendor-modified/boost/range/detail/implementation_help.hpp +2 -2
  273. data/src/cxx_supportlib/vendor-modified/boost/range/distance.hpp +11 -5
  274. data/src/cxx_supportlib/vendor-modified/boost/range/end.hpp +14 -6
  275. data/src/cxx_supportlib/vendor-modified/boost/range/has_range_iterator.hpp +3 -3
  276. data/src/cxx_supportlib/vendor-modified/boost/ratio/config.hpp +6 -2
  277. data/src/cxx_supportlib/vendor-modified/boost/rational.hpp +55 -37
  278. data/src/cxx_supportlib/vendor-modified/boost/regex/concepts.hpp +3 -2
  279. data/src/cxx_supportlib/vendor-modified/boost/regex/config.hpp +11 -1
  280. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex.hpp +7 -1
  281. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex_creator.hpp +3 -1
  282. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/basic_regex_parser.hpp +5 -2
  283. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/fileiter.hpp +0 -3
  284. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp +15 -4
  285. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/match_flags.hpp +1 -2
  286. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/match_results.hpp +12 -3
  287. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/perl_matcher.hpp +7 -2
  288. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/perl_matcher_common.hpp +7 -3
  289. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/perl_matcher_non_recursive.hpp +6 -2
  290. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_format.hpp +0 -5
  291. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_iterator.hpp +0 -8
  292. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_raw_buffer.hpp +3 -3
  293. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_split.hpp +3 -1
  294. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_token_iterator.hpp +0 -8
  295. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_traits_defaults.hpp +12 -11
  296. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_workaround.hpp +7 -4
  297. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/u32regex_iterator.hpp +1 -9
  298. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/u32regex_token_iterator.hpp +2 -10
  299. data/src/cxx_supportlib/vendor-modified/boost/regex/v4/w32_regex_traits.hpp +2 -0
  300. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/allocate_shared_array.hpp +60 -115
  301. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/local_counted_base.hpp +3 -3
  302. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp +2 -1
  303. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_aix.hpp +2 -1
  304. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_clang.hpp +2 -1
  305. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp +2 -1
  306. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp +2 -1
  307. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp +2 -1
  308. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +2 -1
  309. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp +2 -1
  310. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp +2 -1
  311. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp +2 -1
  312. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_nt.hpp +2 -1
  313. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_pt.hpp +2 -1
  314. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp +2 -1
  315. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_solaris.hpp +2 -1
  316. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_spin.hpp +2 -1
  317. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp +2 -1
  318. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_sync.hpp +2 -1
  319. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp +2 -1
  320. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_impl.hpp +3 -3
  321. data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/yield_k.hpp +14 -8
  322. data/src/cxx_supportlib/vendor-modified/boost/system/config.hpp +4 -24
  323. data/src/cxx_supportlib/vendor-modified/boost/system/detail/config.hpp +57 -0
  324. data/src/cxx_supportlib/vendor-modified/boost/system/detail/generic_category.hpp +101 -0
  325. data/src/cxx_supportlib/vendor-modified/boost/system/detail/std_interoperability.hpp +141 -0
  326. data/src/cxx_supportlib/vendor-modified/boost/system/detail/system_category_posix.hpp +132 -0
  327. data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +775 -588
  328. data/src/cxx_supportlib/vendor-modified/boost/system/system_error.hpp +4 -4
  329. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/config.hpp +6 -0
  330. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/move.hpp +13 -6
  331. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/nullary_function.hpp +8 -3
  332. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp +3 -1
  333. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread_safety.hpp +160 -0
  334. data/src/cxx_supportlib/vendor-modified/boost/thread/detail/tss_hooks.hpp +2 -2
  335. data/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp +3 -3
  336. data/src/cxx_supportlib/vendor-modified/boost/thread/executors/basic_thread_pool.hpp +24 -1
  337. data/src/cxx_supportlib/vendor-modified/boost/thread/future.hpp +10 -1
  338. data/src/cxx_supportlib/vendor-modified/boost/thread/lock_guard.hpp +4 -4
  339. data/src/cxx_supportlib/vendor-modified/boost/thread/lockable_traits.hpp +31 -0
  340. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/condition_variable.hpp +2 -2
  341. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/condition_variable_fwd.hpp +2 -2
  342. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/mutex.hpp +8 -53
  343. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/pthread_mutex_scoped_lock.hpp +73 -4
  344. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/recursive_mutex.hpp +6 -6
  345. data/src/cxx_supportlib/vendor-modified/boost/thread/pthread/thread_data.hpp +14 -9
  346. data/src/cxx_supportlib/vendor-modified/boost/thread/xtime.hpp +6 -6
  347. data/src/cxx_supportlib/vendor-modified/boost/throw_exception.hpp +9 -8
  348. data/src/cxx_supportlib/vendor-modified/boost/token_functions.hpp +1 -0
  349. data/src/cxx_supportlib/vendor-modified/boost/type_index/stl_type_index.hpp +21 -19
  350. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/common_arithmetic_type.hpp +3 -1
  351. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/config.hpp +9 -0
  352. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/detector.hpp +1 -1
  353. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/has_postfix_operator.hpp +55 -0
  354. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/has_prefix_operator.hpp +72 -0
  355. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_function_cxx_03.hpp +108 -0
  356. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_function_cxx_11.hpp +501 -0
  357. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_function_msvc10_fix.hpp +30 -0
  358. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_likely_lambda.hpp +2 -2
  359. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_member_function_pointer_cxx_03.hpp +117 -0
  360. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +557 -0
  361. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detail/is_rvalue_reference_msvc10_fix.hpp +43 -0
  362. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detected.hpp +1 -1
  363. data/src/cxx_supportlib/vendor-modified/boost/type_traits/detected_or.hpp +1 -1
  364. data/src/cxx_supportlib/vendor-modified/boost/type_traits/enable_if.hpp +37 -0
  365. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_dereference.hpp +344 -0
  366. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_minus.hpp +5 -0
  367. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_minus_assign.hpp +5 -0
  368. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_plus_assign.hpp +5 -0
  369. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_post_decrement.hpp +21 -0
  370. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_post_increment.hpp +21 -0
  371. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_pre_decrement.hpp +21 -0
  372. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_pre_increment.hpp +22 -0
  373. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_trivial_move_assign.hpp +1 -1
  374. data/src/cxx_supportlib/vendor-modified/boost/type_traits/has_trivial_move_constructor.hpp +2 -1
  375. data/src/cxx_supportlib/vendor-modified/boost/type_traits/integral_constant.hpp +5 -15
  376. data/src/cxx_supportlib/vendor-modified/boost/type_traits/intrinsics.hpp +16 -6
  377. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_complete.hpp +3 -1
  378. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_copy_assignable.hpp +3 -4
  379. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_copy_constructible.hpp +4 -6
  380. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_detected.hpp +1 -1
  381. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_detected_convertible.hpp +1 -1
  382. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_detected_exact.hpp +1 -1
  383. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_final.hpp +1 -1
  384. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_function.hpp +4 -79
  385. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_member_function_pointer.hpp +3 -97
  386. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_noncopyable.hpp +39 -0
  387. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_nothrow_move_assignable.hpp +2 -2
  388. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_nothrow_move_constructible.hpp +2 -2
  389. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_rvalue_reference.hpp +4 -0
  390. data/src/cxx_supportlib/vendor-modified/boost/type_traits/is_virtual_base_of.hpp +104 -63
  391. data/src/cxx_supportlib/vendor-modified/boost/type_traits/make_void.hpp +1 -1
  392. data/src/cxx_supportlib/vendor-modified/boost/type_traits/nonesuch.hpp +1 -1
  393. data/src/cxx_supportlib/vendor-modified/boost/typeof/constant.hpp +26 -0
  394. data/src/cxx_supportlib/vendor-modified/boost/typeof/dmc/typeof_impl.hpp +4 -4
  395. data/src/cxx_supportlib/vendor-modified/boost/typeof/encode_decode.hpp +0 -3
  396. data/src/cxx_supportlib/vendor-modified/boost/typeof/encode_decode_params.hpp +1 -1
  397. data/src/cxx_supportlib/vendor-modified/boost/typeof/int_encoding.hpp +4 -5
  398. data/src/cxx_supportlib/vendor-modified/boost/typeof/modifiers.hpp +5 -5
  399. data/src/cxx_supportlib/vendor-modified/boost/typeof/msvc/typeof_impl.hpp +9 -9
  400. data/src/cxx_supportlib/vendor-modified/boost/typeof/native.hpp +3 -3
  401. data/src/cxx_supportlib/vendor-modified/boost/typeof/pointers_data_members.hpp +2 -2
  402. data/src/cxx_supportlib/vendor-modified/boost/typeof/register_functions_iterate.hpp +6 -6
  403. data/src/cxx_supportlib/vendor-modified/boost/typeof/register_mem_functions.hpp +1 -1
  404. data/src/cxx_supportlib/vendor-modified/boost/typeof/template_encoding.hpp +4 -4
  405. data/src/cxx_supportlib/vendor-modified/boost/typeof/template_template_param.hpp +2 -2
  406. data/src/cxx_supportlib/vendor-modified/boost/typeof/type_encoding.hpp +2 -2
  407. data/src/cxx_supportlib/vendor-modified/boost/typeof/typeof_impl.hpp +16 -16
  408. data/src/cxx_supportlib/vendor-modified/boost/typeof/vector.hpp +5 -5
  409. data/src/cxx_supportlib/vendor-modified/boost/typeof/vector100.hpp +201 -201
  410. data/src/cxx_supportlib/vendor-modified/boost/typeof/vector150.hpp +301 -301
  411. data/src/cxx_supportlib/vendor-modified/boost/typeof/vector200.hpp +401 -401
  412. data/src/cxx_supportlib/vendor-modified/boost/typeof/vector50.hpp +101 -101
  413. data/src/cxx_supportlib/vendor-modified/boost/utility/detail/minstd_rand.hpp +3 -0
  414. data/src/cxx_supportlib/vendor-modified/boost/utility/string_ref.hpp +2 -0
  415. data/src/cxx_supportlib/vendor-modified/boost/utility/string_view.hpp +26 -6
  416. data/src/cxx_supportlib/vendor-modified/boost/version.hpp +2 -2
  417. data/src/helper-scripts/prespawn +1 -0
  418. data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c +40 -0
  419. data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +26 -0
  420. data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +48 -0
  421. data/src/nginx_module/Configuration.c +6 -2
  422. data/src/nginx_module/ContentHandler.c +5 -1
  423. data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +15 -0
  424. data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +15 -0
  425. data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +28 -0
  426. data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +6 -0
  427. data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +11 -0
  428. data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c +11 -0
  429. data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c +23 -0
  430. data/src/nginx_module/MainConfig/AutoGeneratedStruct.h +8 -0
  431. data/src/nginx_module/ngx_http_passenger_module.c +2 -0
  432. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js +0 -0
  433. data/src/ruby_native_extension/extconf.rb +7 -0
  434. data/src/ruby_supportlib/phusion_passenger.rb +7 -7
  435. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +8 -0
  436. data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb +23 -0
  437. data/src/ruby_supportlib/phusion_passenger/constants.rb +1 -0
  438. data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb +1 -3
  439. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +37 -0
  440. data/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb +1 -1
  441. data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb +10 -0
  442. data/src/ruby_supportlib/phusion_passenger/request_handler.rb +2 -2
  443. data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb +5 -0
  444. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +11 -0
  445. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +3 -0
  446. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +1 -1
  447. data/src/ruby_supportlib/phusion_passenger/utils/tee_input.rb +6 -0
  448. data/src/ruby_supportlib/phusion_passenger/utils/unseekable_socket.rb +15 -11
  449. metadata +42 -8
  450. data/src/cxx_supportlib/vendor-modified/boost/call_traits.hpp +0 -20
  451. data/src/cxx_supportlib/vendor-modified/boost/detail/call_traits.hpp +0 -172
  452. data/src/cxx_supportlib/vendor-modified/boost/detail/no_exceptions_support.hpp +0 -17
  453. data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_code.ipp +0 -496
@@ -177,6 +177,11 @@ extern "C" const command_rec passenger_commands[] = {
177
177
  NULL,
178
178
  RSRC_CONF,
179
179
  "Whether to disable Phusion Passenger anonymous telemetry."),
180
+ AP_INIT_FLAG("PassengerDisableLogPrefix",
181
+ (FlagFunc) cmd_passenger_disable_log_prefix,
182
+ NULL,
183
+ RSRC_CONF,
184
+ "Disable prefixing log statements with PID and channel."),
180
185
  AP_INIT_FLAG("PassengerDisableSecurityUpdateCheck",
181
186
  (FlagFunc) cmd_passenger_disable_security_update_check,
182
187
  NULL,
@@ -377,6 +382,11 @@ extern "C" const command_rec passenger_commands[] = {
377
382
  NULL,
378
383
  RSRC_CONF,
379
384
  "The Phusion Passenger socket backlog."),
385
+ AP_INIT_TAKE1("PassengerSpawnDir",
386
+ (Take1Func) cmd_passenger_spawn_dir,
387
+ NULL,
388
+ RSRC_CONF,
389
+ "The directory for Phusion Passenger used during child spawning."),
380
390
  AP_INIT_TAKE1("PassengerSpawnMethod",
381
391
  (Take1Func) cmd_passenger_spawn_method,
382
392
  NULL,
@@ -73,6 +73,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
73
73
  "PassengerDisableAnonymousTelemetry",
74
74
  false);
75
75
 
76
+ addOptionsContainerStaticDefaultBool(
77
+ globalConfigContainer,
78
+ "PassengerDisableLogPrefix",
79
+ false);
80
+
76
81
  addOptionsContainerStaticDefaultBool(
77
82
  globalConfigContainer,
78
83
  "PassengerDisableSecurityUpdateCheck",
@@ -123,6 +128,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
123
128
  "PassengerSocketBacklog",
124
129
  DEFAULT_SOCKET_BACKLOG);
125
130
 
131
+ addOptionsContainerDynamicDefault(
132
+ globalConfigContainer,
133
+ "PassengerSpawnDir",
134
+ P_STATIC_STRING("Either $TMPDIR or /tmp"));
135
+
126
136
  addOptionsContainerStaticDefaultInt(
127
137
  globalConfigContainer,
128
138
  "PassengerStatThrottleRate",
@@ -334,6 +334,21 @@ cmd_passenger_disable_anonymous_telemetry(cmd_parms *cmd, void *pcfg, const char
334
334
  return NULL;
335
335
  }
336
336
 
337
+ static const char *
338
+ cmd_passenger_disable_log_prefix(cmd_parms *cmd, void *pcfg, const char *arg) {
339
+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
340
+ if (err != NULL) {
341
+ ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
342
+ "WARNING: %s", err);
343
+ }
344
+
345
+ serverConfig.disableLogPrefixSourceFile = cmd->directive->filename;
346
+ serverConfig.disableLogPrefixSourceLine = cmd->directive->line_num;
347
+ serverConfig.disableLogPrefixExplicitlySet = true;
348
+ serverConfig.disableLogPrefix = arg != NULL;
349
+ return NULL;
350
+ }
351
+
337
352
  static const char *
338
353
  cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const char *arg) {
339
354
  const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -817,6 +832,21 @@ cmd_passenger_socket_backlog(cmd_parms *cmd, void *pcfg, const char *arg) {
817
832
  return setIntConfig(cmd, arg, serverConfig.socketBacklog, 0);
818
833
  }
819
834
 
835
+ static const char *
836
+ cmd_passenger_spawn_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
837
+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
838
+ if (err != NULL) {
839
+ ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
840
+ "WARNING: %s", err);
841
+ }
842
+
843
+ serverConfig.spawnDirSourceFile = cmd->directive->filename;
844
+ serverConfig.spawnDirSourceLine = cmd->directive->line_num;
845
+ serverConfig.spawnDirExplicitlySet = true;
846
+ serverConfig.spawnDir = arg;
847
+ return NULL;
848
+ }
849
+
820
850
  static const char *
821
851
  cmd_passenger_start_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
822
852
  const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -1020,6 +1020,10 @@ private:
1020
1020
  env = (apr_table_entry_t*) env_arr->elts;
1021
1021
 
1022
1022
  for (i = 0; i < env_arr->nelts; ++i) {
1023
+ if ((strcmp(env[i].key, "SCRIPT_NAME") == 0)
1024
+ || (strcmp(env[i].key, "PATH_INFO") == 0)) {
1025
+ continue;
1026
+ }
1023
1027
  envvarsData.append(env[i].key);
1024
1028
  envvarsData.append("\0", 1);
1025
1029
  if (env[i].val != NULL) {
@@ -1334,6 +1338,7 @@ public:
1334
1338
  config["controller_socket_backlog"] = serverConfig.socketBacklog;
1335
1339
  config["controller_file_buffered_channel_buffer_dir"] = nonEmptyString(serverConfig.dataBufferDir);
1336
1340
  config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
1341
+ config["spawn_dir"] = nonEmptyString(serverConfig.spawnDir);
1337
1342
  config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
1338
1343
  config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
1339
1344
  config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;
@@ -1354,6 +1359,7 @@ public:
1354
1359
  config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
1355
1360
  config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
1356
1361
  config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
1362
+ config["disable_log_prefix"] = serverConfig.disableLogPrefix;
1357
1363
 
1358
1364
  if (!serverConfig.logFile.empty()) {
1359
1365
  config["log_target"] = serverConfig.logFile.toString();
@@ -155,6 +155,15 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
155
155
  serverConfig.disableAnonymousTelemetrySourceLine);
156
156
  hierarchyMember["value"] = serverConfig.disableAnonymousTelemetry == Apache2Module::ENABLED;
157
157
  }
158
+ if (serverConfig.disableLogPrefixExplicitlySet) {
159
+ Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
160
+ "PassengerDisableLogPrefix",
161
+ sizeof("PassengerDisableLogPrefix") - 1);
162
+ Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
163
+ serverConfig.disableLogPrefixSourceFile,
164
+ serverConfig.disableLogPrefixSourceLine);
165
+ hierarchyMember["value"] = serverConfig.disableLogPrefix == Apache2Module::ENABLED;
166
+ }
158
167
  if (serverConfig.disableSecurityUpdateCheckExplicitlySet) {
159
168
  Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
160
169
  "PassengerDisableSecurityUpdateCheck",
@@ -303,6 +312,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
303
312
  serverConfig.socketBacklogSourceLine);
304
313
  hierarchyMember["value"] = serverConfig.socketBacklog;
305
314
  }
315
+ if (serverConfig.spawnDirExplicitlySet) {
316
+ Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
317
+ "PassengerSpawnDir",
318
+ sizeof("PassengerSpawnDir") - 1);
319
+ Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
320
+ serverConfig.spawnDirSourceFile,
321
+ serverConfig.spawnDirSourceLine);
322
+ hierarchyMember["value"] = Json::Value(
323
+ serverConfig.spawnDir.data(),
324
+ serverConfig.spawnDir.data() + serverConfig.spawnDir.size());
325
+ }
306
326
  if (serverConfig.statThrottleRateExplicitlySet) {
307
327
  Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
308
328
  "PassengerStatThrottleRate",
@@ -62,6 +62,11 @@ struct AutoGeneratedServerConfig {
62
62
  */
63
63
  bool disableAnonymousTelemetry;
64
64
 
65
+ /*
66
+ * Disable prefixing log statements with PID and channel.
67
+ */
68
+ bool disableLogPrefix;
69
+
65
70
  /*
66
71
  * Whether to disable the Phusion Passenger security update check & notification.
67
72
  */
@@ -192,6 +197,11 @@ struct AutoGeneratedServerConfig {
192
197
  */
193
198
  StaticString securityUpdateCheckProxy;
194
199
 
200
+ /*
201
+ * The directory for Phusion Passenger used during child spawning.
202
+ */
203
+ StaticString spawnDir;
204
+
195
205
  /*
196
206
  * Prestart the given web applications during startup.
197
207
  */
@@ -199,6 +209,7 @@ struct AutoGeneratedServerConfig {
199
209
 
200
210
 
201
211
  StaticString disableAnonymousTelemetrySourceFile;
212
+ StaticString disableLogPrefixSourceFile;
202
213
  StaticString disableSecurityUpdateCheckSourceFile;
203
214
  StaticString showVersionInHeaderSourceFile;
204
215
  StaticString turbocachingSourceFile;
@@ -225,9 +236,11 @@ struct AutoGeneratedServerConfig {
225
236
  StaticString logFileSourceFile;
226
237
  StaticString rootSourceFile;
227
238
  StaticString securityUpdateCheckProxySourceFile;
239
+ StaticString spawnDirSourceFile;
228
240
  StaticString prestartURLsSourceFile;
229
241
 
230
242
  unsigned int disableAnonymousTelemetrySourceLine;
243
+ unsigned int disableLogPrefixSourceLine;
231
244
  unsigned int disableSecurityUpdateCheckSourceLine;
232
245
  unsigned int showVersionInHeaderSourceLine;
233
246
  unsigned int turbocachingSourceLine;
@@ -254,9 +267,11 @@ struct AutoGeneratedServerConfig {
254
267
  unsigned int logFileSourceLine;
255
268
  unsigned int rootSourceLine;
256
269
  unsigned int securityUpdateCheckProxySourceLine;
270
+ unsigned int spawnDirSourceLine;
257
271
  unsigned int prestartURLsSourceLine;
258
272
 
259
273
  bool disableAnonymousTelemetryExplicitlySet: 1;
274
+ bool disableLogPrefixExplicitlySet: 1;
260
275
  bool disableSecurityUpdateCheckExplicitlySet: 1;
261
276
  bool showVersionInHeaderExplicitlySet: 1;
262
277
  bool turbocachingExplicitlySet: 1;
@@ -283,11 +298,13 @@ struct AutoGeneratedServerConfig {
283
298
  bool logFileExplicitlySet: 1;
284
299
  bool rootExplicitlySet: 1;
285
300
  bool securityUpdateCheckProxyExplicitlySet: 1;
301
+ bool spawnDirExplicitlySet: 1;
286
302
  bool prestartURLsExplicitlySet: 1;
287
303
 
288
304
 
289
305
  AutoGeneratedServerConfig() {
290
306
  disableAnonymousTelemetry = false;
307
+ disableLogPrefix = false;
291
308
  disableSecurityUpdateCheck = false;
292
309
  showVersionInHeader = true;
293
310
  turbocaching = true;
@@ -340,11 +357,15 @@ struct AutoGeneratedServerConfig {
340
357
  /*
341
358
  * securityUpdateCheckProxy: default initialized
342
359
  */
360
+ /*
361
+ * spawnDir: default initialized
362
+ */
343
363
  /*
344
364
  * prestartURLs: default initialized
345
365
  */
346
366
 
347
367
  disableAnonymousTelemetrySourceLine = 0;
368
+ disableLogPrefixSourceLine = 0;
348
369
  disableSecurityUpdateCheckSourceLine = 0;
349
370
  showVersionInHeaderSourceLine = 0;
350
371
  turbocachingSourceLine = 0;
@@ -371,9 +392,11 @@ struct AutoGeneratedServerConfig {
371
392
  logFileSourceLine = 0;
372
393
  rootSourceLine = 0;
373
394
  securityUpdateCheckProxySourceLine = 0;
395
+ spawnDirSourceLine = 0;
374
396
  prestartURLsSourceLine = 0;
375
397
 
376
398
  disableAnonymousTelemetryExplicitlySet = false;
399
+ disableLogPrefixExplicitlySet = false;
377
400
  disableSecurityUpdateCheckExplicitlySet = false;
378
401
  showVersionInHeaderExplicitlySet = false;
379
402
  turbocachingExplicitlySet = false;
@@ -400,6 +423,7 @@ struct AutoGeneratedServerConfig {
400
423
  logFileExplicitlySet = false;
401
424
  rootExplicitlySet = false;
402
425
  securityUpdateCheckProxyExplicitlySet = false;
426
+ spawnDirExplicitlySet = false;
403
427
  prestartURLsExplicitlySet = false;
404
428
  }
405
429
 
@@ -68,6 +68,7 @@
68
68
  #define DEFAULT_SPAWN_METHOD "smart"
69
69
  #define DEFAULT_START_TIMEOUT 90000
70
70
  #define DEFAULT_STAT_THROTTLE_RATE 10
71
+ #define DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "SameSite=Lax; Secure;"
71
72
  #define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
72
73
  #define DEFAULT_WEB_APP_USER "nobody"
73
74
  #define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
@@ -81,7 +82,7 @@
81
82
  #define PASSENGER_API_VERSION_MAJOR 0
82
83
  #define PASSENGER_API_VERSION_MINOR 3
83
84
  #define PASSENGER_DEFAULT_USER "nobody"
84
- #define PASSENGER_VERSION "6.0.1"
85
+ #define PASSENGER_VERSION "6.0.6"
85
86
  #define POOL_HELPER_THREAD_STACK_SIZE 262144
86
87
  #define PROCESS_SHUTDOWN_TIMEOUT 60
87
88
  #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
@@ -51,6 +51,7 @@ using namespace std;
51
51
  *
52
52
  * app_output_log_level string - default("notice")
53
53
  * buffer_logs boolean - default(false)
54
+ * disable_log_prefix boolean - default(false)
54
55
  * file_descriptor_log_target any - -
55
56
  * level string - default("notice")
56
57
  * redirect_stderr boolean - default(true)
@@ -88,6 +89,7 @@ struct ConfigRealization {
88
89
  FdClosePolicy targetFdClosePolicy;
89
90
  FdClosePolicy fileDescriptorLogTargetFdClosePolicy;
90
91
  bool finalized;
92
+ bool disableLogPrefix;
91
93
 
92
94
  ConfigRealization(const ConfigKit::Store &store);
93
95
  ~ConfigRealization();
@@ -409,16 +409,18 @@ realLogAppOutput(const HashedStaticString &groupName, int targetFd,
409
409
  const char *pidStr, unsigned int pidStrLen,
410
410
  const char *channelName, unsigned int channelNameLen,
411
411
  const char *message, unsigned int messageLen, int appLogFile,
412
- bool saveLog)
412
+ bool saveLog, bool prefixLogs)
413
413
  {
414
414
  char *pos = buf;
415
415
  char *end = buf + bufSize;
416
416
 
417
- pos = appendData(pos, end, "App ");
418
- pos = appendData(pos, end, pidStr, pidStrLen);
419
- pos = appendData(pos, end, " ");
420
- pos = appendData(pos, end, channelName, channelNameLen);
421
- pos = appendData(pos, end, ": ");
417
+ if (prefixLogs) {
418
+ pos = appendData(pos, end, "App ");
419
+ pos = appendData(pos, end, pidStr, pidStrLen);
420
+ pos = appendData(pos, end, " ");
421
+ pos = appendData(pos, end, channelName, channelNameLen);
422
+ pos = appendData(pos, end, ": ");
423
+ }
422
424
  pos = appendData(pos, end, message, messageLen);
423
425
  pos = appendData(pos, end, "\n");
424
426
 
@@ -437,6 +439,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
437
439
  {
438
440
  int targetFd;
439
441
  bool saveLog = false;
442
+ bool prefixLogs = true;
440
443
 
441
444
  if (OXT_LIKELY(context != NULL)) {
442
445
  const ConfigRealization *configRealization = context->getConfigRealization();
@@ -446,6 +449,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
446
449
 
447
450
  targetFd = configRealization->targetFd;
448
451
  saveLog = configRealization->saveLog;
452
+ prefixLogs = !configRealization->disableLogPrefix;
449
453
  } else {
450
454
  targetFd = STDERR_FILENO;
451
455
  }
@@ -476,14 +480,14 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
476
480
  buf, sizeof(buf),
477
481
  pidStr, pidStrLen,
478
482
  channelName.data(), channelName.size(),
479
- message, size, fd, saveLog);
483
+ message, size, fd, saveLog, prefixLogs);
480
484
  } else {
481
485
  DynamicBuffer buf(totalLen);
482
486
  realLogAppOutput(groupName, targetFd,
483
487
  buf.data, totalLen,
484
488
  pidStr, pidStrLen,
485
489
  channelName.data(), channelName.size(),
486
- message, size, fd, saveLog);
490
+ message, size, fd, saveLog, prefixLogs);
487
491
  }
488
492
  if(fd > -1){close(fd);}
489
493
  }
@@ -778,6 +782,7 @@ Schema::Schema() {
778
782
  add("redirect_stderr", BOOL_TYPE, OPTIONAL, true);
779
783
  add("app_output_log_level", STRING_TYPE, OPTIONAL, DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME);
780
784
  add("buffer_logs", BOOL_TYPE, OPTIONAL, false);
785
+ add("disable_log_prefix", BOOL_TYPE, OPTIONAL, false);
781
786
 
782
787
  addValidator(boost::bind(validateLogLevel, "level",
783
788
  boost::placeholders::_1, boost::placeholders::_2));
@@ -798,7 +803,8 @@ ConfigRealization::ConfigRealization(const ConfigKit::Store &store)
798
803
  : level(parseLevel(store["level"].asString())),
799
804
  appOutputLogLevel(parseLevel(store["app_output_log_level"].asString())),
800
805
  saveLog(store["buffer_logs"].asBool()),
801
- finalized(false)
806
+ finalized(false),
807
+ disableLogPrefix(store["disable_log_prefix"].asBool())
802
808
  {
803
809
  if (store["target"].isMember("stderr")) {
804
810
  targetType = STDERR_TARGET;
@@ -112,7 +112,7 @@ private:
112
112
  static int parseHexDigit(char ch) {
113
113
  if (ch >= 'A' && ch <= 'F') {
114
114
  return 10 + ch - 'A';
115
- } else if (ch >= 'a' && ch <= 'z') {
115
+ } else if (ch >= 'a' && ch <= 'f') {
116
116
  return 10 + ch - 'a';
117
117
  } else {
118
118
  return ch - '0';
@@ -43,33 +43,34 @@ _linuxAutoDetectInContainer() {
43
43
  return (file.length() > 0);
44
44
  }
45
45
 
46
- if (fileExists("/proc/1/environ")) {
47
- string file = unsafeReadFile("/proc/1/environ");
48
- if (file.size() > 0) {
49
- vector<string> v;
50
- split(file,'\0', v);
51
- for(vector<string>::iterator it = v.begin(); it != v.end(); ++it) {
52
- if (startsWith(*it, "container=")) {
53
- return true;
46
+ if (geteuid() == 0) {
47
+ if (fileExists("/proc/1/environ")) {
48
+ string file = unsafeReadFile("/proc/1/environ");
49
+ if (file.size() > 0) {
50
+ vector<string> v;
51
+ split(file,'\0', v);
52
+ for(vector<string>::iterator it = v.begin(); it != v.end(); ++it) {
53
+ if (startsWith(*it, "container=")) {
54
+ return true;
55
+ }
54
56
  }
55
57
  }
56
58
  }
57
- }
58
59
 
59
- if (fileExists("/proc/1/sched")) {
60
- string file = unsafeReadFile("/proc/1/sched");
61
- if (file.length() >= 0) {
62
- const char t = file[0];
63
- if (t == '\0') {
64
- return false;
65
- }
60
+ if (fileExists("/proc/1/sched")) {
61
+ string file = unsafeReadFile("/proc/1/sched");
62
+ if (file.length() > 0) {
63
+ const char t = file[0];
64
+ if (t == '\0') {
65
+ return false;
66
+ }
66
67
 
67
- if (!startsWith(file, "(1,")) {
68
- return true;
68
+ if (!startsWith(file, "(1,")) {
69
+ return true;
70
+ }
69
71
  }
70
72
  }
71
73
  }
72
-
73
74
  return false;
74
75
  }
75
76
 
@@ -295,6 +295,10 @@ private:
295
295
  bool reconnectAfterReply;
296
296
  bool shuttingDown;
297
297
 
298
+ unsigned int secondsToMilis(double seconds) {
299
+ return (unsigned int) (seconds * 1000.0);
300
+ }
301
+
298
302
  /**
299
303
  * It could happen that a certain method or handler is invoked
300
304
  * for a connection that has already been closed. For example,
@@ -528,7 +532,7 @@ private:
528
532
  }
529
533
  }
530
534
 
531
- conn->set_proxy_timeout(config["proxy_timeout"].asDouble() * 1000, ec);
535
+ conn->set_proxy_timeout(secondsToMilis(config["proxy_timeout"].asDouble()), ec);
532
536
  if (ec) {
533
537
  P_ERROR(getLogPrefix()
534
538
  << "Error setting proxy timeout to "
@@ -538,9 +542,9 @@ private:
538
542
  }
539
543
  }
540
544
 
541
- conn->set_open_handshake_timeout(config["connect_timeout"].asDouble() * 1000);
542
- conn->set_pong_timeout(config["ping_timeout"].asDouble() * 1000);
543
- conn->set_close_handshake_timeout(config["close_timeout"].asDouble() * 1000);
545
+ conn->set_open_handshake_timeout(secondsToMilis(config["connect_timeout"].asDouble()));
546
+ conn->set_pong_timeout(secondsToMilis(config["ping_timeout"].asDouble()));
547
+ conn->set_close_handshake_timeout(secondsToMilis(config["close_timeout"].asDouble()));
544
548
 
545
549
  return true;
546
550
  }
@@ -566,7 +570,7 @@ private:
566
570
  void scheduleReconnect() {
567
571
  P_NOTICE(getLogPrefix() << "Reestablishing connection in " <<
568
572
  config["reconnect_timeout"].asDouble() << " seconds");
569
- restartTimer(config["reconnect_timeout"].asDouble() * 1000);
573
+ restartTimer(secondsToMilis(config["reconnect_timeout"].asDouble()));
570
574
  }
571
575
 
572
576
  void closeConnection(websocketpp::close::status::value code,
@@ -626,7 +630,7 @@ private:
626
630
  buffer.clear();
627
631
  P_DEBUG(getLogPrefix() << "Scheduling next ping in " <<
628
632
  config["ping_interval"].asDouble() << " seconds");
629
- restartTimer(config["ping_interval"].asDouble() * 1000);
633
+ restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
630
634
  }
631
635
 
632
636
  void onConnectFailed(ConnectionWeakPtr wconn) {
@@ -741,7 +745,7 @@ private:
741
745
 
742
746
  P_DEBUG(getLogPrefix() << "Pong received. Scheduling next ping in " <<
743
747
  config["ping_interval"].asDouble() << " seconds");
744
- restartTimer(config["ping_interval"].asDouble() * 1000);
748
+ restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
745
749
  }
746
750
 
747
751
  void onMessage(ConnectionWeakPtr wconn, MessagePtr msg) {