passenger 3.0.21 → 3.9.1.beta
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of passenger might be problematic. Click here for more details.
- data/DEVELOPERS.TXT +4 -10
- data/NEWS +19 -27
- data/Rakefile +20 -19
- data/bin/passenger +3 -2
- data/bin/passenger-config +35 -5
- data/bin/passenger-install-apache2-module +12 -12
- data/bin/passenger-install-nginx-module +55 -38
- data/bin/passenger-memory-stats +3 -1
- data/bin/passenger-status +7 -35
- data/build/agents.rb +107 -21
- data/build/apache2.rb +11 -46
- data/build/basics.rb +61 -9
- data/build/common_library.rb +59 -142
- data/build/cxx_tests.rb +111 -110
- data/build/documentation.rb +33 -0
- data/build/misc.rb +30 -12
- data/build/nginx.rb +10 -39
- data/build/oxt_tests.rb +1 -0
- data/build/ruby_extension.rb +1 -5
- data/build/test_basics.rb +3 -2
- data/dev/copy_boost_headers.rb +2 -1
- data/doc/Architectural overview.html +49 -90
- data/doc/DebuggingAndStressTesting.txt.md +49 -0
- data/doc/Packaging.txt.md +254 -0
- data/doc/Security of user switching support.html +35 -66
- data/doc/Users guide Apache.html +588 -758
- data/doc/Users guide Apache.idmap.txt +253 -136
- data/doc/Users guide Apache.txt +154 -109
- data/doc/Users guide Nginx.html +544 -660
- data/doc/Users guide Nginx.idmap.txt +179 -91
- data/doc/Users guide Nginx.txt +192 -118
- data/doc/Users guide Standalone.html +65 -48
- data/doc/Users guide Standalone.idmap.txt +10 -2
- data/doc/Users guide Standalone.txt +4 -0
- data/doc/images/glyphicons-halflings-white.png +0 -0
- data/doc/images/glyphicons-halflings.png +0 -0
- data/doc/images/phusion_banner_small.png +0 -0
- data/doc/images/{smart-lv2.png → smart.png} +0 -0
- data/doc/images/{smart-lv2.svg → smart.svg} +0 -0
- data/doc/templates/bootstrap.min.css +397 -0
- data/doc/templates/markdown.html.erb +117 -0
- data/doc/users_guide_snippets/analysis_and_system_maintenance.txt +2 -1
- data/doc/users_guide_snippets/appendix_c_spawning_methods.txt +26 -48
- data/doc/users_guide_snippets/passenger_spawn_method.txt +18 -30
- data/doc/users_guide_snippets/support_information.txt +30 -0
- data/ext/apache2/Bucket.cpp +9 -26
- data/ext/apache2/Bucket.h +13 -10
- data/ext/apache2/Configuration.cpp +70 -58
- data/ext/apache2/Configuration.hpp +19 -47
- data/ext/apache2/DirectoryMapper.h +7 -7
- data/ext/apache2/Hooks.cpp +150 -313
- data/ext/boost/algorithm/string/detail/case_conv.hpp +4 -2
- data/ext/boost/algorithm/string/detail/find_format.hpp +20 -20
- data/ext/boost/algorithm/string/detail/find_format_all.hpp +23 -23
- data/ext/boost/algorithm/string/detail/find_format_store.hpp +2 -2
- data/ext/boost/algorithm/string/detail/formatter.hpp +25 -0
- data/ext/boost/algorithm/string/formatter.hpp +20 -3
- data/ext/boost/assert.hpp +85 -4
- data/ext/boost/bind/bind.hpp +1 -1
- data/ext/boost/concept/detail/backward_compatibility.hpp +1 -1
- data/ext/boost/concept_check.hpp +140 -64
- data/ext/boost/config.hpp +1 -1
- data/ext/boost/config/auto_link.hpp +8 -6
- data/ext/boost/config/compiler/borland.hpp +12 -2
- data/ext/boost/config/compiler/clang.hpp +89 -30
- data/ext/boost/config/compiler/codegear.hpp +3 -2
- data/ext/boost/config/compiler/common_edg.hpp +7 -5
- data/ext/boost/config/compiler/cray.hpp +61 -0
- data/ext/boost/config/compiler/digitalmars.hpp +9 -1
- data/ext/boost/config/compiler/gcc.hpp +33 -24
- data/ext/boost/config/compiler/gcc_xml.hpp +4 -0
- data/ext/boost/config/compiler/hp_acc.hpp +12 -1
- data/ext/boost/config/compiler/intel.hpp +78 -4
- data/ext/boost/config/compiler/metrowerks.hpp +4 -1
- data/ext/boost/config/compiler/mpw.hpp +4 -1
- data/ext/boost/config/compiler/nvcc.hpp +8 -66
- data/ext/boost/config/compiler/pathscale.hpp +80 -0
- data/ext/boost/config/compiler/pgi.hpp +5 -5
- data/ext/boost/config/compiler/sunpro_cc.hpp +4 -1
- data/ext/boost/config/compiler/vacpp.hpp +37 -13
- data/ext/boost/config/compiler/visualc.hpp +24 -11
- data/ext/boost/config/platform/bsd.hpp +1 -1
- data/ext/boost/config/platform/cray.hpp +18 -0
- data/ext/boost/config/platform/cygwin.hpp +10 -0
- data/ext/boost/config/platform/linux.hpp +5 -0
- data/ext/boost/config/platform/macos.hpp +5 -4
- data/ext/boost/config/platform/symbian.hpp +5 -2
- data/ext/boost/config/platform/vms.hpp +25 -0
- data/ext/boost/config/platform/win32.hpp +7 -1
- data/ext/boost/config/select_compiler_config.hpp +8 -25
- data/ext/boost/config/select_platform_config.hpp +8 -1
- data/ext/boost/config/select_stdlib_config.hpp +9 -1
- data/ext/boost/config/stdlib/dinkumware.hpp +6 -9
- data/ext/boost/config/stdlib/libcomo.hpp +1 -4
- data/ext/boost/config/stdlib/libcpp.hpp +36 -0
- data/ext/boost/config/stdlib/libstdcpp3.hpp +37 -11
- data/ext/boost/config/stdlib/modena.hpp +1 -4
- data/ext/boost/config/stdlib/msl.hpp +1 -4
- data/ext/boost/config/stdlib/roguewave.hpp +9 -6
- data/ext/boost/config/stdlib/sgi.hpp +12 -4
- data/ext/boost/config/stdlib/stlport.hpp +11 -4
- data/ext/boost/config/stdlib/vacpp.hpp +11 -4
- data/ext/boost/config/suffix.hpp +71 -6
- data/ext/boost/config/warning_disable.hpp +1 -1
- data/ext/boost/container/container_fwd.hpp +177 -0
- data/ext/boost/cstdint.hpp +17 -12
- data/ext/boost/current_function.hpp +2 -1
- data/ext/boost/date_time/c_time.hpp +17 -1
- data/ext/boost/date_time/compiler_config.hpp +13 -15
- data/ext/boost/date_time/date_formatting.hpp +7 -1
- data/ext/boost/date_time/filetime_functions.hpp +4 -4
- data/ext/boost/date_time/gregorian_calendar.ipp +2 -2
- data/ext/boost/date_time/strings_from_facet.hpp +3 -3
- data/ext/boost/date_time/time_facet.hpp +101 -101
- data/ext/boost/detail/endian.hpp +4 -2
- data/ext/boost/detail/fenv.hpp +74 -0
- data/ext/boost/detail/sp_typeinfo.hpp +6 -0
- data/ext/boost/exception/detail/clone_current_exception.hpp +47 -0
- data/ext/boost/exception/detail/exception_ptr.hpp +194 -122
- data/ext/boost/exception/detail/type_info.hpp +3 -3
- data/ext/boost/exception/diagnostic_information.hpp +37 -21
- data/ext/boost/exception/exception.hpp +21 -1
- data/ext/boost/exception/info.hpp +0 -1
- data/ext/boost/function.hpp +2 -2
- data/ext/boost/function/function_base.hpp +15 -9
- data/ext/boost/function/function_template.hpp +26 -48
- data/ext/boost/integer_fwd.hpp +0 -16
- data/ext/boost/integer_traits.hpp +2 -2
- data/ext/boost/iterator.hpp +1 -1
- data/ext/boost/iterator/iterator_adaptor.hpp +1 -7
- data/ext/boost/iterator/iterator_facade.hpp +13 -13
- data/ext/boost/iterator/transform_iterator.hpp +5 -20
- data/ext/boost/lexical_cast.hpp +1655 -673
- data/ext/boost/math/policies/policy.hpp +982 -0
- data/ext/boost/math/special_functions/detail/fp_traits.hpp +570 -0
- data/ext/boost/math/special_functions/detail/round_fwd.hpp +80 -0
- data/ext/boost/math/special_functions/fpclassify.hpp +533 -0
- data/ext/boost/math/special_functions/math_fwd.hpp +1070 -0
- data/ext/boost/math/special_functions/sign.hpp +145 -0
- data/ext/boost/math/tools/config.hpp +321 -0
- data/ext/boost/math/tools/promotion.hpp +150 -0
- data/ext/boost/math/tools/real_cast.hpp +29 -0
- data/ext/boost/math/tools/user.hpp +97 -0
- data/ext/boost/move/move.hpp +1222 -0
- data/ext/boost/mpl/O1_size.hpp +40 -0
- data/ext/boost/mpl/O1_size_fwd.hpp +24 -0
- data/ext/boost/mpl/advance.hpp +76 -0
- data/ext/boost/mpl/advance_fwd.hpp +28 -0
- data/ext/boost/mpl/at.hpp +52 -0
- data/ext/boost/mpl/at_fwd.hpp +24 -0
- data/ext/boost/mpl/aux_/O1_size_impl.hpp +87 -0
- data/ext/boost/mpl/aux_/advance_backward.hpp +128 -0
- data/ext/boost/mpl/aux_/advance_forward.hpp +127 -0
- data/ext/boost/mpl/aux_/arithmetic_op.hpp +92 -0
- data/ext/boost/mpl/aux_/at_impl.hpp +45 -0
- data/ext/boost/mpl/aux_/begin_end_impl.hpp +101 -0
- data/ext/boost/mpl/aux_/clear_impl.hpp +35 -0
- data/ext/boost/mpl/aux_/comparison_op.hpp +83 -0
- data/ext/boost/mpl/aux_/config/forwarding.hpp +27 -0
- data/ext/boost/mpl/aux_/config/typeof.hpp +38 -0
- data/ext/boost/mpl/aux_/contains_impl.hpp +61 -0
- data/ext/boost/mpl/aux_/find_if_pred.hpp +31 -0
- data/ext/boost/mpl/aux_/fold_impl.hpp +43 -0
- data/ext/boost/mpl/aux_/has_begin.hpp +23 -0
- data/ext/boost/mpl/aux_/has_size.hpp +23 -0
- data/ext/boost/mpl/aux_/has_tag.hpp +23 -0
- data/ext/boost/mpl/aux_/inserter_algorithm.hpp +159 -0
- data/ext/boost/mpl/aux_/is_msvc_eti_arg.hpp +64 -0
- data/ext/boost/mpl/aux_/iter_apply.hpp +47 -0
- data/ext/boost/mpl/aux_/iter_fold_if_impl.hpp +210 -0
- data/ext/boost/mpl/aux_/iter_fold_impl.hpp +42 -0
- data/ext/boost/mpl/aux_/lambda_spec.hpp +49 -0
- data/ext/boost/mpl/aux_/largest_int.hpp +63 -0
- data/ext/boost/mpl/aux_/msvc_eti_base.hpp +77 -0
- data/ext/boost/mpl/aux_/msvc_type.hpp +62 -0
- data/ext/boost/mpl/aux_/numeric_cast_utils.hpp +77 -0
- data/ext/boost/mpl/aux_/numeric_op.hpp +315 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp +97 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp +97 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp +180 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/greater.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp +133 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp +180 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/less.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/list.hpp +323 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/minus.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp +94 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/plus.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp +231 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/times.hpp +146 -0
- data/ext/boost/mpl/aux_/preprocessed/gcc/vector.hpp +323 -0
- data/ext/boost/mpl/aux_/preprocessor/default_params.hpp +67 -0
- data/ext/boost/mpl/aux_/push_back_impl.hpp +70 -0
- data/ext/boost/mpl/aux_/push_front_impl.hpp +71 -0
- data/ext/boost/mpl/aux_/reverse_fold_impl.hpp +44 -0
- data/ext/boost/mpl/aux_/size_impl.hpp +52 -0
- data/ext/boost/mpl/aux_/traits_lambda_spec.hpp +63 -0
- data/ext/boost/mpl/back_fwd.hpp +24 -0
- data/ext/boost/mpl/back_inserter.hpp +34 -0
- data/ext/boost/mpl/begin_end.hpp +57 -0
- data/ext/boost/mpl/begin_end_fwd.hpp +27 -0
- data/ext/boost/mpl/clear.hpp +39 -0
- data/ext/boost/mpl/clear_fwd.hpp +24 -0
- data/ext/boost/mpl/comparison.hpp +24 -0
- data/ext/boost/mpl/contains.hpp +41 -0
- data/ext/boost/mpl/contains_fwd.hpp +25 -0
- data/ext/boost/mpl/deref.hpp +41 -0
- data/ext/boost/mpl/distance.hpp +78 -0
- data/ext/boost/mpl/distance_fwd.hpp +28 -0
- data/ext/boost/mpl/empty_fwd.hpp +24 -0
- data/ext/boost/mpl/equal_to.hpp +21 -0
- data/ext/boost/mpl/find.hpp +38 -0
- data/ext/boost/mpl/find_if.hpp +50 -0
- data/ext/boost/mpl/fold.hpp +48 -0
- data/ext/boost/mpl/front_fwd.hpp +24 -0
- data/ext/boost/mpl/front_inserter.hpp +33 -0
- data/ext/boost/mpl/greater.hpp +21 -0
- data/ext/boost/mpl/greater_equal.hpp +21 -0
- data/ext/boost/mpl/inserter.hpp +32 -0
- data/ext/boost/mpl/iter_fold.hpp +49 -0
- data/ext/boost/mpl/iter_fold_if.hpp +117 -0
- data/ext/boost/mpl/iterator_range.hpp +42 -0
- data/ext/boost/mpl/iterator_tags.hpp +27 -0
- data/ext/boost/mpl/less.hpp +21 -0
- data/ext/boost/mpl/less_equal.hpp +21 -0
- data/ext/boost/mpl/limits/list.hpp +21 -0
- data/ext/boost/mpl/limits/vector.hpp +21 -0
- data/ext/boost/mpl/list.hpp +57 -0
- data/ext/boost/mpl/list/aux_/O1_size.hpp +33 -0
- data/ext/boost/mpl/list/aux_/begin_end.hpp +44 -0
- data/ext/boost/mpl/list/aux_/clear.hpp +34 -0
- data/ext/boost/mpl/list/aux_/empty.hpp +34 -0
- data/ext/boost/mpl/list/aux_/front.hpp +33 -0
- data/ext/boost/mpl/list/aux_/include_preprocessed.hpp +35 -0
- data/ext/boost/mpl/list/aux_/item.hpp +55 -0
- data/ext/boost/mpl/list/aux_/iterator.hpp +76 -0
- data/ext/boost/mpl/list/aux_/pop_front.hpp +34 -0
- data/ext/boost/mpl/list/aux_/preprocessed/plain/list10.hpp +149 -0
- data/ext/boost/mpl/list/aux_/preprocessed/plain/list20.hpp +169 -0
- data/ext/boost/mpl/list/aux_/push_back.hpp +36 -0
- data/ext/boost/mpl/list/aux_/push_front.hpp +39 -0
- data/ext/boost/mpl/list/aux_/size.hpp +33 -0
- data/ext/boost/mpl/list/aux_/tag.hpp +24 -0
- data/ext/boost/mpl/list/list0.hpp +42 -0
- data/ext/boost/mpl/list/list10.hpp +43 -0
- data/ext/boost/mpl/list/list20.hpp +43 -0
- data/ext/boost/mpl/long.hpp +22 -0
- data/ext/boost/mpl/long_fwd.hpp +27 -0
- data/ext/boost/mpl/minus.hpp +21 -0
- data/ext/boost/mpl/multiplies.hpp +53 -0
- data/ext/boost/mpl/negate.hpp +81 -0
- data/ext/boost/mpl/not_equal_to.hpp +21 -0
- data/ext/boost/mpl/numeric_cast.hpp +41 -0
- data/ext/boost/mpl/pair.hpp +70 -0
- data/ext/boost/mpl/plus.hpp +21 -0
- data/ext/boost/mpl/pop_back_fwd.hpp +24 -0
- data/ext/boost/mpl/pop_front_fwd.hpp +24 -0
- data/ext/boost/mpl/prior.hpp +19 -0
- data/ext/boost/mpl/push_back.hpp +53 -0
- data/ext/boost/mpl/push_back_fwd.hpp +24 -0
- data/ext/boost/mpl/push_front.hpp +52 -0
- data/ext/boost/mpl/push_front_fwd.hpp +24 -0
- data/ext/boost/mpl/remove_if.hpp +83 -0
- data/ext/boost/mpl/reverse_fold.hpp +50 -0
- data/ext/boost/mpl/same_as.hpp +55 -0
- data/ext/boost/mpl/sequence_tag.hpp +124 -0
- data/ext/boost/mpl/sequence_tag_fwd.hpp +26 -0
- data/ext/boost/mpl/size.hpp +42 -0
- data/ext/boost/mpl/size_fwd.hpp +24 -0
- data/ext/boost/mpl/tag.hpp +52 -0
- data/ext/boost/mpl/times.hpp +21 -0
- data/ext/boost/mpl/vector.hpp +57 -0
- data/ext/boost/mpl/vector/aux_/O1_size.hpp +56 -0
- data/ext/boost/mpl/vector/aux_/at.hpp +116 -0
- data/ext/boost/mpl/vector/aux_/back.hpp +59 -0
- data/ext/boost/mpl/vector/aux_/begin_end.hpp +49 -0
- data/ext/boost/mpl/vector/aux_/clear.hpp +55 -0
- data/ext/boost/mpl/vector/aux_/empty.hpp +68 -0
- data/ext/boost/mpl/vector/aux_/front.hpp +56 -0
- data/ext/boost/mpl/vector/aux_/include_preprocessed.hpp +55 -0
- data/ext/boost/mpl/vector/aux_/item.hpp +103 -0
- data/ext/boost/mpl/vector/aux_/iterator.hpp +130 -0
- data/ext/boost/mpl/vector/aux_/pop_back.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/pop_front.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp +829 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp +1144 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp +139 -0
- data/ext/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp +159 -0
- data/ext/boost/mpl/vector/aux_/push_back.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/push_front.hpp +40 -0
- data/ext/boost/mpl/vector/aux_/size.hpp +49 -0
- data/ext/boost/mpl/vector/aux_/tag.hpp +32 -0
- data/ext/boost/mpl/vector/aux_/vector0.hpp +52 -0
- data/ext/boost/mpl/vector/vector0.hpp +34 -0
- data/ext/boost/mpl/vector/vector10.hpp +45 -0
- data/ext/boost/mpl/vector/vector20.hpp +45 -0
- data/ext/boost/none.hpp +1 -1
- data/ext/boost/numeric/conversion/bounds.hpp +24 -0
- data/ext/boost/numeric/conversion/cast.hpp +61 -0
- data/ext/boost/numeric/conversion/conversion_traits.hpp +39 -0
- data/ext/boost/numeric/conversion/converter.hpp +68 -0
- data/ext/boost/numeric/conversion/converter_policies.hpp +186 -0
- data/ext/boost/numeric/conversion/detail/bounds.hpp +58 -0
- data/ext/boost/numeric/conversion/detail/conversion_traits.hpp +97 -0
- data/ext/boost/numeric/conversion/detail/converter.hpp +602 -0
- data/ext/boost/numeric/conversion/detail/int_float_mixture.hpp +72 -0
- data/ext/boost/numeric/conversion/detail/is_subranged.hpp +234 -0
- data/ext/boost/numeric/conversion/detail/meta.hpp +120 -0
- data/ext/boost/numeric/conversion/detail/numeric_cast_traits.hpp +138 -0
- data/ext/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp +1741 -0
- data/ext/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp +347 -0
- data/ext/boost/numeric/conversion/detail/sign_mixture.hpp +72 -0
- data/ext/boost/numeric/conversion/detail/udt_builtin_mixture.hpp +69 -0
- data/ext/boost/numeric/conversion/int_float_mixture_enum.hpp +29 -0
- data/ext/boost/numeric/conversion/numeric_cast_traits.hpp +31 -0
- data/ext/boost/numeric/conversion/sign_mixture_enum.hpp +29 -0
- data/ext/boost/numeric/conversion/udt_builtin_mixture_enum.hpp +26 -0
- data/ext/boost/operators.hpp +3 -1
- data/ext/boost/optional/optional.hpp +146 -79
- data/ext/boost/optional/optional_fwd.hpp +8 -1
- data/ext/boost/preprocessor/cat.hpp +2 -2
- data/ext/boost/preprocessor/config/config.hpp +39 -4
- data/ext/boost/preprocessor/facilities/intercept.hpp +277 -0
- data/ext/boost/preprocessor/facilities/overload.hpp +25 -0
- data/ext/boost/preprocessor/iteration/detail/iter/forward1.hpp +3 -3
- data/ext/boost/preprocessor/iteration/iterate.hpp +3 -3
- data/ext/boost/preprocessor/punctuation/paren.hpp +23 -0
- data/ext/boost/preprocessor/repetition/enum_shifted_params.hpp +44 -0
- data/ext/boost/preprocessor/seq/cat.hpp +5 -4
- data/ext/boost/preprocessor/seq/size.hpp +0 -1
- data/ext/boost/preprocessor/tuple/eat.hpp +83 -34
- data/ext/boost/preprocessor/tuple/elem.hpp +161 -355
- data/ext/boost/preprocessor/tuple/rem.hpp +110 -48
- data/ext/boost/preprocessor/tuple/to_list.hpp +90 -36
- data/ext/boost/preprocessor/variadic/elem.hpp +94 -0
- data/ext/boost/preprocessor/variadic/size.hpp +30 -0
- data/ext/boost/range/begin.hpp +17 -6
- data/ext/boost/range/concepts.hpp +37 -2
- data/ext/boost/range/detail/safe_bool.hpp +72 -0
- data/ext/boost/range/end.hpp +14 -9
- data/ext/boost/range/iterator_range_core.hpp +120 -12
- data/ext/boost/range/size.hpp +21 -5
- data/ext/boost/smart_ptr/detail/shared_count.hpp +88 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base.hpp +3 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_aix.hpp +142 -0
- data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +9 -0
- data/ext/boost/smart_ptr/detail/sp_counted_impl.hpp +10 -2
- data/ext/boost/smart_ptr/detail/sp_has_sync.hpp +5 -1
- data/ext/boost/smart_ptr/detail/spinlock.hpp +4 -1
- data/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +20 -3
- data/ext/boost/smart_ptr/detail/spinlock_pool.hpp +4 -0
- data/ext/boost/smart_ptr/make_shared.hpp +591 -22
- data/ext/boost/smart_ptr/shared_array.hpp +29 -1
- data/ext/boost/smart_ptr/shared_ptr.hpp +29 -13
- data/ext/boost/smart_ptr/weak_ptr.hpp +24 -12
- data/ext/boost/src/pthread/once.cpp +9 -7
- data/ext/boost/src/pthread/thread.cpp +32 -28
- data/ext/boost/src/pthread/timeconv.inl +4 -5
- data/ext/boost/src/tss_null.cpp +5 -1
- data/ext/boost/static_assert.hpp +8 -2
- data/ext/boost/thread/detail/config.hpp +19 -4
- data/ext/boost/thread/detail/move.hpp +11 -5
- data/ext/boost/thread/detail/thread.hpp +59 -43
- data/ext/boost/thread/exceptions.hpp +9 -9
- data/ext/boost/thread/future.hpp +150 -82
- data/ext/boost/thread/locks.hpp +101 -60
- data/ext/boost/thread/pthread/condition_variable.hpp +79 -32
- data/ext/boost/thread/pthread/condition_variable_fwd.hpp +12 -3
- data/ext/boost/thread/pthread/mutex.hpp +17 -14
- data/ext/boost/thread/pthread/once.hpp +3 -4
- data/ext/boost/thread/pthread/pthread_mutex_scoped_lock.hpp +12 -2
- data/ext/boost/thread/pthread/recursive_mutex.hpp +19 -19
- data/ext/boost/thread/pthread/shared_mutex.hpp +13 -13
- data/ext/boost/thread/pthread/thread_data.hpp +40 -12
- data/ext/boost/thread/thread_time.hpp +5 -0
- data/ext/boost/throw_exception.hpp +1 -1
- data/ext/boost/token_functions.hpp +34 -10
- data/ext/boost/type_traits/add_rvalue_reference.hpp +66 -0
- data/ext/boost/type_traits/alignment_of.hpp +1 -1
- data/ext/boost/type_traits/detail/bool_trait_def.hpp +26 -3
- data/ext/boost/type_traits/detail/bool_trait_undef.hpp +3 -2
- data/ext/boost/type_traits/detail/cv_traits_impl.hpp +1 -1
- data/ext/boost/type_traits/detail/size_t_trait_def.hpp +6 -4
- data/ext/boost/type_traits/detail/type_trait_def.hpp +8 -2
- data/ext/boost/type_traits/function_traits.hpp +1 -1
- data/ext/boost/type_traits/has_nothrow_constructor.hpp +53 -0
- data/ext/boost/type_traits/has_nothrow_copy.hpp +19 -5
- data/ext/boost/type_traits/has_trivial_constructor.hpp +51 -0
- data/ext/boost/type_traits/has_trivial_copy.hpp +20 -5
- data/ext/boost/type_traits/has_trivial_destructor.hpp +12 -5
- data/ext/boost/type_traits/intrinsics.hpp +119 -71
- data/ext/boost/type_traits/is_const.hpp +5 -5
- data/ext/boost/type_traits/is_convertible.hpp +14 -13
- data/ext/boost/type_traits/is_enum.hpp +1 -1
- data/ext/boost/type_traits/is_floating_point.hpp +27 -0
- data/ext/boost/type_traits/is_function.hpp +3 -3
- data/ext/boost/type_traits/is_fundamental.hpp +1 -1
- data/ext/boost/type_traits/is_member_function_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_member_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_pod.hpp +11 -3
- data/ext/boost/type_traits/is_pointer.hpp +2 -2
- data/ext/boost/type_traits/is_signed.hpp +8 -3
- data/ext/boost/type_traits/is_union.hpp +8 -0
- data/ext/boost/type_traits/is_unsigned.hpp +9 -4
- data/ext/boost/type_traits/is_volatile.hpp +5 -5
- data/ext/boost/type_traits/remove_cv.hpp +4 -3
- data/ext/boost/type_traits/remove_pointer.hpp +51 -2
- data/ext/boost/type_traits/remove_reference.hpp +2 -2
- data/ext/boost/type_traits/type_with_alignment.hpp +8 -2
- data/ext/boost/utility/declval.hpp +44 -0
- data/ext/boost/utility/detail/in_place_factory_prefix.hpp +36 -0
- data/ext/boost/utility/detail/in_place_factory_suffix.hpp +23 -0
- data/ext/boost/utility/detail/result_of_iterate.hpp +142 -0
- data/ext/boost/utility/in_place_factory.hpp +88 -0
- data/ext/boost/utility/result_of.hpp +103 -0
- data/ext/boost/utility/swap.hpp +55 -0
- data/ext/common/AnsiColorConstants.h +36 -0
- data/ext/common/ApplicationPool2/Common.h +87 -0
- data/ext/common/ApplicationPool2/ComponentInfo.h +53 -0
- data/ext/common/ApplicationPool2/Group.h +648 -0
- data/ext/common/ApplicationPool2/Implementation.cpp +580 -0
- data/ext/common/ApplicationPool2/Options.h +576 -0
- data/ext/common/ApplicationPool2/PipeWatcher.h +61 -0
- data/ext/common/ApplicationPool2/Pool.h +1181 -0
- data/ext/common/ApplicationPool2/Process.h +425 -0
- data/ext/common/ApplicationPool2/README.md +96 -0
- data/ext/common/ApplicationPool2/Session.h +158 -0
- data/ext/common/ApplicationPool2/Socket.h +246 -0
- data/ext/common/ApplicationPool2/Spawner.h +2212 -0
- data/ext/common/ApplicationPool2/SuperGroup.h +749 -0
- data/ext/common/BackgroundEventLoop.cpp +129 -0
- data/ext/common/BackgroundEventLoop.h +61 -0
- data/ext/common/Constants.h +3 -1
- data/ext/common/EventedBufferedInput.h +331 -0
- data/ext/common/EventedMessageServer.h +17 -34
- data/ext/common/EventedServer.h +2 -2
- data/ext/common/Exceptions.h +71 -19
- data/ext/common/FileDescriptor.h +8 -6
- data/ext/common/HttpConstants.h +167 -0
- data/ext/common/IniFile.h +24 -0
- data/ext/common/Logging.h +62 -849
- data/ext/common/MessageReadersWriters.h +19 -0
- data/ext/common/MessageServer.h +11 -14
- data/ext/common/MultiLibeio.cpp +198 -0
- data/ext/common/MultiLibeio.h +67 -0
- data/ext/common/ResourceLocator.h +24 -41
- data/ext/common/SafeLibev.h +186 -14
- data/ext/common/StaticString.h +23 -3
- data/ext/common/UnionStation.h +972 -0
- data/ext/common/Utils.cpp +168 -24
- data/ext/common/Utils.h +25 -3
- data/ext/common/Utils/CachedFileStat.hpp +4 -3
- data/ext/common/Utils/FileChangeChecker.h +2 -2
- data/ext/common/Utils/HashMap.h +50 -0
- data/ext/common/Utils/IOUtils.cpp +229 -68
- data/ext/common/Utils/IOUtils.h +134 -3
- data/ext/common/Utils/Lock.h +28 -0
- data/ext/common/Utils/MemoryBarrier.h +52 -0
- data/ext/common/Utils/PriorityQueue.h +54 -0
- data/ext/common/Utils/ProcessMetricsCollector.h +9 -11
- data/ext/common/Utils/ScopeGuard.h +50 -1
- data/ext/common/Utils/SmallVector.h +653 -0
- data/ext/common/Utils/StrIntUtils.cpp +26 -2
- data/ext/common/Utils/StrIntUtils.h +18 -2
- data/ext/common/Utils/StringMap.h +125 -8
- data/ext/common/Utils/Template.h +212 -0
- data/ext/common/Utils/fib.c +699 -0
- data/ext/common/Utils/fib.h +101 -0
- data/ext/common/Utils/fibpriv.h +67 -0
- data/ext/common/Utils/json-forwards.h +249 -0
- data/ext/common/Utils/json.h +1855 -0
- data/ext/common/Utils/jsoncpp.cpp +4230 -0
- data/ext/common/agents/Base.cpp +1126 -0
- data/ext/common/{AgentBase.h → agents/Base.h} +5 -1
- data/ext/common/agents/EnvPrinter.c +16 -0
- data/ext/common/agents/HelperAgent/AgentOptions.h +81 -0
- data/ext/common/{HelperAgent → agents/HelperAgent}/BacktracesServer.h +3 -2
- data/ext/common/agents/HelperAgent/FileBackedPipe.h +732 -0
- data/ext/common/agents/HelperAgent/Main.cpp +497 -0
- data/ext/common/agents/HelperAgent/RequestHandler.cpp +283 -0
- data/ext/common/agents/HelperAgent/RequestHandler.h +2139 -0
- data/ext/common/agents/HelperAgent/ScgiRequestParser.h +451 -0
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/DataStoreId.h +1 -1
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/FilterSupport.cpp +1 -1
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/FilterSupport.h +0 -0
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/LoggingServer.h +18 -16
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/Main.cpp +15 -13
- data/ext/common/{LoggingAgent → agents/LoggingAgent}/RemoteSender.h +6 -6
- data/ext/common/agents/SpawnPreparer.cpp +127 -0
- data/ext/common/{Watchdog.cpp → agents/Watchdog/Main.cpp} +63 -25
- data/ext/libeio/Changes +72 -0
- data/ext/{google/COPYING → libeio/LICENSE} +17 -9
- data/ext/libeio/Makefile.am +15 -0
- data/ext/libeio/Makefile.in +694 -0
- data/ext/libeio/aclocal.m4 +9418 -0
- data/ext/libeio/autogen.sh +3 -0
- data/ext/libeio/config.guess +1501 -0
- data/ext/libeio/config.h.in +136 -0
- data/ext/libeio/config.sub +1705 -0
- data/ext/libeio/configure +14822 -0
- data/ext/libeio/configure.ac +22 -0
- data/ext/libeio/demo.c +194 -0
- data/ext/libeio/ecb.h +457 -0
- data/ext/libeio/eio.c +2816 -0
- data/ext/libeio/eio.h +411 -0
- data/ext/libeio/install-sh +520 -0
- data/ext/libeio/libeio.m4 +211 -0
- data/ext/libeio/ltmain.sh +9636 -0
- data/ext/libeio/missing +376 -0
- data/ext/libeio/xthread.h +166 -0
- data/ext/libev/Changes +125 -7
- data/ext/libev/Makefile.am +5 -3
- data/ext/libev/Makefile.in +209 -120
- data/ext/libev/aclocal.m4 +6027 -4619
- data/ext/libev/autogen.sh +1 -4
- data/ext/libev/config.h.in +11 -7
- data/ext/libev/configure +7312 -14993
- data/ext/libev/configure.ac +12 -5
- data/ext/libev/depcomp +630 -0
- data/ext/libev/ev++.h +48 -32
- data/ext/libev/ev.c +1173 -391
- data/ext/libev/ev.h +315 -181
- data/ext/libev/ev_epoll.c +66 -15
- data/ext/libev/ev_kqueue.c +20 -18
- data/ext/libev/ev_poll.c +27 -23
- data/ext/libev/ev_port.c +39 -19
- data/ext/libev/ev_select.c +23 -17
- data/ext/libev/ev_vars.h +25 -8
- data/ext/libev/ev_win32.c +6 -6
- data/ext/libev/ev_wrap.h +22 -2
- data/ext/libev/event.c +18 -17
- data/ext/libev/event.h +16 -4
- data/ext/libev/libev.m4 +10 -6
- data/ext/libev/ltmain.sh +7353 -5811
- data/ext/nginx/Configuration.c +74 -42
- data/ext/nginx/Configuration.h +3 -5
- data/ext/nginx/ContentHandler.c +26 -83
- data/ext/nginx/ContentHandler.h +1 -1
- data/ext/nginx/config +13 -9
- data/ext/nginx/ngx_http_passenger_module.c +3 -7
- data/ext/oxt/detail/backtrace_enabled.hpp +5 -102
- data/ext/oxt/detail/context.hpp +90 -0
- data/ext/oxt/detail/spin_lock_darwin.hpp +4 -0
- data/ext/oxt/detail/spin_lock_gcc_x86.hpp +4 -0
- data/ext/oxt/detail/spin_lock_pthreads.hpp +14 -0
- data/ext/oxt/detail/tracable_exception_enabled.hpp +2 -2
- data/ext/oxt/dynamic_thread_group.hpp +27 -1
- data/ext/oxt/implementation.cpp +415 -0
- data/ext/oxt/{thread.cpp → initialize.hpp} +13 -6
- data/ext/oxt/macros.hpp +32 -1
- data/ext/oxt/spin_lock.hpp +6 -11
- data/ext/oxt/system_calls.cpp +204 -16
- data/ext/oxt/system_calls.hpp +85 -45
- data/ext/oxt/thread.hpp +13 -117
- data/ext/ruby/passenger_native_support.c +82 -237
- data/helper-scripts/backtrace-sanitizer.rb +114 -0
- data/helper-scripts/classic-rails-loader.rb +135 -0
- data/helper-scripts/classic-rails-preloader.rb +161 -0
- data/helper-scripts/node-loader.js +314 -0
- data/helper-scripts/rack-loader.rb +104 -0
- data/helper-scripts/rack-preloader.rb +132 -0
- data/helper-scripts/wsgi-loader.py +231 -0
- data/helper-scripts/wsgi-preloader.py +1 -0
- data/lib/phusion_passenger.rb +159 -61
- data/lib/phusion_passenger/abstract_installer.rb +182 -87
- data/lib/phusion_passenger/admin_tools/server_instance.rb +25 -19
- data/lib/phusion_passenger/analytics_logger.rb +5 -4
- data/lib/phusion_passenger/classic_rails/{request_handler.rb → thread_handler_extension.rb} +4 -40
- data/lib/phusion_passenger/classic_rails_extensions/init.rb +5 -3
- data/lib/phusion_passenger/common_library.rb +441 -0
- data/lib/phusion_passenger/console_text_template.rb +4 -16
- data/lib/phusion_passenger/constants.rb +1 -8
- data/lib/phusion_passenger/debug_logging.rb +5 -2
- data/lib/phusion_passenger/dependencies.rb +51 -13
- data/lib/phusion_passenger/loader_shared_helpers.rb +318 -0
- data/lib/phusion_passenger/message_channel.rb +3 -47
- data/lib/phusion_passenger/message_client.rb +2 -2
- data/lib/phusion_passenger/native_support.rb +36 -15
- data/lib/phusion_passenger/packaging.rb +8 -11
- data/lib/phusion_passenger/platform_info.rb +25 -17
- data/lib/phusion_passenger/platform_info/apache.rb +10 -7
- data/lib/phusion_passenger/platform_info/binary_compatibility.rb +10 -30
- data/lib/phusion_passenger/platform_info/compiler.rb +93 -34
- data/lib/phusion_passenger/platform_info/ruby.rb +37 -97
- data/lib/phusion_passenger/preloader_shared_helpers.rb +121 -0
- data/lib/phusion_passenger/public_api.rb +1 -4
- data/lib/phusion_passenger/rack/{request_handler.rb → thread_handler_extension.rb} +14 -63
- data/lib/phusion_passenger/rails3_extensions/init.rb +9 -8
- data/lib/phusion_passenger/request_handler.rb +500 -0
- data/lib/phusion_passenger/request_handler/thread_handler.rb +360 -0
- data/lib/phusion_passenger/ruby_core_enhancements.rb +142 -0
- data/lib/phusion_passenger/standalone/command.rb +36 -15
- data/lib/phusion_passenger/standalone/package_runtime_command.rb +16 -8
- data/lib/phusion_passenger/standalone/runtime_installer.rb +169 -72
- data/lib/phusion_passenger/standalone/start_command.rb +44 -39
- data/lib/phusion_passenger/standalone/utils.rb +5 -5
- data/lib/phusion_passenger/utils.rb +35 -914
- data/lib/phusion_passenger/utils/ansi_colors.rb +59 -0
- data/lib/phusion_passenger/utils/file_system_watcher.rb +1 -1
- data/lib/phusion_passenger/utils/robust_interruption.rb +134 -0
- data/lib/phusion_passenger/utils/tee_input.rb +174 -0
- data/lib/phusion_passenger/utils/tmpio.rb +33 -0
- data/lib/phusion_passenger/utils/unseekable_socket.rb +6 -0
- data/resources/mime.types +5 -1
- data/{lib/phusion_passenger/templates → resources}/standalone_default_root/index.html +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/config_snippets.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/deployment_example.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/no_write_permission_to_passenger_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/apache2/welcome.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/error_layout.css +6 -0
- data/resources/templates/error_layout.html.template +89 -0
- data/resources/templates/general_error.html.template +1 -0
- data/resources/templates/general_error_with_html.html.template +1 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/ask_for_extra_configure_flags.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/cannot_write_to_dir.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/config_snippets.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/config_snippets_inserted.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/confirm_extra_configure_flags.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/deployment_example.txt.erb +0 -0
- data/resources/templates/nginx/not_available_when_natively_packaged.txt.erb +8 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/pcre_could_not_be_downloaded.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/pcre_could_not_be_extracted.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/query_download_and_install.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/nginx/welcome.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/cannot_write_to_dir.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/config.erb +26 -5
- data/{lib/phusion_passenger → resources}/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/run_installer_as_root.txt.erb +0 -0
- data/{lib/phusion_passenger → resources}/templates/standalone/welcome.txt.erb +0 -0
- data/resources/templates/undisclosed_error.html.template +25 -0
- data/test/config.json.example +42 -0
- data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +86 -0
- data/test/cxx/ApplicationPool2/OptionsTest.cpp +44 -0
- data/test/cxx/ApplicationPool2/PoolTest.cpp +1234 -0
- data/test/cxx/ApplicationPool2/ProcessTest.cpp +131 -0
- data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +229 -0
- data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +744 -0
- data/test/cxx/BufferedIOTest.cpp +7 -7
- data/test/cxx/CxxTestMain.cpp +65 -2
- data/test/cxx/FileBackedPipeTest.cpp +626 -0
- data/test/cxx/FileChangeCheckerTest.cpp +20 -18
- data/test/cxx/FilterSupportTest.cpp +5 -5
- data/test/cxx/IOUtilsTest.cpp +11 -4
- data/test/cxx/MessageReadersWritersTest.cpp +1 -1
- data/test/cxx/MessageServerTest.cpp +31 -30
- data/test/cxx/RequestHandlerTest.cpp +777 -0
- data/test/cxx/ScgiRequestParserTest.cpp +36 -16
- data/test/cxx/ServerInstanceDirTest.cpp +1 -1
- data/test/cxx/StringMapTest.cpp +61 -0
- data/test/cxx/TemplateTest.cpp +118 -0
- data/test/cxx/TestSupport.cpp +25 -68
- data/test/cxx/TestSupport.h +81 -41
- data/test/cxx/{LoggingTest.cpp → UnionStationTest.cpp} +79 -74
- data/test/cxx/UtilsTest.cpp +59 -5
- data/test/integration_tests/apache2_tests.rb +2 -2
- data/test/integration_tests/nginx_tests.rb +1 -1
- data/test/integration_tests/spec_helper.rb +7 -5
- data/test/oxt/oxt_test_main.cpp +2 -0
- data/test/oxt/syscall_interruption_test.cpp +1 -0
- data/test/ruby/classic_rails/loader_spec.rb +48 -0
- data/test/ruby/classic_rails/preloader_spec.rb +54 -0
- data/test/ruby/rack/loader_spec.rb +62 -0
- data/test/ruby/rack/preloader_spec.rb +74 -0
- data/test/ruby/{abstract_request_handler_spec.rb → request_handler_spec.rb} +31 -68
- data/test/ruby/shared/loader_spec.rb +241 -0
- data/test/ruby/shared/rails/analytics_logging_extensions_spec.rb +141 -182
- data/test/ruby/shared/ruby_loader_spec.rb +55 -0
- data/test/ruby/spec_helper.rb +8 -53
- data/test/ruby/utils/file_system_watcher_spec.rb +9 -1
- data/test/ruby/utils_spec.rb +10 -683
- data/test/stub/rack/config.ru +28 -3
- data/test/stub/rack/start.rb +47 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/Rakefile +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/application_controller.rb +0 -2
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/bar_controller_1.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/bar_controller_2.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/controllers/foo_controller.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/app/helpers/application_helper.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/boot.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/database.yml +3 -3
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environment.rb +5 -2
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/development.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/production.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/environments/staging.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/initializers/inflections.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/initializers/mime_types.rb +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/config/routes.rb +1 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/about +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/console +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/dbconsole +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/destroy +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/generate +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/benchmarker +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/profiler +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/performance/request +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/plugin +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/inspector +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/reaper +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/process/spawner +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/runner +0 -0
- data/test/stub/{rails_apps/2.3/foobar → rails2.3}/script/server +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/Gemfile +0 -0
- data/test/stub/rails3.0/Gemfile.lock +80 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/Rakefile +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/controllers/application_controller.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/helpers/application_helper.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/app/views/layouts/application.html.erb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config.ru +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/application.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/boot.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/database.yml +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environment.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/development.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/production.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/environments/test.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/backtrace_silencers.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/inflections.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/mime_types.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/passenger.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/secret_token.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/initializers/session_store.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/locales/en.yml +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/config/routes.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/db/seeds.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/doc/README_FOR_APP +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/404.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/422.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/500.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/favicon.ico +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/index.html +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/public/robots.txt +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/script/rails +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/test/performance/browsing_test.rb +0 -0
- data/test/stub/{rails_apps/3.0/empty → rails3.0}/test/test_helper.rb +0 -0
- data/test/stub/start_error.pl +24 -0
- data/test/stub/wsgi/passenger_wsgi.py +71 -3
- data/test/support/apache2_controller.rb +2 -2
- data/test/support/placebo-preloader.rb +88 -0
- data/test/support/test_helper.rb +1 -14
- data/test/tut/tut.h +11 -4
- metadata +590 -326
- data.tar.gz.asc +0 -12
- data/PACKAGING.TXT +0 -25
- data/build/config.rb +0 -46
- data/ext/apache2/HelperAgent.cpp +0 -364
- data/ext/boost/call_traits.hpp +0 -24
- data/ext/boost/detail/call_traits.hpp +0 -164
- data/ext/common/AbstractSpawnManager.h +0 -110
- data/ext/common/AgentBase.cpp +0 -432
- data/ext/common/ApplicationPool/Client.h +0 -788
- data/ext/common/ApplicationPool/Interface.h +0 -295
- data/ext/common/ApplicationPool/Pool.h +0 -1327
- data/ext/common/ApplicationPool/Server.h +0 -479
- data/ext/common/MessageChannel.h +0 -494
- data/ext/common/PoolOptions.h +0 -518
- data/ext/common/Process.h +0 -253
- data/ext/common/Session.h +0 -436
- data/ext/common/SpawnManager.h +0 -611
- data/ext/google/ChangeLog +0 -167
- data/ext/google/dense_hash_map +0 -310
- data/ext/google/dense_hash_set +0 -287
- data/ext/google/sparse_hash_map +0 -294
- data/ext/google/sparse_hash_set +0 -275
- data/ext/google/sparsehash/densehashtable.h +0 -1062
- data/ext/google/sparsehash/sparseconfig.h +0 -55
- data/ext/google/sparsehash/sparsehashtable.h +0 -1015
- data/ext/google/sparsetable +0 -1468
- data/ext/google/type_traits.h +0 -250
- data/ext/nginx/HelperAgent.cpp +0 -1355
- data/ext/nginx/ScgiRequestParser.h +0 -375
- data/ext/oxt/backtrace.cpp +0 -185
- data/ext/oxt/tracable_exception.cpp +0 -89
- data/helper-scripts/passenger-spawn-server +0 -106
- data/lib/phusion_passenger/abstract_request_handler.rb +0 -766
- data/lib/phusion_passenger/abstract_server.rb +0 -372
- data/lib/phusion_passenger/abstract_server_collection.rb +0 -335
- data/lib/phusion_passenger/app_process.rb +0 -174
- data/lib/phusion_passenger/classic_rails/application_spawner.rb +0 -344
- data/lib/phusion_passenger/classic_rails/framework_spawner.rb +0 -311
- data/lib/phusion_passenger/exceptions.rb +0 -103
- data/lib/phusion_passenger/html_template.rb +0 -107
- data/lib/phusion_passenger/rack/application_spawner.rb +0 -231
- data/lib/phusion_passenger/spawn_manager.rb +0 -359
- data/lib/phusion_passenger/templates/app_exited_during_initialization.html.erb +0 -38
- data/lib/phusion_passenger/templates/app_init_error.html.erb +0 -64
- data/lib/phusion_passenger/templates/database_error.html.erb +0 -66
- data/lib/phusion_passenger/templates/error_layout.html.erb +0 -39
- data/lib/phusion_passenger/templates/framework_init_error.html.erb +0 -39
- data/lib/phusion_passenger/templates/general_error.html.erb +0 -22
- data/lib/phusion_passenger/templates/load_error.html.erb +0 -46
- data/lib/phusion_passenger/templates/version_not_found.html.erb +0 -34
- data/lib/phusion_passenger/utils/rewindable_input.rb +0 -125
- data/lib/phusion_passenger/wsgi/application_spawner.rb +0 -108
- data/test/config.yml.example +0 -41
- data/test/cxx/ApplicationPool_PoolTest.cpp +0 -33
- data/test/cxx/ApplicationPool_PoolTestCases.cpp +0 -1029
- data/test/cxx/ApplicationPool_ServerTest.cpp +0 -308
- data/test/cxx/ApplicationPool_Server_PoolTest.cpp +0 -80
- data/test/cxx/MessageChannelTest.cpp +0 -557
- data/test/cxx/PoolOptionsTest.cpp +0 -116
- data/test/cxx/SpawnManagerTest.cpp +0 -161
- data/test/ruby/abstract_server_collection_spec.rb +0 -247
- data/test/ruby/abstract_server_spec.rb +0 -61
- data/test/ruby/app_process_spec.rb +0 -43
- data/test/ruby/classic_rails/application_spawner_spec.rb +0 -89
- data/test/ruby/classic_rails/framework_spawner_spec.rb +0 -92
- data/test/ruby/rack/application_spawner_spec.rb +0 -116
- data/test/ruby/shared/abstract_server_spec.rb +0 -23
- data/test/ruby/shared/spawners/classic_rails/framework_spawner_spec.rb +0 -38
- data/test/ruby/shared/spawners/classic_rails/lack_of_rails_gem_version_spec.rb +0 -19
- data/test/ruby/shared/spawners/classic_rails/spawner_spec.rb +0 -15
- data/test/ruby/shared/spawners/non_preloading_spawner_spec.rb +0 -27
- data/test/ruby/shared/spawners/preloading_spawner_spec.rb +0 -29
- data/test/ruby/shared/spawners/reload_all_spec.rb +0 -36
- data/test/ruby/shared/spawners/reload_single_spec.rb +0 -52
- data/test/ruby/shared/spawners/spawn_server_spec.rb +0 -28
- data/test/ruby/shared/spawners/spawner_spec.rb +0 -273
- data/test/ruby/shared/utils/pseudo_io_spec.rb +0 -60
- data/test/ruby/spawn_manager_spec.rb +0 -134
- data/test/ruby/wsgi/application_spawner_spec.rb +0 -50
- data/test/stub/message_channel.rb +0 -11
- data/test/stub/message_channel_2.rb +0 -12
- data/test/stub/message_channel_3.rb +0 -19
- data/test/stub/rails_apps/3.0/empty/Gemfile.lock +0 -73
- data/test/stub/spawn_server.rb +0 -22
- metadata.gz.asc +0 -12
data/ext/common/SpawnManager.h
DELETED
@@ -1,611 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Phusion Passenger - http://www.modrails.com/
|
3
|
-
* Copyright (c) 2010 Phusion
|
4
|
-
*
|
5
|
-
* "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
|
6
|
-
*
|
7
|
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
8
|
-
* of this software and associated documentation files (the "Software"), to deal
|
9
|
-
* in the Software without restriction, including without limitation the rights
|
10
|
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
11
|
-
* copies of the Software, and to permit persons to whom the Software is
|
12
|
-
* furnished to do so, subject to the following conditions:
|
13
|
-
*
|
14
|
-
* The above copyright notice and this permission notice shall be included in
|
15
|
-
* all copies or substantial portions of the Software.
|
16
|
-
*
|
17
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
18
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
19
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
20
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
21
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
22
|
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
23
|
-
* THE SOFTWARE.
|
24
|
-
*/
|
25
|
-
#ifndef _PASSENGER_SPAWN_MANAGER_H_
|
26
|
-
#define _PASSENGER_SPAWN_MANAGER_H_
|
27
|
-
|
28
|
-
#include <string>
|
29
|
-
#include <vector>
|
30
|
-
#include <boost/shared_ptr.hpp>
|
31
|
-
#include <boost/thread.hpp>
|
32
|
-
#include <boost/function.hpp>
|
33
|
-
#include <oxt/system_calls.hpp>
|
34
|
-
#include <oxt/backtrace.hpp>
|
35
|
-
|
36
|
-
#include <sys/types.h>
|
37
|
-
#include <sys/wait.h>
|
38
|
-
#include <sys/stat.h>
|
39
|
-
#include <arpa/inet.h>
|
40
|
-
#include <cstdio>
|
41
|
-
#include <cstdarg>
|
42
|
-
#include <unistd.h>
|
43
|
-
#include <errno.h>
|
44
|
-
#include <grp.h>
|
45
|
-
#include <pwd.h>
|
46
|
-
#include <signal.h>
|
47
|
-
|
48
|
-
#include <AbstractSpawnManager.h>
|
49
|
-
#include <ServerInstanceDir.h>
|
50
|
-
#include <FileDescriptor.h>
|
51
|
-
#include <Constants.h>
|
52
|
-
#include <AccountsDatabase.h>
|
53
|
-
#include <RandomGenerator.h>
|
54
|
-
#include <Exceptions.h>
|
55
|
-
#include <Logging.h>
|
56
|
-
#include <Utils/Base64.h>
|
57
|
-
#include <Utils/SystemTime.h>
|
58
|
-
#include <Utils/IOUtils.h>
|
59
|
-
#include <Utils/MessageIO.h>
|
60
|
-
|
61
|
-
namespace Passenger {
|
62
|
-
|
63
|
-
using namespace std;
|
64
|
-
using namespace boost;
|
65
|
-
using namespace oxt;
|
66
|
-
|
67
|
-
/**
|
68
|
-
* An AbstractSpawnManager implementation.
|
69
|
-
*
|
70
|
-
* Internally, this class makes use of a spawn server, which is written in Ruby. This server
|
71
|
-
* is automatically started when a SpawnManager instance is created, and automatically
|
72
|
-
* shutdown when that instance is destroyed. The existance of the spawn server is almost
|
73
|
-
* totally transparent to users of this class. Spawn requests are sent to the server,
|
74
|
-
* and details about the spawned process is returned.
|
75
|
-
*
|
76
|
-
* If the spawn server dies during the middle of an operation, it will be restarted.
|
77
|
-
* See spawn() for full details.
|
78
|
-
*
|
79
|
-
* The communication channel with the server is anonymous, i.e. no other processes
|
80
|
-
* can access the communication channel, so communication is guaranteed to be safe
|
81
|
-
* (unless, of course, if the spawn server itself is a trojan).
|
82
|
-
*
|
83
|
-
* The server will try to keep the spawning time as small as possible, by keeping
|
84
|
-
* corresponding Ruby on Rails frameworks and application code in memory. So the second
|
85
|
-
* time a process of the same application is spawned, the spawn time is significantly
|
86
|
-
* lower than the first time. Nevertheless, spawning is a relatively expensive operation
|
87
|
-
* (compared to the processing of a typical HTTP request/response), and so should be
|
88
|
-
* avoided whenever possible.
|
89
|
-
*
|
90
|
-
* See the documentation of the spawn server for full implementation details.
|
91
|
-
*
|
92
|
-
* @ingroup Support
|
93
|
-
*/
|
94
|
-
class SpawnManager: public AbstractSpawnManager {
|
95
|
-
private:
|
96
|
-
static const int SERVER_SOCKET_FD = 3;
|
97
|
-
static const int OWNER_SOCKET_FD = 4;
|
98
|
-
static const int HIGHEST_FD = OWNER_SOCKET_FD;
|
99
|
-
|
100
|
-
string spawnServerCommand;
|
101
|
-
ServerInstanceDir::GenerationPtr generation;
|
102
|
-
AccountsDatabasePtr accountsDatabase;
|
103
|
-
string rubyCommand;
|
104
|
-
AnalyticsLoggerPtr analyticsLogger;
|
105
|
-
int logLevel;
|
106
|
-
string debugLogFile;
|
107
|
-
|
108
|
-
boost::mutex lock;
|
109
|
-
RandomGenerator random;
|
110
|
-
|
111
|
-
pid_t pid;
|
112
|
-
FileDescriptor ownerSocket;
|
113
|
-
string socketFilename;
|
114
|
-
string socketPassword;
|
115
|
-
bool serverNeedsRestart;
|
116
|
-
|
117
|
-
static void deleteAccount(AccountsDatabasePtr accountsDatabase, const string &username) {
|
118
|
-
accountsDatabase->remove(username);
|
119
|
-
}
|
120
|
-
|
121
|
-
/**
|
122
|
-
* Restarts the spawn server.
|
123
|
-
*
|
124
|
-
* @pre System call interruption is disabled.
|
125
|
-
* @throws RuntimeException An error occurred while creating a Unix server socket.
|
126
|
-
* @throws SystemException An error occured while trying to setup the spawn server.
|
127
|
-
* @throws IOException An error occurred while generating random data.
|
128
|
-
*/
|
129
|
-
void restartServer() {
|
130
|
-
TRACE_POINT();
|
131
|
-
if (pid != 0) {
|
132
|
-
UPDATE_TRACE_POINT();
|
133
|
-
ownerSocket.close();
|
134
|
-
|
135
|
-
/* Wait at most 5 seconds for the spawn server to exit.
|
136
|
-
* If that doesn't work, kill it, then wait at most 5 seconds
|
137
|
-
* for it to exit.
|
138
|
-
*/
|
139
|
-
time_t begin = syscalls::time(NULL);
|
140
|
-
bool done = false;
|
141
|
-
while (!done && syscalls::time(NULL) - begin < 5) {
|
142
|
-
if (syscalls::waitpid(pid, NULL, WNOHANG) > 0) {
|
143
|
-
done = true;
|
144
|
-
} else {
|
145
|
-
syscalls::usleep(100000);
|
146
|
-
}
|
147
|
-
}
|
148
|
-
UPDATE_TRACE_POINT();
|
149
|
-
if (!done) {
|
150
|
-
UPDATE_TRACE_POINT();
|
151
|
-
P_TRACE(2, "Spawn server did not exit in time, killing it...");
|
152
|
-
syscalls::kill(pid, SIGTERM);
|
153
|
-
begin = syscalls::time(NULL);
|
154
|
-
while (syscalls::time(NULL) - begin < 5) {
|
155
|
-
if (syscalls::waitpid(pid, NULL, WNOHANG) > 0) {
|
156
|
-
break;
|
157
|
-
} else {
|
158
|
-
syscalls::usleep(100000);
|
159
|
-
}
|
160
|
-
}
|
161
|
-
}
|
162
|
-
pid = 0;
|
163
|
-
}
|
164
|
-
|
165
|
-
FileDescriptor serverSocket;
|
166
|
-
string socketFilename;
|
167
|
-
string socketPassword;
|
168
|
-
int ret, fds[2];
|
169
|
-
|
170
|
-
UPDATE_TRACE_POINT();
|
171
|
-
socketFilename = generation->getPath() + "/spawn-server/socket." +
|
172
|
-
toString(getpid()) + "." +
|
173
|
-
pointerToIntString(this);
|
174
|
-
socketPassword = Base64::encode(random.generateByteString(32));
|
175
|
-
serverSocket = createUnixServer(socketFilename.c_str());
|
176
|
-
do {
|
177
|
-
ret = chmod(socketFilename.c_str(), S_IRUSR | S_IWUSR | S_IXUSR);
|
178
|
-
} while (ret == -1 && errno == EINTR);
|
179
|
-
if (ret == -1) {
|
180
|
-
int e = errno;
|
181
|
-
syscalls::unlink(socketFilename.c_str());
|
182
|
-
throw FileSystemException("Cannot set permissions on '" + socketFilename + "'",
|
183
|
-
e, socketFilename);
|
184
|
-
}
|
185
|
-
|
186
|
-
if (syscalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
|
187
|
-
int e = errno;
|
188
|
-
syscalls::unlink(socketFilename.c_str());
|
189
|
-
throw SystemException("Cannot create a Unix socket", e);
|
190
|
-
}
|
191
|
-
|
192
|
-
UPDATE_TRACE_POINT();
|
193
|
-
pid = syscalls::fork();
|
194
|
-
if (pid == 0) {
|
195
|
-
dup2(serverSocket, HIGHEST_FD + 1);
|
196
|
-
dup2(fds[1], HIGHEST_FD + 2);
|
197
|
-
dup2(HIGHEST_FD + 1, SERVER_SOCKET_FD);
|
198
|
-
dup2(HIGHEST_FD + 2, OWNER_SOCKET_FD);
|
199
|
-
|
200
|
-
// Close all unnecessary file descriptors
|
201
|
-
for (long i = sysconf(_SC_OPEN_MAX) - 1; i > HIGHEST_FD; i--) {
|
202
|
-
close(i);
|
203
|
-
}
|
204
|
-
|
205
|
-
execlp(rubyCommand.c_str(),
|
206
|
-
rubyCommand.c_str(),
|
207
|
-
spawnServerCommand.c_str(),
|
208
|
-
/* The spawn server changes the process names of the subservers
|
209
|
-
* that it starts, for better usability. However, the process name length
|
210
|
-
* (as shown by ps) is limited. Here, we try to expand that limit by
|
211
|
-
* deliberately passing a useless whitespace string to the spawn server.
|
212
|
-
* This argument is ignored by the spawn server. This works on some
|
213
|
-
* systems, such as Ubuntu Linux.
|
214
|
-
*/
|
215
|
-
" ",
|
216
|
-
(char *) NULL);
|
217
|
-
int e = errno;
|
218
|
-
fprintf(stderr, "*** Passenger ERROR (%s:%d):\n"
|
219
|
-
"Could not start the spawn server: %s: %s (%d)\n",
|
220
|
-
__FILE__, __LINE__,
|
221
|
-
rubyCommand.c_str(), strerror(e), e);
|
222
|
-
fflush(stderr);
|
223
|
-
_exit(1);
|
224
|
-
} else if (pid == -1) {
|
225
|
-
int e = errno;
|
226
|
-
syscalls::unlink(socketFilename.c_str());
|
227
|
-
syscalls::close(fds[0]);
|
228
|
-
syscalls::close(fds[1]);
|
229
|
-
pid = 0;
|
230
|
-
throw SystemException("Unable to fork a process", e);
|
231
|
-
} else {
|
232
|
-
FileDescriptor ownerSocket = fds[0];
|
233
|
-
syscalls::close(fds[1]);
|
234
|
-
serverSocket.close();
|
235
|
-
|
236
|
-
// Pass arguments to spawn server.
|
237
|
-
writeExact(ownerSocket, socketFilename + "\n");
|
238
|
-
writeExact(ownerSocket, socketPassword + "\n");
|
239
|
-
writeExact(ownerSocket, generation->getPath() + "\n");
|
240
|
-
if (analyticsLogger != NULL) {
|
241
|
-
writeExact(ownerSocket, analyticsLogger->getAddress() + "\n");
|
242
|
-
writeExact(ownerSocket, analyticsLogger->getUsername() + "\n");
|
243
|
-
writeExact(ownerSocket, Base64::encode(analyticsLogger->getPassword()) + "\n");
|
244
|
-
writeExact(ownerSocket, analyticsLogger->getNodeName() + "\n");
|
245
|
-
} else {
|
246
|
-
writeExact(ownerSocket, "\n");
|
247
|
-
writeExact(ownerSocket, "\n");
|
248
|
-
writeExact(ownerSocket, "\n");
|
249
|
-
writeExact(ownerSocket, "\n");
|
250
|
-
}
|
251
|
-
writeExact(ownerSocket, toString(logLevel) + "\n");
|
252
|
-
writeExact(ownerSocket, debugLogFile + "\n");
|
253
|
-
|
254
|
-
this->ownerSocket = ownerSocket;
|
255
|
-
this->socketFilename = socketFilename;
|
256
|
-
this->socketPassword = socketPassword;
|
257
|
-
spawnServerStarted();
|
258
|
-
}
|
259
|
-
}
|
260
|
-
|
261
|
-
/**
|
262
|
-
* Connects to the spawn server and returns the connection.
|
263
|
-
*
|
264
|
-
* @throws RuntimeException
|
265
|
-
* @throws SystemException
|
266
|
-
* @throws boost::thread_interrupted
|
267
|
-
*/
|
268
|
-
FileDescriptor connect() const {
|
269
|
-
TRACE_POINT();
|
270
|
-
FileDescriptor fd = connectToUnixServer(socketFilename.c_str());
|
271
|
-
UPDATE_TRACE_POINT();
|
272
|
-
writeScalarMessage(fd, socketPassword);
|
273
|
-
return fd;
|
274
|
-
}
|
275
|
-
|
276
|
-
/**
|
277
|
-
* Send the spawn command to the spawn server.
|
278
|
-
*
|
279
|
-
* @param PoolOptions The spawn options to use.
|
280
|
-
* @return A Process smart pointer, representing the spawned process.
|
281
|
-
* @throws SpawnException Something went wrong.
|
282
|
-
* @throws Anything thrown by options.environmentVariables->getItems().
|
283
|
-
* @throws boost::thread_interrupted
|
284
|
-
*/
|
285
|
-
ProcessPtr sendSpawnCommand(const PoolOptions &options) {
|
286
|
-
TRACE_POINT();
|
287
|
-
FileDescriptor connection;
|
288
|
-
|
289
|
-
P_DEBUG("Spawning a new application process for " << options.appRoot << "...");
|
290
|
-
|
291
|
-
try {
|
292
|
-
connection = connect();
|
293
|
-
} catch (const SystemException &e) {
|
294
|
-
throw SpawnException(string("Could not connect to the spawn server: ") +
|
295
|
-
e.sys());
|
296
|
-
} catch (const std::exception &e) {
|
297
|
-
throw SpawnException(string("Could not connect to the spawn server: ") +
|
298
|
-
e.what());
|
299
|
-
}
|
300
|
-
|
301
|
-
UPDATE_TRACE_POINT();
|
302
|
-
vector<string> args;
|
303
|
-
string appRoot;
|
304
|
-
pid_t appPid;
|
305
|
-
int i, nServerSockets, ownerPipe;
|
306
|
-
Process::SocketInfoMap serverSockets;
|
307
|
-
string detachKey = random.generateAsciiString(43);
|
308
|
-
// The connect password must be a URL-friendly string because users will
|
309
|
-
// insert it in HTTP headers.
|
310
|
-
string connectPassword = random.generateAsciiString(43);
|
311
|
-
string gupid = integerToHex(SystemTime::get() / 60) + "-" +
|
312
|
-
random.generateAsciiString(11);
|
313
|
-
AccountPtr account;
|
314
|
-
function<void ()> destructionCallback;
|
315
|
-
|
316
|
-
try {
|
317
|
-
args.push_back("spawn_application");
|
318
|
-
options.toVector(args);
|
319
|
-
|
320
|
-
args.push_back("detach_key");
|
321
|
-
args.push_back(detachKey);
|
322
|
-
args.push_back("connect_password");
|
323
|
-
args.push_back(connectPassword);
|
324
|
-
if (accountsDatabase != NULL) {
|
325
|
-
string username = "_backend-" + toString(accountsDatabase->getUniqueNumber());
|
326
|
-
string password = random.generateByteString(MESSAGE_SERVER_MAX_PASSWORD_SIZE);
|
327
|
-
account = accountsDatabase->add(username, password, false, options.rights);
|
328
|
-
destructionCallback = boost::bind(&SpawnManager::deleteAccount,
|
329
|
-
accountsDatabase, username);
|
330
|
-
|
331
|
-
args.push_back("pool_account_username");
|
332
|
-
args.push_back(username);
|
333
|
-
args.push_back("pool_account_password_base64");
|
334
|
-
args.push_back(Base64::encode(password));
|
335
|
-
}
|
336
|
-
|
337
|
-
writeArrayMessage(connection, args);
|
338
|
-
} catch (const SystemException &e) {
|
339
|
-
throw SpawnException(string("Could not write 'spawn_application' "
|
340
|
-
"command to the spawn server: ") + e.sys());
|
341
|
-
}
|
342
|
-
|
343
|
-
try {
|
344
|
-
UPDATE_TRACE_POINT();
|
345
|
-
// Read status.
|
346
|
-
if (!readArrayMessage(connection, args)) {
|
347
|
-
throw SpawnException("The spawn server has exited unexpectedly.");
|
348
|
-
}
|
349
|
-
if (args.size() != 1) {
|
350
|
-
throw SpawnException("The spawn server sent an invalid message.");
|
351
|
-
}
|
352
|
-
if (args[0] == "error_page") {
|
353
|
-
UPDATE_TRACE_POINT();
|
354
|
-
string errorPage;
|
355
|
-
|
356
|
-
if (!readScalarMessage(connection, errorPage)) {
|
357
|
-
throw SpawnException("The spawn server has exited unexpectedly.");
|
358
|
-
}
|
359
|
-
throw SpawnException("An error occured while spawning the application.",
|
360
|
-
errorPage);
|
361
|
-
} else if (args[0] != "ok") {
|
362
|
-
throw SpawnException("The spawn server sent an invalid message.");
|
363
|
-
}
|
364
|
-
|
365
|
-
// Read application info.
|
366
|
-
UPDATE_TRACE_POINT();
|
367
|
-
if (!readArrayMessage(connection, args)) {
|
368
|
-
throw SpawnException("The spawn server has exited unexpectedly.");
|
369
|
-
}
|
370
|
-
if (args.size() != 3) {
|
371
|
-
throw SpawnException("The spawn server sent an invalid message.");
|
372
|
-
}
|
373
|
-
|
374
|
-
appRoot = args[0];
|
375
|
-
appPid = (pid_t) stringToULL(args[1]);
|
376
|
-
nServerSockets = atoi(args[2]);
|
377
|
-
|
378
|
-
UPDATE_TRACE_POINT();
|
379
|
-
for (i = 0; i < nServerSockets; i++) {
|
380
|
-
if (!readArrayMessage(connection, args)) {
|
381
|
-
throw SpawnException("The spawn server has exited unexpectedly.");
|
382
|
-
}
|
383
|
-
if (args.size() != 3) {
|
384
|
-
throw SpawnException("The spawn server sent an invalid message.");
|
385
|
-
}
|
386
|
-
serverSockets[args[0]] = Process::SocketInfo(args[1], args[2]);
|
387
|
-
}
|
388
|
-
if (serverSockets.find("main") == serverSockets.end()) {
|
389
|
-
UPDATE_TRACE_POINT();
|
390
|
-
throw SpawnException("The spawn server sent an invalid message.");
|
391
|
-
}
|
392
|
-
} catch (const SystemException &e) {
|
393
|
-
throw SpawnException(string("Could not read from the spawn server: ") + e.sys());
|
394
|
-
}
|
395
|
-
|
396
|
-
UPDATE_TRACE_POINT();
|
397
|
-
try {
|
398
|
-
ownerPipe = readFileDescriptorWithNegotiation(connection);
|
399
|
-
} catch (const SystemException &e) {
|
400
|
-
throw SpawnException(string("Could not receive the spawned "
|
401
|
-
"application's owner pipe from the spawn server: ") +
|
402
|
-
e.sys());
|
403
|
-
} catch (const IOException &e) {
|
404
|
-
throw SpawnException(string("Could not receive the spawned "
|
405
|
-
"application's owner pipe from the spawn server: ") +
|
406
|
-
e.what());
|
407
|
-
}
|
408
|
-
|
409
|
-
UPDATE_TRACE_POINT();
|
410
|
-
P_DEBUG("Application process " << appPid << " spawned");
|
411
|
-
return ProcessPtr(new Process(appRoot, appPid, ownerPipe, serverSockets,
|
412
|
-
detachKey, connectPassword, gupid, destructionCallback));
|
413
|
-
}
|
414
|
-
|
415
|
-
/**
|
416
|
-
* @throws boost::thread_interrupted
|
417
|
-
* @throws Anything thrown by options.environmentVariables->getItems().
|
418
|
-
*/
|
419
|
-
ProcessPtr
|
420
|
-
handleSpawnException(const SpawnException &e, const PoolOptions &options) {
|
421
|
-
TRACE_POINT();
|
422
|
-
bool restarted;
|
423
|
-
try {
|
424
|
-
P_DEBUG("Spawn server died. Attempting to restart it...");
|
425
|
-
this_thread::disable_syscall_interruption dsi;
|
426
|
-
restartServer();
|
427
|
-
P_DEBUG("Restart seems to be successful.");
|
428
|
-
restarted = true;
|
429
|
-
} catch (const IOException &e) {
|
430
|
-
P_DEBUG("Restart failed: " << e.what());
|
431
|
-
restarted = false;
|
432
|
-
} catch (const SystemException &e) {
|
433
|
-
P_DEBUG("Restart failed: " << e.what());
|
434
|
-
restarted = false;
|
435
|
-
}
|
436
|
-
if (restarted) {
|
437
|
-
return sendSpawnCommand(options);
|
438
|
-
} else {
|
439
|
-
throw SpawnException("The spawn server died unexpectedly, and restarting it failed.");
|
440
|
-
}
|
441
|
-
}
|
442
|
-
|
443
|
-
/**
|
444
|
-
* Send the reload command to the spawn server.
|
445
|
-
*
|
446
|
-
* @param appRoot The application root to reload.
|
447
|
-
* @throws RuntimeException
|
448
|
-
* @throws SystemException
|
449
|
-
* @throws boost::thread_interrupted
|
450
|
-
*/
|
451
|
-
void sendReloadCommand(const string &appRoot) {
|
452
|
-
TRACE_POINT();
|
453
|
-
FileDescriptor connection;
|
454
|
-
|
455
|
-
try {
|
456
|
-
connection = connect();
|
457
|
-
} catch (SystemException &e) {
|
458
|
-
e.setBriefMessage("Could not connect to the spawn server");
|
459
|
-
throw;
|
460
|
-
} catch (const RuntimeException &e) {
|
461
|
-
throw RuntimeException(string("Could not connect to the spawn server: ") +
|
462
|
-
e.what());
|
463
|
-
}
|
464
|
-
|
465
|
-
try {
|
466
|
-
writeArrayMessage(connection, "reload", appRoot.c_str(), NULL);
|
467
|
-
} catch (SystemException &e) {
|
468
|
-
e.setBriefMessage("Could not write 'reload' command to the spawn server");
|
469
|
-
throw;
|
470
|
-
}
|
471
|
-
}
|
472
|
-
|
473
|
-
void handleReloadException(const SystemException &e, const string &appRoot) {
|
474
|
-
TRACE_POINT();
|
475
|
-
bool restarted;
|
476
|
-
try {
|
477
|
-
P_DEBUG("Spawn server died. Attempting to restart it...");
|
478
|
-
restartServer();
|
479
|
-
P_DEBUG("Restart seems to be successful.");
|
480
|
-
restarted = true;
|
481
|
-
} catch (const IOException &e) {
|
482
|
-
P_DEBUG("Restart failed: " << e.what());
|
483
|
-
restarted = false;
|
484
|
-
} catch (const SystemException &e) {
|
485
|
-
P_DEBUG("Restart failed: " << e.what());
|
486
|
-
restarted = false;
|
487
|
-
}
|
488
|
-
if (restarted) {
|
489
|
-
return sendReloadCommand(appRoot);
|
490
|
-
} else {
|
491
|
-
throw SpawnException("The spawn server died unexpectedly, and restarting it failed.");
|
492
|
-
}
|
493
|
-
}
|
494
|
-
|
495
|
-
IOException prependMessageToException(const IOException &e, const string &message) {
|
496
|
-
return IOException(message + ": " + e.what());
|
497
|
-
}
|
498
|
-
|
499
|
-
SystemException prependMessageToException(const SystemException &e, const string &message) {
|
500
|
-
return SystemException(message + ": " + e.brief(), e.code());
|
501
|
-
}
|
502
|
-
|
503
|
-
protected:
|
504
|
-
/**
|
505
|
-
* A method which is called after the spawn server has started.
|
506
|
-
* It doesn't do anything by default and serves as a hook for unit tests.
|
507
|
-
*/
|
508
|
-
virtual void spawnServerStarted() { }
|
509
|
-
|
510
|
-
public:
|
511
|
-
/**
|
512
|
-
* Construct a new SpawnManager.
|
513
|
-
*
|
514
|
-
* @param spawnServerCommand The filename of the spawn server to use.
|
515
|
-
* @param generation The server instance dir generation in which
|
516
|
-
* generation-specific are stored.
|
517
|
-
* @param accountsDatabase An accounts database. SpawnManager will automatically
|
518
|
-
* create a new account for each spawned process, assigning
|
519
|
-
* it the rights as set in the PoolOptions object. This
|
520
|
-
* account is also automatically deleted when no longer needed.
|
521
|
-
* May be a null pointer.
|
522
|
-
* @param rubyCommand The Ruby interpreter's command.
|
523
|
-
* @throws RuntimeException An error occurred while creating a Unix server socket.
|
524
|
-
* @throws SystemException An error occured while trying to setup the spawn server.
|
525
|
-
* @throws IOException An error occurred while generating random data.
|
526
|
-
*/
|
527
|
-
SpawnManager(const string &spawnServerCommand,
|
528
|
-
const ServerInstanceDir::GenerationPtr &generation,
|
529
|
-
const AccountsDatabasePtr &accountsDatabase = AccountsDatabasePtr(),
|
530
|
-
const string &rubyCommand = "ruby",
|
531
|
-
const AnalyticsLoggerPtr &analyticsLogger = AnalyticsLoggerPtr(),
|
532
|
-
int logLevel = 0,
|
533
|
-
const string &debugLogFile = ""
|
534
|
-
) {
|
535
|
-
TRACE_POINT();
|
536
|
-
this->spawnServerCommand = spawnServerCommand;
|
537
|
-
this->generation = generation;
|
538
|
-
this->accountsDatabase = accountsDatabase;
|
539
|
-
this->rubyCommand = rubyCommand;
|
540
|
-
this->analyticsLogger = analyticsLogger;
|
541
|
-
this->logLevel = logLevel;
|
542
|
-
this->debugLogFile = debugLogFile;
|
543
|
-
pid = 0;
|
544
|
-
this_thread::disable_interruption di;
|
545
|
-
this_thread::disable_syscall_interruption dsi;
|
546
|
-
try {
|
547
|
-
restartServer();
|
548
|
-
} catch (const IOException &e) {
|
549
|
-
throw prependMessageToException(e, "Could not start the spawn server");
|
550
|
-
} catch (const SystemException &e) {
|
551
|
-
throw prependMessageToException(e, "Could not start the spawn server");
|
552
|
-
}
|
553
|
-
}
|
554
|
-
|
555
|
-
virtual ~SpawnManager() {
|
556
|
-
TRACE_POINT();
|
557
|
-
if (pid != 0) {
|
558
|
-
UPDATE_TRACE_POINT();
|
559
|
-
this_thread::disable_interruption di;
|
560
|
-
this_thread::disable_syscall_interruption dsi;
|
561
|
-
syscalls::unlink(socketFilename.c_str());
|
562
|
-
ownerSocket.close();
|
563
|
-
syscalls::waitpid(pid, NULL, 0);
|
564
|
-
}
|
565
|
-
}
|
566
|
-
|
567
|
-
virtual ProcessPtr spawn(const PoolOptions &options) {
|
568
|
-
TRACE_POINT();
|
569
|
-
AnalyticsScopeLog scope(options.log, "spawn app process");
|
570
|
-
ProcessPtr result;
|
571
|
-
boost::mutex::scoped_lock l(lock);
|
572
|
-
|
573
|
-
try {
|
574
|
-
result = sendSpawnCommand(options);
|
575
|
-
} catch (const SpawnException &e) {
|
576
|
-
if (e.hasErrorPage()) {
|
577
|
-
throw;
|
578
|
-
} else {
|
579
|
-
result = handleSpawnException(e, options);
|
580
|
-
}
|
581
|
-
}
|
582
|
-
scope.success();
|
583
|
-
return result;
|
584
|
-
}
|
585
|
-
|
586
|
-
virtual void reload(const string &appRoot) {
|
587
|
-
TRACE_POINT();
|
588
|
-
this_thread::disable_interruption di;
|
589
|
-
this_thread::disable_syscall_interruption dsi;
|
590
|
-
try {
|
591
|
-
return sendReloadCommand(appRoot);
|
592
|
-
} catch (const SystemException &e) {
|
593
|
-
return handleReloadException(e, appRoot);
|
594
|
-
}
|
595
|
-
}
|
596
|
-
|
597
|
-
virtual void killSpawnServer() const {
|
598
|
-
kill(pid, SIGKILL);
|
599
|
-
}
|
600
|
-
|
601
|
-
virtual pid_t getServerPid() const {
|
602
|
-
return pid;
|
603
|
-
}
|
604
|
-
};
|
605
|
-
|
606
|
-
/** Convenient alias for SpawnManager smart pointer. */
|
607
|
-
typedef shared_ptr<SpawnManager> SpawnManagerPtr;
|
608
|
-
|
609
|
-
} // namespace Passenger
|
610
|
-
|
611
|
-
#endif /* _PASSENGER_SPAWN_MANAGER_H_ */
|