passenger 4.0.60 → 5.0.0.beta1
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.
- checksums.yaml +8 -8
- checksums.yaml.gz.asc +7 -7
- data.tar.gz.asc +7 -7
- data/.editorconfig +5 -0
- data/.travis.yml +3 -2
- data/CHANGELOG +31 -53
- data/CONTRIBUTING.md +4 -4
- data/CONTRIBUTORS +0 -1
- data/Gemfile +18 -0
- data/Gemfile.lock +41 -0
- data/Rakefile +16 -0
- data/bin/passenger +2 -2
- data/bin/passenger-install-apache2-module +12 -12
- data/bin/passenger-install-nginx-module +9 -14
- data/bin/passenger-status +125 -87
- data/build/agents.rb +112 -140
- data/build/apache2.rb +4 -9
- data/build/basics.rb +5 -3
- data/build/common_library.rb +1 -0
- data/build/cxx_tests.rb +69 -47
- data/build/debian.rb +4 -2
- data/build/documentation.rb +1 -0
- data/build/integration_tests.rb +28 -43
- data/build/misc.rb +0 -18
- data/build/nginx.rb +2 -6
- data/build/packaging.rb +33 -22
- data/build/preprocessor.rb +2 -4
- data/build/ruby_tests.rb +7 -26
- data/build/test_basics.rb +24 -25
- data/debian.template/control.template +2 -2
- data/debian.template/locations.ini.template +2 -3
- data/debian.template/passenger.install.template +2 -2
- data/debian.template/rules.template +1 -1
- data/dev/ci/run_jenkins.sh +0 -1
- data/dev/ci/run_rpm_tests.sh +3 -0
- data/dev/ci/run_travis.sh +63 -17
- data/dev/copy_boost_headers +22 -6
- data/dev/ruby_server.rb +244 -0
- data/dev/vagrant/provision.sh +3 -1
- data/doc/DebuggingAndStressTesting.md +3 -3
- data/doc/Design and Architecture.txt +5 -6
- data/doc/Packaging.txt.md +35 -6
- data/doc/ServerOptimizationGuide.txt.md +339 -0
- data/doc/Users guide Apache.idmap.txt +177 -187
- data/doc/Users guide Apache.txt +143 -219
- data/doc/Users guide Nginx.idmap.txt +166 -166
- data/doc/Users guide Nginx.txt +265 -223
- data/doc/Users guide Standalone.txt +3 -3
- data/doc/templates/markdown.html.erb +37 -6
- data/doc/users_guide_snippets/environment_variables.txt +1 -1
- data/doc/users_guide_snippets/support_information.txt +1 -1
- data/doc/users_guide_snippets/tips.txt +2 -2
- data/ext/apache2/Configuration.cpp +23 -81
- data/ext/apache2/Configuration.hpp +18 -92
- data/ext/apache2/ConfigurationCommands.cpp +64 -15
- data/ext/apache2/ConfigurationCommands.cpp.erb +8 -4
- data/ext/apache2/ConfigurationFields.hpp +12 -0
- data/ext/apache2/ConfigurationSetters.cpp +73 -1
- data/ext/apache2/ConfigurationSetters.cpp.erb +3 -2
- data/ext/apache2/CreateDirConfig.cpp +6 -0
- data/ext/apache2/DirectoryMapper.h +11 -6
- data/ext/apache2/Hooks.cpp +291 -408
- data/ext/apache2/MergeDirConfig.cpp +42 -0
- data/ext/apache2/SetHeaders.cpp +61 -16
- data/ext/apache2/SetHeaders.cpp.erb +9 -7
- data/ext/boost/container/allocator_traits.hpp +400 -0
- data/ext/boost/container/deque.hpp +2012 -0
- data/ext/boost/container/detail/adaptive_node_pool_impl.hpp +874 -0
- data/ext/boost/container/detail/advanced_insert_int.hpp +369 -0
- data/ext/boost/container/detail/algorithms.hpp +84 -0
- data/ext/boost/container/detail/allocation_type.hpp +54 -0
- data/ext/boost/container/detail/allocator_version_traits.hpp +163 -0
- data/ext/boost/container/detail/config_begin.hpp +49 -0
- data/ext/boost/container/detail/config_end.hpp +17 -0
- data/ext/boost/container/detail/destroyers.hpp +365 -0
- data/ext/boost/container/detail/flat_tree.hpp +1055 -0
- data/ext/boost/container/detail/function_detector.hpp +88 -0
- data/ext/boost/container/detail/iterators.hpp +611 -0
- data/ext/boost/container/detail/math_functions.hpp +113 -0
- data/ext/boost/container/detail/memory_util.hpp +83 -0
- data/ext/boost/container/detail/mpl.hpp +160 -0
- data/ext/boost/container/detail/multiallocation_chain.hpp +286 -0
- data/ext/boost/container/detail/node_alloc_holder.hpp +386 -0
- data/ext/boost/container/detail/node_pool_impl.hpp +365 -0
- data/ext/boost/container/detail/pair.hpp +354 -0
- data/ext/boost/container/detail/pool_common.hpp +52 -0
- data/ext/boost/container/detail/preprocessor.hpp +232 -0
- data/ext/boost/container/detail/transform_iterator.hpp +176 -0
- data/ext/boost/container/detail/tree.hpp +1134 -0
- data/ext/boost/container/detail/type_traits.hpp +210 -0
- data/ext/boost/container/detail/utilities.hpp +1141 -0
- data/ext/boost/container/detail/value_init.hpp +45 -0
- data/ext/boost/container/detail/variadic_templates_tools.hpp +153 -0
- data/ext/boost/container/detail/version_type.hpp +92 -0
- data/ext/boost/container/detail/workaround.hpp +44 -0
- data/ext/boost/container/flat_map.hpp +1674 -0
- data/ext/boost/container/flat_set.hpp +1408 -0
- data/ext/boost/container/list.hpp +1475 -0
- data/ext/boost/container/map.hpp +1508 -0
- data/ext/boost/container/scoped_allocator.hpp +1503 -0
- data/ext/boost/container/scoped_allocator_fwd.hpp +83 -0
- data/ext/boost/container/set.hpp +1280 -0
- data/ext/boost/container/slist.hpp +1706 -0
- data/ext/boost/container/stable_vector.hpp +1869 -0
- data/ext/boost/container/static_vector.hpp +1053 -0
- data/ext/boost/container/string.hpp +2856 -0
- data/ext/boost/container/throw_exception.hpp +110 -0
- data/ext/boost/container/vector.hpp +2671 -0
- data/ext/boost/detail/is_xxx.hpp +61 -0
- data/ext/boost/intrusive/any_hook.hpp +344 -0
- data/ext/boost/intrusive/avl_set.hpp +2528 -0
- data/ext/boost/intrusive/avl_set_hook.hpp +297 -0
- data/ext/boost/intrusive/avltree.hpp +1786 -0
- data/ext/boost/intrusive/avltree_algorithms.hpp +968 -0
- data/ext/boost/intrusive/bs_set_hook.hpp +296 -0
- data/ext/boost/intrusive/circular_list_algorithms.hpp +413 -0
- data/ext/boost/intrusive/circular_slist_algorithms.hpp +404 -0
- data/ext/boost/intrusive/derivation_value_traits.hpp +70 -0
- data/ext/boost/intrusive/detail/any_node_and_algorithms.hpp +297 -0
- data/ext/boost/intrusive/detail/assert.hpp +41 -0
- data/ext/boost/intrusive/detail/avltree_node.hpp +197 -0
- data/ext/boost/intrusive/detail/clear_on_destructor_base.hpp +36 -0
- data/ext/boost/intrusive/detail/common_slist_algorithms.hpp +102 -0
- data/ext/boost/intrusive/detail/config_begin.hpp +52 -0
- data/ext/boost/intrusive/detail/config_end.hpp +15 -0
- data/ext/boost/intrusive/detail/ebo_functor_holder.hpp +95 -0
- data/ext/boost/intrusive/detail/function_detector.hpp +88 -0
- data/ext/boost/intrusive/detail/generic_hook.hpp +209 -0
- data/ext/boost/intrusive/detail/has_member_function_callable_with.hpp +357 -0
- data/ext/boost/intrusive/detail/hashtable_node.hpp +249 -0
- data/ext/boost/intrusive/detail/is_stateful_value_traits.hpp +77 -0
- data/ext/boost/intrusive/detail/list_node.hpp +196 -0
- data/ext/boost/intrusive/detail/memory_util.hpp +288 -0
- data/ext/boost/intrusive/detail/mpl.hpp +383 -0
- data/ext/boost/intrusive/detail/parent_from_member.hpp +97 -0
- data/ext/boost/intrusive/detail/preprocessor.hpp +52 -0
- data/ext/boost/intrusive/detail/rbtree_node.hpp +201 -0
- data/ext/boost/intrusive/detail/slist_node.hpp +166 -0
- data/ext/boost/intrusive/detail/transform_iterator.hpp +173 -0
- data/ext/boost/intrusive/detail/tree_algorithms.hpp +1742 -0
- data/ext/boost/intrusive/detail/tree_node.hpp +199 -0
- data/ext/boost/intrusive/detail/utilities.hpp +858 -0
- data/ext/boost/intrusive/detail/workaround.hpp +22 -0
- data/ext/boost/intrusive/hashtable.hpp +3110 -0
- data/ext/boost/intrusive/intrusive_fwd.hpp +542 -0
- data/ext/boost/intrusive/linear_slist_algorithms.hpp +327 -0
- data/ext/boost/intrusive/link_mode.hpp +46 -0
- data/ext/boost/intrusive/list.hpp +1525 -0
- data/ext/boost/intrusive/list_hook.hpp +290 -0
- data/ext/boost/intrusive/member_value_traits.hpp +70 -0
- data/ext/boost/intrusive/options.hpp +810 -0
- data/ext/boost/intrusive/parent_from_member.hpp +42 -0
- data/ext/boost/intrusive/pointer_plus_bits.hpp +86 -0
- data/ext/boost/intrusive/pointer_traits.hpp +265 -0
- data/ext/boost/intrusive/priority_compare.hpp +39 -0
- data/ext/boost/intrusive/rbtree.hpp +1785 -0
- data/ext/boost/intrusive/rbtree_algorithms.hpp +934 -0
- data/ext/boost/intrusive/set.hpp +2554 -0
- data/ext/boost/intrusive/set_hook.hpp +300 -0
- data/ext/boost/intrusive/sg_set.hpp +2601 -0
- data/ext/boost/intrusive/sgtree.hpp +2009 -0
- data/ext/boost/intrusive/sgtree_algorithms.hpp +807 -0
- data/ext/boost/intrusive/slist.hpp +2219 -0
- data/ext/boost/intrusive/slist_hook.hpp +294 -0
- data/ext/boost/intrusive/splay_set.hpp +2575 -0
- data/ext/boost/intrusive/splay_set_hook.hpp +292 -0
- data/ext/boost/intrusive/splaytree.hpp +1784 -0
- data/ext/boost/intrusive/splaytree_algorithms.hpp +1008 -0
- data/ext/boost/intrusive/treap.hpp +1882 -0
- data/ext/boost/intrusive/treap_algorithms.hpp +919 -0
- data/ext/boost/intrusive/treap_set.hpp +2751 -0
- data/ext/boost/intrusive/trivial_value_traits.hpp +46 -0
- data/ext/boost/intrusive/unordered_set.hpp +2115 -0
- data/ext/boost/intrusive/unordered_set_hook.hpp +434 -0
- data/ext/boost/intrusive_ptr.hpp +18 -0
- data/ext/boost/math/common_factor_ct.hpp +180 -0
- data/ext/boost/math_fwd.hpp +108 -0
- data/ext/boost/move/detail/move_helpers.hpp +175 -0
- data/ext/boost/parameter.hpp +21 -0
- data/ext/boost/parameter/aux_/arg_list.hpp +459 -0
- data/ext/boost/parameter/aux_/cast.hpp +143 -0
- data/ext/boost/parameter/aux_/default.hpp +69 -0
- data/ext/boost/parameter/aux_/is_maybe.hpp +26 -0
- data/ext/boost/parameter/aux_/maybe.hpp +120 -0
- data/ext/boost/parameter/aux_/overloads.hpp +88 -0
- data/ext/boost/parameter/aux_/parameter_requirements.hpp +25 -0
- data/ext/boost/parameter/aux_/parenthesized_type.hpp +119 -0
- data/ext/boost/parameter/aux_/preprocessor/flatten.hpp +115 -0
- data/ext/boost/parameter/aux_/preprocessor/for_each.hpp +103 -0
- data/ext/boost/parameter/aux_/python/invoker.hpp +132 -0
- data/ext/boost/parameter/aux_/python/invoker_iterate.hpp +93 -0
- data/ext/boost/parameter/aux_/result_of0.hpp +36 -0
- data/ext/boost/parameter/aux_/set.hpp +67 -0
- data/ext/boost/parameter/aux_/tag.hpp +38 -0
- data/ext/boost/parameter/aux_/tagged_argument.hpp +188 -0
- data/ext/boost/parameter/aux_/template_keyword.hpp +47 -0
- data/ext/boost/parameter/aux_/unwrap_cv_reference.hpp +97 -0
- data/ext/boost/parameter/aux_/void.hpp +29 -0
- data/ext/boost/parameter/aux_/yesno.hpp +26 -0
- data/ext/boost/parameter/binding.hpp +106 -0
- data/ext/boost/parameter/config.hpp +14 -0
- data/ext/boost/parameter/keyword.hpp +152 -0
- data/ext/boost/parameter/macros.hpp +99 -0
- data/ext/boost/parameter/match.hpp +55 -0
- data/ext/boost/parameter/name.hpp +156 -0
- data/ext/boost/parameter/parameters.hpp +931 -0
- data/ext/boost/parameter/preprocessor.hpp +1178 -0
- data/ext/boost/parameter/python.hpp +735 -0
- data/ext/boost/parameter/value_type.hpp +108 -0
- data/ext/boost/pool/detail/for.m4 +107 -0
- data/ext/boost/pool/detail/guard.hpp +69 -0
- data/ext/boost/pool/detail/mutex.hpp +42 -0
- data/ext/boost/pool/detail/pool_construct.bat +24 -0
- data/ext/boost/pool/detail/pool_construct.ipp +852 -0
- data/ext/boost/pool/detail/pool_construct.m4 +84 -0
- data/ext/boost/pool/detail/pool_construct.sh +12 -0
- data/ext/boost/pool/detail/pool_construct_simple.bat +25 -0
- data/ext/boost/pool/detail/pool_construct_simple.ipp +43 -0
- data/ext/boost/pool/detail/pool_construct_simple.m4 +72 -0
- data/ext/boost/pool/detail/pool_construct_simple.sh +12 -0
- data/ext/boost/pool/object_pool.hpp +287 -0
- data/ext/boost/pool/pool.hpp +1024 -0
- data/ext/boost/pool/pool_alloc.hpp +488 -0
- data/ext/boost/pool/poolfwd.hpp +82 -0
- data/ext/boost/pool/simple_segregated_storage.hpp +377 -0
- data/ext/boost/pool/singleton_pool.hpp +251 -0
- data/ext/boost/preprocessor/arithmetic.hpp +25 -0
- data/ext/boost/preprocessor/arithmetic/detail/div_base.hpp +61 -0
- data/ext/boost/preprocessor/arithmetic/div.hpp +39 -0
- data/ext/boost/preprocessor/arithmetic/mod.hpp +39 -0
- data/ext/boost/preprocessor/arithmetic/mul.hpp +53 -0
- data/ext/boost/preprocessor/array.hpp +32 -0
- data/ext/boost/preprocessor/array/enum.hpp +33 -0
- data/ext/boost/preprocessor/array/insert.hpp +55 -0
- data/ext/boost/preprocessor/array/pop_back.hpp +37 -0
- data/ext/boost/preprocessor/array/pop_front.hpp +38 -0
- data/ext/boost/preprocessor/array/push_back.hpp +33 -0
- data/ext/boost/preprocessor/array/push_front.hpp +33 -0
- data/ext/boost/preprocessor/array/remove.hpp +54 -0
- data/ext/boost/preprocessor/array/replace.hpp +49 -0
- data/ext/boost/preprocessor/array/reverse.hpp +29 -0
- data/ext/boost/preprocessor/array/to_list.hpp +33 -0
- data/ext/boost/preprocessor/array/to_seq.hpp +33 -0
- data/ext/boost/preprocessor/array/to_tuple.hpp +22 -0
- data/ext/boost/preprocessor/assert_msg.hpp +17 -0
- data/ext/boost/preprocessor/comma.hpp +17 -0
- data/ext/boost/preprocessor/comparison.hpp +24 -0
- data/ext/boost/preprocessor/comparison/equal.hpp +34 -0
- data/ext/boost/preprocessor/comparison/greater.hpp +38 -0
- data/ext/boost/preprocessor/comparison/greater_equal.hpp +38 -0
- data/ext/boost/preprocessor/comparison/less.hpp +46 -0
- data/ext/boost/preprocessor/comparison/less_equal.hpp +39 -0
- data/ext/boost/preprocessor/comparison/not_equal.hpp +814 -0
- data/ext/boost/preprocessor/config/limits.hpp +30 -0
- data/ext/boost/preprocessor/control.hpp +22 -0
- data/ext/boost/preprocessor/control/deduce_d.hpp +22 -0
- data/ext/boost/preprocessor/control/detail/dmc/while.hpp +536 -0
- data/ext/boost/preprocessor/control/detail/edg/while.hpp +534 -0
- data/ext/boost/preprocessor/control/detail/msvc/while.hpp +277 -0
- data/ext/boost/preprocessor/control/expr_if.hpp +30 -0
- data/ext/boost/preprocessor/debug.hpp +18 -0
- data/ext/boost/preprocessor/debug/assert.hpp +44 -0
- data/ext/boost/preprocessor/debug/line.hpp +35 -0
- data/ext/boost/preprocessor/detail/dmc/auto_rec.hpp +286 -0
- data/ext/boost/preprocessor/detail/is_nullary.hpp +30 -0
- data/ext/boost/preprocessor/detail/is_unary.hpp +30 -0
- data/ext/boost/preprocessor/detail/null.hpp +17 -0
- data/ext/boost/preprocessor/detail/split.hpp +35 -0
- data/ext/boost/preprocessor/enum_params_with_defaults.hpp +17 -0
- data/ext/boost/preprocessor/enum_shifted.hpp +17 -0
- data/ext/boost/preprocessor/expand.hpp +17 -0
- data/ext/boost/preprocessor/expr_if.hpp +17 -0
- data/ext/boost/preprocessor/facilities.hpp +23 -0
- data/ext/boost/preprocessor/facilities/apply.hpp +34 -0
- data/ext/boost/preprocessor/facilities/expand.hpp +28 -0
- data/ext/boost/preprocessor/facilities/is_1.hpp +23 -0
- data/ext/boost/preprocessor/facilities/is_empty.hpp +43 -0
- data/ext/boost/preprocessor/facilities/is_empty_or_1.hpp +30 -0
- data/ext/boost/preprocessor/for.hpp +17 -0
- data/ext/boost/preprocessor/if.hpp +17 -0
- data/ext/boost/preprocessor/iteration.hpp +19 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/lower3.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/lower4.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/lower5.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/upper3.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/upper4.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/bounds/upper5.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/finish.hpp +99 -0
- data/ext/boost/preprocessor/iteration/detail/iter/forward3.hpp +1338 -0
- data/ext/boost/preprocessor/iteration/detail/iter/forward4.hpp +1338 -0
- data/ext/boost/preprocessor/iteration/detail/iter/forward5.hpp +1338 -0
- data/ext/boost/preprocessor/iteration/detail/iter/reverse2.hpp +1296 -0
- data/ext/boost/preprocessor/iteration/detail/iter/reverse3.hpp +1296 -0
- data/ext/boost/preprocessor/iteration/detail/iter/reverse4.hpp +1296 -0
- data/ext/boost/preprocessor/iteration/detail/iter/reverse5.hpp +1296 -0
- data/ext/boost/preprocessor/iteration/detail/local.hpp +812 -0
- data/ext/boost/preprocessor/iteration/detail/rlocal.hpp +782 -0
- data/ext/boost/preprocessor/iteration/detail/self.hpp +21 -0
- data/ext/boost/preprocessor/iteration/detail/start.hpp +99 -0
- data/ext/boost/preprocessor/iteration/local.hpp +26 -0
- data/ext/boost/preprocessor/iteration/self.hpp +19 -0
- data/ext/boost/preprocessor/library.hpp +36 -0
- data/ext/boost/preprocessor/limits.hpp +17 -0
- data/ext/boost/preprocessor/list.hpp +37 -0
- data/ext/boost/preprocessor/list/at.hpp +39 -0
- data/ext/boost/preprocessor/list/cat.hpp +42 -0
- data/ext/boost/preprocessor/list/detail/dmc/fold_left.hpp +279 -0
- data/ext/boost/preprocessor/list/detail/edg/fold_left.hpp +536 -0
- data/ext/boost/preprocessor/list/detail/edg/fold_right.hpp +794 -0
- data/ext/boost/preprocessor/list/enum.hpp +41 -0
- data/ext/boost/preprocessor/list/filter.hpp +54 -0
- data/ext/boost/preprocessor/list/first_n.hpp +58 -0
- data/ext/boost/preprocessor/list/for_each.hpp +49 -0
- data/ext/boost/preprocessor/list/for_each_product.hpp +141 -0
- data/ext/boost/preprocessor/list/rest_n.hpp +55 -0
- data/ext/boost/preprocessor/list/size.hpp +58 -0
- data/ext/boost/preprocessor/list/to_array.hpp +123 -0
- data/ext/boost/preprocessor/list/to_seq.hpp +32 -0
- data/ext/boost/preprocessor/list/to_tuple.hpp +38 -0
- data/ext/boost/preprocessor/logical.hpp +29 -0
- data/ext/boost/preprocessor/logical/bitnor.hpp +38 -0
- data/ext/boost/preprocessor/logical/bitor.hpp +38 -0
- data/ext/boost/preprocessor/logical/bitxor.hpp +38 -0
- data/ext/boost/preprocessor/logical/nor.hpp +30 -0
- data/ext/boost/preprocessor/logical/not.hpp +30 -0
- data/ext/boost/preprocessor/logical/or.hpp +30 -0
- data/ext/boost/preprocessor/logical/xor.hpp +30 -0
- data/ext/boost/preprocessor/max.hpp +17 -0
- data/ext/boost/preprocessor/min.hpp +17 -0
- data/ext/boost/preprocessor/punctuation.hpp +20 -0
- data/ext/boost/preprocessor/punctuation/paren_if.hpp +38 -0
- data/ext/boost/preprocessor/repeat_3rd.hpp +17 -0
- data/ext/boost/preprocessor/repeat_from_to.hpp +17 -0
- data/ext/boost/preprocessor/repeat_from_to_2nd.hpp +17 -0
- data/ext/boost/preprocessor/repeat_from_to_3rd.hpp +17 -0
- data/ext/boost/preprocessor/repetition.hpp +32 -0
- data/ext/boost/preprocessor/repetition/deduce_r.hpp +22 -0
- data/ext/boost/preprocessor/repetition/deduce_z.hpp +22 -0
- data/ext/boost/preprocessor/repetition/detail/dmc/for.hpp +536 -0
- data/ext/boost/preprocessor/repetition/detail/edg/for.hpp +534 -0
- data/ext/boost/preprocessor/repetition/detail/msvc/for.hpp +277 -0
- data/ext/boost/preprocessor/repetition/enum_params_with_defaults.hpp +24 -0
- data/ext/boost/preprocessor/repetition/enum_shifted.hpp +68 -0
- data/ext/boost/preprocessor/repetition/enum_shifted_binary_params.hpp +51 -0
- data/ext/boost/preprocessor/repetition/enum_trailing.hpp +63 -0
- data/ext/boost/preprocessor/repetition/enum_trailing_binary_params.hpp +53 -0
- data/ext/boost/preprocessor/selection.hpp +18 -0
- data/ext/boost/preprocessor/selection/max.hpp +39 -0
- data/ext/boost/preprocessor/selection/min.hpp +39 -0
- data/ext/boost/preprocessor/seq.hpp +43 -0
- data/ext/boost/preprocessor/seq/cat.hpp +49 -0
- data/ext/boost/preprocessor/seq/detail/binary_transform.hpp +40 -0
- data/ext/boost/preprocessor/seq/detail/split.hpp +284 -0
- data/ext/boost/preprocessor/seq/filter.hpp +54 -0
- data/ext/boost/preprocessor/seq/first_n.hpp +30 -0
- data/ext/boost/preprocessor/seq/fold_left.hpp +1070 -0
- data/ext/boost/preprocessor/seq/fold_right.hpp +288 -0
- data/ext/boost/preprocessor/seq/for_each.hpp +60 -0
- data/ext/boost/preprocessor/seq/for_each_product.hpp +126 -0
- data/ext/boost/preprocessor/seq/insert.hpp +28 -0
- data/ext/boost/preprocessor/seq/pop_back.hpp +29 -0
- data/ext/boost/preprocessor/seq/pop_front.hpp +27 -0
- data/ext/boost/preprocessor/seq/push_back.hpp +19 -0
- data/ext/boost/preprocessor/seq/push_front.hpp +19 -0
- data/ext/boost/preprocessor/seq/remove.hpp +29 -0
- data/ext/boost/preprocessor/seq/replace.hpp +29 -0
- data/ext/boost/preprocessor/seq/rest_n.hpp +30 -0
- data/ext/boost/preprocessor/seq/reverse.hpp +39 -0
- data/ext/boost/preprocessor/seq/subseq.hpp +28 -0
- data/ext/boost/preprocessor/seq/to_array.hpp +28 -0
- data/ext/boost/preprocessor/seq/to_list.hpp +29 -0
- data/ext/boost/preprocessor/seq/to_tuple.hpp +27 -0
- data/ext/boost/preprocessor/seq/transform.hpp +48 -0
- data/ext/boost/preprocessor/slot.hpp +17 -0
- data/ext/boost/preprocessor/slot/counter.hpp +25 -0
- data/ext/boost/preprocessor/slot/detail/counter.hpp +269 -0
- data/ext/boost/preprocessor/slot/detail/slot1.hpp +267 -0
- data/ext/boost/preprocessor/slot/detail/slot2.hpp +267 -0
- data/ext/boost/preprocessor/slot/detail/slot3.hpp +267 -0
- data/ext/boost/preprocessor/slot/detail/slot4.hpp +267 -0
- data/ext/boost/preprocessor/slot/detail/slot5.hpp +267 -0
- data/ext/boost/preprocessor/tuple.hpp +28 -0
- data/ext/boost/preprocessor/tuple/enum.hpp +22 -0
- data/ext/boost/preprocessor/tuple/reverse.hpp +114 -0
- data/ext/boost/preprocessor/tuple/size.hpp +28 -0
- data/ext/boost/preprocessor/tuple/to_array.hpp +37 -0
- data/ext/boost/preprocessor/tuple/to_seq.hpp +114 -0
- data/ext/boost/preprocessor/variadic.hpp +23 -0
- data/ext/boost/preprocessor/variadic/to_array.hpp +32 -0
- data/ext/boost/preprocessor/variadic/to_list.hpp +25 -0
- data/ext/boost/preprocessor/variadic/to_seq.hpp +25 -0
- data/ext/boost/preprocessor/variadic/to_tuple.hpp +24 -0
- data/ext/boost/preprocessor/while.hpp +17 -0
- data/ext/boost/preprocessor/wstringize.hpp +29 -0
- data/ext/boost/smart_ptr/intrusive_ptr.hpp +324 -0
- data/ext/common/AccountsDatabase.h +3 -4
- data/ext/common/AgentsStarter.cpp +12 -15
- data/ext/common/AgentsStarter.h +54 -120
- data/ext/common/ApplicationPool2/AppTypes.cpp +12 -5
- data/ext/common/ApplicationPool2/AppTypes.h +21 -14
- data/ext/common/ApplicationPool2/Common.h +36 -19
- data/ext/common/ApplicationPool2/DirectSpawner.h +15 -16
- data/ext/common/ApplicationPool2/DummySpawner.h +9 -8
- data/ext/common/ApplicationPool2/ErrorRenderer.h +1 -1
- data/ext/common/ApplicationPool2/Group.h +304 -171
- data/ext/common/ApplicationPool2/Implementation.cpp +234 -125
- data/ext/common/ApplicationPool2/Options.h +50 -62
- data/ext/common/ApplicationPool2/Pool.h +285 -189
- data/ext/common/ApplicationPool2/Process.h +126 -115
- data/ext/common/ApplicationPool2/Session.h +70 -30
- data/ext/common/ApplicationPool2/SmartSpawner.h +19 -18
- data/ext/common/ApplicationPool2/Socket.h +57 -43
- data/ext/common/ApplicationPool2/SpawnObject.h +83 -0
- data/ext/common/ApplicationPool2/Spawner.h +59 -38
- data/ext/common/ApplicationPool2/SpawnerFactory.h +8 -14
- data/ext/common/ApplicationPool2/SuperGroup.h +69 -40
- data/ext/common/BackgroundEventLoop.cpp +48 -1
- data/ext/common/BackgroundEventLoop.h +3 -1
- data/ext/common/Constants.h +30 -8
- data/ext/common/DataStructures/HashedStaticString.h +103 -0
- data/ext/common/DataStructures/LString.h +396 -0
- data/ext/common/DataStructures/StringKeyTable.h +588 -0
- data/ext/common/EventedMessageServer.h +1 -0
- data/ext/common/FileDescriptor.h +5 -0
- data/ext/common/InstanceDirectory.h +240 -0
- data/ext/common/Logging.cpp +38 -13
- data/ext/common/Logging.h +53 -22
- data/ext/common/MemoryKit/mbuf.cpp +413 -0
- data/ext/common/MemoryKit/mbuf.h +266 -0
- data/ext/common/MemoryKit/palloc.cpp +337 -0
- data/ext/common/MemoryKit/palloc.h +121 -0
- data/ext/common/ResourceLocator.h +62 -6
- data/ext/common/SafeLibev.h +4 -4
- data/ext/common/ServerKit/AcceptLoadBalancer.h +275 -0
- data/ext/common/ServerKit/Channel.h +747 -0
- data/ext/common/ServerKit/Client.h +166 -0
- data/ext/common/ServerKit/ClientRef.h +130 -0
- data/ext/common/ServerKit/Context.h +129 -0
- data/ext/common/ServerKit/Errors.h +103 -0
- data/ext/common/ServerKit/FdSinkChannel.h +206 -0
- data/ext/common/ServerKit/FdSourceChannel.h +230 -0
- data/ext/common/ServerKit/FileBufferedChannel.h +1399 -0
- data/ext/common/ServerKit/FileBufferedFdSinkChannel.h +228 -0
- data/ext/common/ServerKit/HeaderTable.h +472 -0
- data/ext/common/ServerKit/Hooks.h +79 -0
- data/ext/common/ServerKit/HttpChunkedBodyParser.h +289 -0
- data/ext/common/ServerKit/HttpChunkedBodyParserState.h +70 -0
- data/ext/common/ServerKit/HttpClient.h +94 -0
- data/ext/common/ServerKit/HttpHeaderParser.h +477 -0
- data/ext/common/ServerKit/HttpHeaderParserState.h +60 -0
- data/ext/common/ServerKit/HttpRequest.h +276 -0
- data/ext/common/ServerKit/HttpRequestRef.h +130 -0
- data/ext/common/ServerKit/HttpServer.h +1152 -0
- data/ext/common/ServerKit/Implementation.cpp +47 -0
- data/ext/common/ServerKit/Server.h +1040 -0
- data/ext/common/ServerKit/http_parser.cpp +2259 -0
- data/ext/common/ServerKit/http_parser.h +330 -0
- data/ext/common/StaticString.h +8 -0
- data/ext/common/Utils.cpp +14 -12
- data/ext/common/Utils.h +9 -103
- data/ext/common/Utils/BufferedIO.h +1 -0
- data/ext/common/Utils/CachedFileStat.hpp +1 -7
- data/ext/common/Utils/DateParsing.h +379 -0
- data/ext/common/Utils/FileChangeChecker.h +3 -9
- data/ext/common/Utils/Hasher.cpp +52 -0
- data/ext/common/Utils/Hasher.h +58 -0
- data/ext/common/Utils/IOUtils.cpp +62 -62
- data/ext/common/Utils/JsonUtils.h +21 -0
- data/ext/common/Utils/OptionParsing.h +75 -0
- data/ext/common/Utils/StrIntUtils.cpp +112 -19
- data/ext/common/Utils/StrIntUtils.h +52 -12
- data/ext/common/Utils/StrIntUtilsNoStrictAliasing.cpp +174 -0
- data/ext/common/Utils/VariantMap.h +18 -7
- data/ext/common/Utils/modp_b64.cpp +290 -0
- data/ext/common/Utils/modp_b64.h +241 -0
- data/ext/common/Utils/modp_b64_data.h +479 -0
- data/ext/common/Utils/sysqueue.h +811 -0
- data/ext/common/agents/Base.cpp +71 -98
- data/ext/common/agents/Base.h +11 -3
- data/ext/common/agents/HelperAgent/AdminServer.h +690 -0
- data/ext/common/agents/HelperAgent/Main.cpp +899 -487
- data/ext/common/agents/HelperAgent/OptionParser.h +311 -0
- data/ext/common/agents/HelperAgent/RequestHandler.h +315 -2548
- data/ext/common/agents/HelperAgent/RequestHandler/AppResponse.h +225 -0
- data/ext/common/agents/HelperAgent/RequestHandler/BufferBody.cpp +93 -0
- data/ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp +346 -0
- data/ext/common/agents/HelperAgent/RequestHandler/Client.h +54 -0
- data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp +846 -0
- data/ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp +231 -0
- data/ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp +434 -0
- data/ext/common/agents/HelperAgent/RequestHandler/Request.h +149 -0
- data/ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp +887 -0
- data/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h +293 -0
- data/ext/common/agents/HelperAgent/RequestHandler/Utils.cpp +301 -0
- data/ext/common/agents/HelperAgent/ResponseCache.h +624 -0
- data/ext/common/agents/HelperAgent/SystemMetricsTool.cpp +21 -23
- data/ext/common/agents/LoggingAgent/AdminServer.h +369 -0
- data/ext/common/agents/LoggingAgent/LoggingServer.h +1 -0
- data/ext/common/agents/LoggingAgent/Main.cpp +422 -215
- data/ext/common/agents/LoggingAgent/OptionParser.h +167 -0
- data/ext/common/agents/LoggingAgent/RemoteSender.h +3 -3
- data/ext/common/agents/Main.cpp +107 -0
- data/ext/common/agents/SpawnPreparer/Main.cpp +207 -0
- data/ext/common/agents/TempDirToucher/Main.cpp +429 -0
- data/ext/common/agents/Watchdog/AdminServer.h +390 -0
- data/ext/common/agents/Watchdog/AgentWatcher.cpp +7 -5
- data/ext/common/agents/Watchdog/HelperAgentWatcher.cpp +18 -39
- data/ext/common/agents/Watchdog/InstanceDirToucher.cpp +116 -0
- data/ext/common/agents/Watchdog/LoggingAgentWatcher.cpp +13 -17
- data/ext/common/agents/Watchdog/Main.cpp +743 -202
- data/ext/libeio/eio.c +17 -0
- data/ext/libeio/eio.h +2 -0
- data/ext/nginx/CacheLocationConfig.c +177 -198
- data/ext/nginx/CacheLocationConfig.c.erb +35 -22
- data/ext/nginx/Configuration.c +402 -236
- data/ext/nginx/Configuration.h +12 -5
- data/ext/nginx/ConfigurationCommands.c +35 -15
- data/ext/nginx/ConfigurationCommands.c.erb +4 -4
- data/ext/nginx/ConfigurationFields.h +9 -5
- data/ext/nginx/ConfigurationFields.h.erb +3 -1
- data/ext/nginx/ContentHandler.c +393 -362
- data/ext/nginx/CreateLocationConfig.c +8 -4
- data/ext/nginx/CreateLocationConfig.c.erb +8 -3
- data/ext/nginx/MergeLocationConfig.c +36 -6
- data/ext/nginx/MergeLocationConfig.c.erb +42 -1
- data/ext/nginx/ngx_http_passenger_module.c +28 -15
- data/ext/oxt/detail/backtrace_disabled.hpp +2 -1
- data/ext/oxt/detail/backtrace_enabled.hpp +15 -2
- data/ext/oxt/implementation.cpp +92 -20
- data/ext/oxt/thread.hpp +5 -0
- data/ext/ruby/extconf.rb +3 -6
- data/ext/ruby/passenger_native_support.c +13 -40
- data/helper-scripts/download_binaries/extconf.rb +4 -4
- data/helper-scripts/meteor-loader.rb +12 -112
- data/helper-scripts/node-loader.js +3 -91
- data/helper-scripts/rack-loader.rb +13 -14
- data/helper-scripts/rack-preloader.rb +16 -17
- data/helper-scripts/wsgi-loader.py +11 -7
- data/lib/phusion_passenger.rb +100 -79
- data/lib/phusion_passenger/abstract_installer.rb +28 -3
- data/lib/phusion_passenger/admin_tools.rb +3 -3
- data/lib/phusion_passenger/admin_tools/instance.rb +207 -0
- data/lib/phusion_passenger/admin_tools/instance_registry.rb +98 -0
- data/lib/phusion_passenger/apache2/config_options.rb +72 -22
- data/lib/phusion_passenger/common_library.rb +79 -14
- data/lib/phusion_passenger/config/about_command.rb +17 -23
- data/lib/phusion_passenger/config/admin_command_command.rb +175 -0
- data/lib/phusion_passenger/config/agent_compiler.rb +170 -0
- data/lib/phusion_passenger/config/command.rb +1 -4
- data/lib/phusion_passenger/config/compile_agent_command.rb +102 -0
- data/lib/phusion_passenger/config/compile_nginx_engine_command.rb +112 -0
- data/lib/phusion_passenger/config/detach_process_command.rb +32 -10
- data/lib/phusion_passenger/config/download_agent_command.rb +285 -0
- data/lib/phusion_passenger/config/download_nginx_engine_command.rb +281 -0
- data/lib/phusion_passenger/config/install_agent_command.rb +174 -0
- data/lib/phusion_passenger/config/install_standalone_runtime_command.rb +231 -0
- data/lib/phusion_passenger/config/installation_utils.rb +241 -0
- data/lib/phusion_passenger/config/list_instances_command.rb +13 -25
- data/lib/phusion_passenger/config/main.rb +43 -14
- data/lib/phusion_passenger/config/nginx_engine_compiler.rb +337 -0
- data/lib/phusion_passenger/config/reopen_logs_command.rb +110 -0
- data/lib/phusion_passenger/config/restart_app_command.rb +61 -14
- data/lib/phusion_passenger/config/system_metrics_command.rb +2 -1
- data/lib/phusion_passenger/config/utils.rb +64 -39
- data/lib/phusion_passenger/config/validate_install_command.rb +2 -2
- data/lib/phusion_passenger/constants.rb +27 -6
- data/lib/phusion_passenger/debug_logging.rb +32 -15
- data/lib/phusion_passenger/loader_shared_helpers.rb +2 -5
- data/lib/phusion_passenger/message_client.rb +21 -22
- data/lib/phusion_passenger/native_support.rb +26 -31
- data/lib/phusion_passenger/nginx/config_options.rb +32 -19
- data/lib/phusion_passenger/packaging.rb +7 -3
- data/lib/phusion_passenger/platform_info/cxx_portability.rb +1 -2
- data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb +3 -4
- data/lib/phusion_passenger/platform_info/operating_system.rb +6 -6
- data/lib/phusion_passenger/preloader_shared_helpers.rb +2 -2
- data/lib/phusion_passenger/rack/out_of_band_gc.rb +2 -2
- data/lib/phusion_passenger/rack/thread_handler_extension.rb +168 -65
- data/lib/phusion_passenger/request_handler.rb +47 -82
- data/lib/phusion_passenger/request_handler/thread_handler.rb +46 -10
- data/lib/phusion_passenger/ruby_core_enhancements.rb +25 -77
- data/lib/phusion_passenger/ruby_core_io_enhancements.rb +108 -0
- data/lib/phusion_passenger/standalone/app_finder.rb +39 -59
- data/lib/phusion_passenger/standalone/command.rb +27 -275
- data/lib/phusion_passenger/standalone/command2.rb +292 -0
- data/lib/phusion_passenger/standalone/config_utils.rb +87 -0
- data/lib/phusion_passenger/standalone/control_utils.rb +88 -0
- data/lib/phusion_passenger/standalone/main.rb +69 -71
- data/lib/phusion_passenger/standalone/start2_command.rb +799 -0
- data/lib/phusion_passenger/standalone/start_command.rb +406 -467
- data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb +167 -0
- data/lib/phusion_passenger/standalone/start_command/nginx_engine.rb +165 -0
- data/lib/phusion_passenger/standalone/status_command.rb +64 -23
- data/lib/phusion_passenger/standalone/stop_command.rb +69 -32
- data/lib/phusion_passenger/standalone/version_command.rb +1 -5
- data/lib/phusion_passenger/utils.rb +0 -4
- data/lib/phusion_passenger/utils/json.rb +70 -4
- data/lib/phusion_passenger/utils/progress_bar.rb +56 -0
- data/lib/phusion_passenger/utils/tee_input.rb +3 -3
- data/lib/phusion_passenger/utils/unseekable_socket.rb +30 -0
- data/packaging/rpm/nginx_spec/nginx.spec.template +4 -3
- data/packaging/rpm/passenger_spec/passenger.spec.template +6 -10
- data/packaging/rpm/setup-system +2 -1
- data/resources/oss-binaries.phusionpassenger.com.crt +208 -0
- data/resources/templates/config/agent_compiler/confirm_enable_optimizations.txt.erb +5 -0
- data/resources/templates/config/installation_utils/cannot_create_user_support_binaries_dir.txt.erb +15 -0
- data/resources/templates/config/installation_utils/download_tool_missing.txt.erb +7 -0
- data/resources/templates/config/installation_utils/passenger_not_installed_as_root.txt.erb +12 -0
- data/resources/templates/config/installation_utils/support_binaries_dir_not_writable_despite_running_as_root.txt.erb +13 -0
- data/resources/templates/config/installation_utils/unexpected_filesystem_problem.txt.erb +16 -0
- data/{packaging/debian/debian_specs/passenger/patches/series → resources/templates/config/installation_utils/user_support_binaries_dir_not_writable.txt.erb} +0 -0
- data/resources/templates/nginx/nginx_module_sources_not_available.txt.erb +2 -2
- data/resources/templates/standalone/config.erb +14 -16
- data/resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +1 -1
- data/test/.rspec +1 -0
- data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +20 -17
- data/test/cxx/ApplicationPool2/OptionsTest.cpp +0 -14
- data/test/cxx/ApplicationPool2/PoolTest.cpp +113 -90
- data/test/cxx/ApplicationPool2/ProcessTest.cpp +18 -27
- data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +51 -53
- data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +55 -57
- data/test/cxx/BufferedIOTest.cpp +40 -40
- data/test/cxx/CxxTestMain.cpp +4 -22
- data/test/cxx/DataStructures/LStringTest.cpp +275 -0
- data/test/cxx/DataStructures/StringKeyTableTest.cpp +199 -0
- data/test/cxx/MemoryKit/MbufTest.cpp +213 -0
- data/test/cxx/MessageServerTest.cpp +62 -55
- data/test/cxx/RequestHandlerTest.cpp +26 -27
- data/test/cxx/ServerKit/ChannelTest.cpp +1467 -0
- data/test/cxx/ServerKit/FileBufferedChannelTest.cpp +817 -0
- data/test/cxx/ServerKit/HeaderTableTest.cpp +171 -0
- data/test/cxx/ServerKit/HttpServerTest.cpp +1503 -0
- data/test/cxx/ServerKit/ServerTest.cpp +408 -0
- data/test/cxx/TestSupport.cpp +51 -15
- data/test/cxx/TestSupport.h +31 -21
- data/test/cxx/UnionStationTest.cpp +121 -122
- data/test/cxx/UtilsTest.cpp +9 -33
- data/test/integration_tests/apache2_tests.rb +65 -27
- data/test/integration_tests/downloaded_binaries_tests.rb +30 -6
- data/test/integration_tests/native_packaging_spec.rb +32 -17
- data/test/integration_tests/nginx_tests.rb +28 -10
- data/test/integration_tests/shared/example_webapp_tests.rb +40 -27
- data/test/integration_tests/standalone_tests.rb +232 -169
- data/test/ruby/debug_logging_spec.rb +44 -40
- data/test/ruby/rails3.0/preloader_spec.rb +1 -1
- data/test/ruby/rails3.1/preloader_spec.rb +1 -1
- data/test/ruby/rails3.2/preloader_spec.rb +1 -1
- data/test/ruby/rails4.0/preloader_spec.rb +1 -1
- data/test/ruby/rails4.1/preloader_spec.rb +1 -1
- data/test/ruby/request_handler_spec.rb +62 -24
- data/test/ruby/shared/loader_sharedspec.rb +10 -9
- data/test/ruby/shared/rails/union_station_extensions_sharedspec.rb +23 -22
- data/test/ruby/spec_helper.rb +2 -11
- data/test/ruby/standalone/runtime_installer_spec.rb +15 -13
- data/test/ruby/union_station_spec.rb +45 -40
- data/test/ruby/utils/tee_input_spec.rb +5 -5
- data/test/ruby/utils_spec.rb +3 -39
- data/test/stub/apache2/httpd.conf.erb +5 -2
- data/test/stub/nginx/nginx.conf.erb +3 -1
- data/test/support/apache2_controller.rb +25 -25
- data/test/support/nginx_controller.rb +14 -14
- data/test/support/test_helper.rb +74 -75
- metadata +439 -643
- metadata.gz.asc +7 -7
- data/ext/common/MultiLibeio.cpp +0 -204
- data/ext/common/MultiLibeio.h +0 -67
- data/ext/common/ServerInstanceDir.h +0 -402
- data/ext/common/Utils/Base64.cpp +0 -143
- data/ext/common/Utils/Base64.h +0 -83
- data/ext/common/Utils/HttpHeaderBufferer.h +0 -184
- data/ext/common/Utils/PriorityQueue.h +0 -54
- data/ext/common/Utils/StreamBoyerMooreHorspool.h +0 -512
- data/ext/common/Utils/fib.c +0 -699
- data/ext/common/Utils/fib.h +0 -101
- data/ext/common/Utils/fibpriv.h +0 -67
- data/ext/common/agents/EnvPrinter.c +0 -16
- data/ext/common/agents/HelperAgent/AgentOptions.h +0 -109
- data/ext/common/agents/HelperAgent/FileBackedPipe.h +0 -732
- data/ext/common/agents/HelperAgent/RequestHandler.cpp +0 -294
- data/ext/common/agents/HelperAgent/ScgiRequestParser.h +0 -457
- data/ext/common/agents/LoggingAgent/AdminController.h +0 -96
- data/ext/common/agents/SpawnPreparer.cpp +0 -206
- data/ext/common/agents/TempDirToucher.c +0 -383
- data/ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp +0 -116
- data/helper-scripts/classic-rails-loader.rb +0 -166
- data/helper-scripts/classic-rails-preloader.rb +0 -193
- data/lib/phusion_passenger/admin_tools/server_instance.rb +0 -339
- data/lib/phusion_passenger/classic_rails/cgi_fixed.rb +0 -68
- data/lib/phusion_passenger/classic_rails/thread_handler_extension.rb +0 -40
- data/lib/phusion_passenger/platform_info/openssl.rb +0 -61
- data/lib/phusion_passenger/standalone/config_file.rb +0 -119
- data/lib/phusion_passenger/standalone/help_command.rb +0 -57
- data/lib/phusion_passenger/standalone/runtime_installer.rb +0 -712
- data/lib/phusion_passenger/standalone/runtime_locator.rb +0 -170
- data/lib/phusion_passenger/standalone/utils.rb +0 -58
- data/lib/phusion_passenger/utils/tmpdir.rb +0 -69
- data/packaging/debian/LICENSE.md +0 -19
- data/packaging/debian/README.md +0 -320
- data/packaging/debian/Vagrantfile +0 -25
- data/packaging/debian/build +0 -210
- data/packaging/debian/debian_specs/nginx/changelog +0 -1989
- data/packaging/debian/debian_specs/nginx/compat.erb +0 -5
- data/packaging/debian/debian_specs/nginx/conf/fastcgi.conf +0 -25
- data/packaging/debian/debian_specs/nginx/conf/fastcgi_params +0 -24
- data/packaging/debian/debian_specs/nginx/conf/koi-utf +0 -109
- data/packaging/debian/debian_specs/nginx/conf/koi-win +0 -103
- data/packaging/debian/debian_specs/nginx/conf/mime.types +0 -89
- data/packaging/debian/debian_specs/nginx/conf/nginx.conf.erb +0 -97
- data/packaging/debian/debian_specs/nginx/conf/proxy_params +0 -4
- data/packaging/debian/debian_specs/nginx/conf/scgi_params +0 -16
- data/packaging/debian/debian_specs/nginx/conf/sites-available/default.erb +0 -93
- data/packaging/debian/debian_specs/nginx/conf/snippets/fastcgi-php.conf +0 -13
- data/packaging/debian/debian_specs/nginx/conf/snippets/snakeoil.conf +0 -5
- data/packaging/debian/debian_specs/nginx/conf/uwsgi_params +0 -16
- data/packaging/debian/debian_specs/nginx/conf/win-utf +0 -125
- data/packaging/debian/debian_specs/nginx/control.erb +0 -226
- data/packaging/debian/debian_specs/nginx/copyright +0 -196
- data/packaging/debian/debian_specs/nginx/debian-full.lintian-overrides +0 -1
- data/packaging/debian/debian_specs/nginx/gbp.conf +0 -2
- data/packaging/debian/debian_specs/nginx/help/docs/fcgiwrap +0 -14
- data/packaging/debian/debian_specs/nginx/help/docs/php +0 -119
- data/packaging/debian/debian_specs/nginx/help/docs/support-irc +0 -28
- data/packaging/debian/debian_specs/nginx/help/docs/upstream +0 -51
- data/packaging/debian/debian_specs/nginx/help/examples/drupal +0 -114
- data/packaging/debian/debian_specs/nginx/help/examples/http +0 -59
- data/packaging/debian/debian_specs/nginx/help/examples/mail +0 -30
- data/packaging/debian/debian_specs/nginx/help/examples/mailman +0 -59
- data/packaging/debian/debian_specs/nginx/help/examples/nginx.conf +0 -34
- data/packaging/debian/debian_specs/nginx/help/examples/nginx_modsite +0 -162
- data/packaging/debian/debian_specs/nginx/help/examples/virtual_hosts +0 -155
- data/packaging/debian/debian_specs/nginx/help/examples/wordpress +0 -74
- data/packaging/debian/debian_specs/nginx/helpers.rb +0 -41
- data/packaging/debian/debian_specs/nginx/index-debian.html.in +0 -32
- data/packaging/debian/debian_specs/nginx/index-ubuntu.html.in +0 -32
- data/packaging/debian/debian_specs/nginx/index.html.erb +0 -10
- data/packaging/debian/debian_specs/nginx/modules/README.Modules-versions +0 -65
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/README.markdown +0 -510
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/config +0 -5
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/doc/HttpHeadersMoreModule.wiki +0 -395
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ddebug.h +0 -119
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c +0 -348
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.h +0 -80
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c +0 -826
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h +0 -26
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c +0 -716
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h +0 -26
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c +0 -380
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h +0 -52
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/util/build.sh +0 -32
- data/packaging/debian/debian_specs/nginx/modules/headers-more-nginx-module/valgrind.suppress +0 -215
- data/packaging/debian/debian_specs/nginx/modules/nginx-auth-pam/ChangeLog +0 -35
- data/packaging/debian/debian_specs/nginx/modules/nginx-auth-pam/LICENSE +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-auth-pam/README.md +0 -93
- data/packaging/debian/debian_specs/nginx/modules/nginx-auth-pam/config +0 -4
- data/packaging/debian/debian_specs/nginx/modules/nginx-auth-pam/ngx_http_auth_pam_module.c +0 -462
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/CHANGES +0 -66
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/LICENSE +0 -26
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/README.md +0 -171
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/TODO.md +0 -7
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/config +0 -21
- data/packaging/debian/debian_specs/nginx/modules/nginx-cache-purge/ngx_cache_purge_module.c +0 -1803
- data/packaging/debian/debian_specs/nginx/modules/nginx-dav-ext-module/README +0 -29
- data/packaging/debian/debian_specs/nginx/modules/nginx-dav-ext-module/config +0 -9
- data/packaging/debian/debian_specs/nginx/modules/nginx-dav-ext-module/ngx_http_dav_ext_module.c +0 -824
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/README +0 -139
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/README_AUTO_LIB +0 -395
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/TODO +0 -1
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/actions/array +0 -10
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/actions/palloc +0 -8
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/build +0 -597
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/action_replacements +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/action_types +0 -12
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_args +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_locs +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/conf_macros +0 -35
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/contexts +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/header_files +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/headers +0 -4
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/module_dependencies +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/modules_optional +0 -15
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/data/prefixes +0 -2
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/array.h +0 -7
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/conf_cmd_basic.h +0 -43
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/conf_merge.h +0 -78
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/src/palloc.h +0 -6
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/auto/text/autogen +0 -12
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/config +0 -49
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/core/action_macros +0 -63
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/core/conf_cmds +0 -62
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/modules/set_var +0 -124
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/patches/more_logging_info +0 -48
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/docs/upstream/list +0 -45
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/examples/README +0 -12
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/examples/http/set_var/config +0 -4
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/examples/http/set_var/ngx_http_set_var_examples_module.c +0 -136
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/ngx_auto_lib_core +0 -797
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/notes/CHANGES +0 -17
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/notes/LICENSE +0 -24
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_array.h +0 -113
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_conf_cmd_basic.h +0 -2203
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_conf_cmd_extra.h +0 -5423
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_conf_merge.h +0 -227
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_config.c +0 -72
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_config.h +0 -98
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_includes.h +0 -66
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/objs/ndk_palloc.h +0 -112
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/patches/auto_config +0 -16
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/patches/expose_rewrite_functions +0 -291
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/patches/rewrite_phase_handler +0 -19
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/hash/md5.h +0 -117
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/hash/murmurhash2.c +0 -77
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/hash/sha.h +0 -200
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk.c +0 -155
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk.h +0 -58
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_buf.c +0 -43
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_buf.h +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_complex_path.c +0 -129
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_complex_path.h +0 -30
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_complex_value.c +0 -192
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_complex_value.h +0 -21
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_conf_file.c +0 -396
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_conf_file.h +0 -44
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_debug.c +0 -72
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_debug.h +0 -171
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_encoding.c +0 -57
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_encoding.h +0 -12
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_hash.c +0 -82
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_hash.h +0 -45
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_http.c +0 -138
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_http.h +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_http_headers.h +0 -35
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_log.c +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_log.h +0 -165
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_parse.h +0 -67
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_path.c +0 -583
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_path.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_process.c +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_process.h +0 -12
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_regex.c +0 -215
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_regex.h +0 -7
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_rewrite.c +0 -103
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_rewrite.h +0 -26
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_set_var.c +0 -602
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_set_var.h +0 -44
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_string.c +0 -434
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_string.h +0 -37
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_string_util.h +0 -14
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_upstream_list.c +0 -205
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_upstream_list.h +0 -27
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_uri.c +0 -45
- data/packaging/debian/debian_specs/nginx/modules/nginx-development-kit/src/ndk_uri.h +0 -6
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/LICENSE +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/README.markdown +0 -1850
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/config +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/doc/HttpEchoModule.wiki +0 -1558
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ddebug.h +0 -109
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_echo.c +0 -344
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_echo.h +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_filter.c +0 -282
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_filter.h +0 -15
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_foreach.c +0 -183
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_foreach.h +0 -16
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_handler.c +0 -429
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_handler.h +0 -18
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_location.c +0 -178
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_location.h +0 -13
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_module.c +0 -667
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_module.h +0 -137
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_request_info.c +0 -452
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_request_info.h +0 -31
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_sleep.c +0 -208
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_sleep.h +0 -16
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_subrequest.c +0 -788
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_subrequest.h +0 -19
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_timer.c +0 -96
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_timer.h +0 -13
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_util.c +0 -298
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_util.h +0 -58
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_var.c +0 -110
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/src/ngx_http_echo_var.h +0 -9
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/util/build.sh +0 -45
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/util/releng +0 -8
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/util/wiki2pod.pl +0 -131
- data/packaging/debian/debian_specs/nginx/modules/nginx-echo/valgrind.suppress +0 -38
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/LICENCE +0 -24
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/README +0 -206
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/changelog.txt +0 -54
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/config +0 -26
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/protocol.txt +0 -191
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_defs.c +0 -59
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_defs.h +0 -73
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_module.c +0 -783
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_module.h +0 -31
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_module_setup.c +0 -361
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/ngx_http_push_types.h +0 -120
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/memory/store.c +0 -1180
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/memory/store.h +0 -1
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.c +0 -146
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.h +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/ngx_http_push_store.h +0 -51
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/ngx_rwlock.c +0 -178
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/ngx_rwlock.h +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/rbtree_util.c +0 -246
- data/packaging/debian/debian_specs/nginx/modules/nginx-http-push/src/store/rbtree_util.h +0 -9
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/Changes +0 -51
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/README.markdown +0 -6954
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/config +0 -363
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/doc/HttpLuaModule.wiki +0 -5898
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/dtrace/ngx_lua_provider.d +0 -61
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/misc/recv-until-pm/Makefile +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/misc/recv-until-pm/lib/RecvUntil.pm +0 -138
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/misc/recv-until-pm/t/sanity.t +0 -140
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/api/ngx_http_lua_api.h +0 -52
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ddebug.h +0 -82
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_accessby.c +0 -377
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_accessby.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_api.c +0 -77
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_args.c +0 -537
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_args.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c +0 -632
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h +0 -31
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_cache.c +0 -296
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_cache.h +0 -24
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_capturefilter.c +0 -175
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_capturefilter.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_clfactory.c +0 -887
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_clfactory.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_common.h +0 -478
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_config.c +0 -67
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_config.h +0 -19
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_consts.c +0 -148
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_consts.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_contentby.c +0 -369
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_contentby.h +0 -26
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_control.c +0 -483
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_control.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_coroutine.c +0 -379
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_coroutine.h +0 -23
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_ctx.c +0 -216
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_ctx.h +0 -23
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_directive.c +0 -1081
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_directive.h +0 -56
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_exception.c +0 -58
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_exception.h +0 -33
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c +0 -302
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h +0 -29
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers.c +0 -1370
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers_in.c +0 -782
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers_in.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers_out.c +0 -625
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_headers_out.h +0 -23
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_initby.c +0 -42
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_initby.h +0 -23
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_initworkerby.c +0 -320
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_initworkerby.h +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_log.c +0 -300
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_log.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_logby.c +0 -227
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_logby.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_misc.c +0 -252
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_misc.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_module.c +0 -924
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_ndk.c +0 -184
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_ndk.h +0 -21
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_output.c +0 -794
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_output.h +0 -28
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_pcrefix.c +0 -106
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_pcrefix.h +0 -23
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_phase.c +0 -94
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_phase.h +0 -13
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_probe.h +0 -85
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_regex.c +0 -2468
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_regex.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_req_body.c +0 -1169
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_req_body.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_req_method.c +0 -252
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_req_method.h +0 -19
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_rewriteby.c +0 -351
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_rewriteby.h +0 -22
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_script.c +0 -538
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_script.h +0 -86
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_setby.c +0 -216
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_setby.h +0 -15
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_shdict.c +0 -1844
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_shdict.h +0 -52
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_sleep.c +0 -191
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_sleep.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c +0 -5314
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h +0 -156
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_socket_udp.c +0 -1624
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_socket_udp.h +0 -56
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_string.c +0 -704
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_string.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_subrequest.c +0 -1741
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_subrequest.h +0 -46
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_time.c +0 -278
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_time.h +0 -21
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_timer.c +0 -661
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_timer.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uri.c +0 -110
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uri.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uthread.c +0 -283
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uthread.h +0 -36
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_util.c +0 -3972
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_util.h +0 -423
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_variable.c +0 -499
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_variable.h +0 -20
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_worker.c +0 -64
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_worker.h +0 -17
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/tapset/ngx_lua.stp +0 -5
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/build.sh +0 -39
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/build2.sh +0 -55
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/fix-comments +0 -27
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/gdbinit +0 -415
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/ngx-links +0 -62
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/reindex +0 -64
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/releng +0 -8
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/retab +0 -8
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/revim +0 -102
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/run_test.sh +0 -10
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/util/update-readme.sh +0 -4
- data/packaging/debian/debian_specs/nginx/modules/nginx-lua/valgrind.suppress +0 -144
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/CHANGES +0 -107
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/LICENSE +0 -25
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/Makefile +0 -8
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/README +0 -329
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/config +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-upload-progress/ngx_http_uploadprogress_module.c +0 -1774
- data/packaging/debian/debian_specs/nginx/modules/nginx-upstream-fair/README +0 -53
- data/packaging/debian/debian_specs/nginx/modules/nginx-upstream-fair/config +0 -3
- data/packaging/debian/debian_specs/nginx/modules/nginx-upstream-fair/ngx_http_upstream_fair_module.c +0 -1356
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/CHANGELOG.md +0 -37
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/HACKING.md +0 -24
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/LICENSE +0 -20
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/README.rst +0 -182
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/config +0 -8
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/nginx-0.6-support.patch +0 -23
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/ngx_http_fancyindex_module.c +0 -1305
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/template.awk +0 -52
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/template.h +0 -103
- data/packaging/debian/debian_specs/nginx/modules/ngx-fancyindex/template.html +0 -102
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/CHANGES +0 -37
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/README +0 -141
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/config +0 -3
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/doc/README.google_code_home_page.wiki +0 -120
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/doc/README.html +0 -199
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/doc/README.wiki +0 -123
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/ngx_http_subs_filter_module.c +0 -1298
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/README +0 -275
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/AutoInstall.pm +0 -820
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install.pm +0 -470
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/AutoInstall.pm +0 -82
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Base.pm +0 -83
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Can.pm +0 -81
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Fetch.pm +0 -93
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Include.pm +0 -34
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Makefile.pm +0 -415
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Metadata.pm +0 -716
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/TestBase.pm +0 -29
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Win32.pm +0 -64
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/WriteAll.pm +0 -63
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Spiffy.pm +0 -539
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base.pm +0 -682
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base/Filter.pm +0 -341
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder.pm +0 -1413
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder/Module.pm +0 -81
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/inc/Test/More.pm +0 -735
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx.pm +0 -315
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/LWP.pm +0 -524
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Socket.pm +0 -1749
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Util.pm +0 -874
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/t/subs.t +0 -136
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/t/subs_capture.t +0 -32
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/t/subs_fix_string.t +0 -32
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/t/subs_regex.t +0 -108
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/t/subs_types.t +0 -59
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/test/test.sh +0 -5
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/util/update-readme.sh +0 -7
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/util/wiki2google_code_homepage.pl +0 -29
- data/packaging/debian/debian_specs/nginx/modules/ngx_http_substitutions_filter_module/util/wiki2pod.pl +0 -129
- data/packaging/debian/debian_specs/nginx/nginx-common.NEWS +0 -135
- data/packaging/debian/debian_specs/nginx/nginx-common.README.Debian +0 -45
- data/packaging/debian/debian_specs/nginx/nginx-common.dirs.erb +0 -32
- data/packaging/debian/debian_specs/nginx/nginx-common.install +0 -3
- data/packaging/debian/debian_specs/nginx/nginx-common.lintian-overrides +0 -2
- data/packaging/debian/debian_specs/nginx/nginx-common.manpages +0 -1
- data/packaging/debian/debian_specs/nginx/nginx-common.nginx.default +0 -10
- data/packaging/debian/debian_specs/nginx/nginx-common.nginx.init.erb +0 -214
- data/packaging/debian/debian_specs/nginx/nginx-common.nginx.logrotate +0 -18
- data/packaging/debian/debian_specs/nginx/nginx-common.nginx.service.erb +0 -37
- data/packaging/debian/debian_specs/nginx/nginx-common.postinst.erb +0 -66
- data/packaging/debian/debian_specs/nginx/nginx-common.postrm.erb +0 -46
- data/packaging/debian/debian_specs/nginx/nginx-common.preinst +0 -47
- data/packaging/debian/debian_specs/nginx/nginx-common.prerm.erb +0 -28
- data/packaging/debian/debian_specs/nginx/nginx-doc.docs +0 -2
- data/packaging/debian/debian_specs/nginx/nginx-doc.examples +0 -1
- data/packaging/debian/debian_specs/nginx/nginx-extras.install.erb +0 -17
- data/packaging/debian/debian_specs/nginx/nginx-extras.lintian-overrides +0 -1
- data/packaging/debian/debian_specs/nginx/nginx-extras.postinst.erb +0 -44
- data/packaging/debian/debian_specs/nginx/nginx-extras.prerm +0 -22
- data/packaging/debian/debian_specs/nginx/nginx.1 +0 -47
- data/packaging/debian/debian_specs/nginx/patches/perl-use-dpkg-buildflags.patch +0 -23
- data/packaging/debian/debian_specs/nginx/patches/series +0 -1
- data/packaging/debian/debian_specs/nginx/rules.erb +0 -185
- data/packaging/debian/debian_specs/nginx/source/format +0 -1
- data/packaging/debian/debian_specs/nginx/tests/control +0 -4
- data/packaging/debian/debian_specs/nginx/ufw/nginx +0 -14
- data/packaging/debian/debian_specs/nginx/upstream/signing-key.asc +0 -34
- data/packaging/debian/debian_specs/nginx/watch +0 -3
- data/packaging/debian/debian_specs/passenger/README.Debian +0 -12
- data/packaging/debian/debian_specs/passenger/changelog +0 -316
- data/packaging/debian/debian_specs/passenger/compat +0 -1
- data/packaging/debian/debian_specs/passenger/control.erb +0 -123
- data/packaging/debian/debian_specs/passenger/copyright +0 -385
- data/packaging/debian/debian_specs/passenger/helpers.rb +0 -24
- data/packaging/debian/debian_specs/passenger/libapache2-mod-passenger.install +0 -3
- data/packaging/debian/debian_specs/passenger/libapache2-mod-passenger.postinst +0 -36
- data/packaging/debian/debian_specs/passenger/libapache2-mod-passenger.prerm +0 -15
- data/packaging/debian/debian_specs/passenger/locations.ini.erb +0 -14
- data/packaging/debian/debian_specs/passenger/passenger-dev.install.erb +0 -3
- data/packaging/debian/debian_specs/passenger/passenger-doc.install.erb +0 -2
- data/packaging/debian/debian_specs/passenger/passenger.conf +0 -6
- data/packaging/debian/debian_specs/passenger/passenger.docs +0 -4
- data/packaging/debian/debian_specs/passenger/passenger.install.erb +0 -16
- data/packaging/debian/debian_specs/passenger/passenger.load +0 -3
- data/packaging/debian/debian_specs/passenger/passenger.manpages +0 -3
- data/packaging/debian/debian_specs/passenger/passenger_free_ruby.c +0 -29
- data/packaging/debian/debian_specs/passenger/passenger_ruby_utils.c +0 -54
- data/packaging/debian/debian_specs/passenger/passenger_system_ruby.c.erb +0 -37
- data/packaging/debian/debian_specs/passenger/rules.erb +0 -84
- data/packaging/debian/debian_specs/passenger/source/format +0 -1
- data/packaging/debian/debian_specs/passenger_enterprise/README.Debian +0 -12
- data/packaging/debian/debian_specs/passenger_enterprise/changelog +0 -316
- data/packaging/debian/debian_specs/passenger_enterprise/compat +0 -1
- data/packaging/debian/debian_specs/passenger_enterprise/control.erb +0 -123
- data/packaging/debian/debian_specs/passenger_enterprise/copyright +0 -385
- data/packaging/debian/debian_specs/passenger_enterprise/helpers.rb +0 -2
- data/packaging/debian/debian_specs/passenger_enterprise/libapache2-mod-passenger-enterprise.install +0 -3
- data/packaging/debian/debian_specs/passenger_enterprise/libapache2-mod-passenger-enterprise.postinst +0 -36
- data/packaging/debian/debian_specs/passenger_enterprise/libapache2-mod-passenger-enterprise.prerm +0 -15
- data/packaging/debian/debian_specs/passenger_enterprise/locations.ini.erb +0 -14
- data/packaging/debian/debian_specs/passenger_enterprise/passenger-enterprise-dev.install.erb +0 -3
- data/packaging/debian/debian_specs/passenger_enterprise/passenger-enterprise-doc.install.erb +0 -2
- data/packaging/debian/debian_specs/passenger_enterprise/passenger-enterprise.docs +0 -4
- data/packaging/debian/debian_specs/passenger_enterprise/passenger-enterprise.install.erb +0 -14
- data/packaging/debian/debian_specs/passenger_enterprise/passenger-enterprise.manpages +0 -3
- data/packaging/debian/debian_specs/passenger_enterprise/passenger.conf +0 -6
- data/packaging/debian/debian_specs/passenger_enterprise/passenger.load +0 -3
- data/packaging/debian/debian_specs/passenger_enterprise/passenger_free_ruby.c.erb +0 -1
- data/packaging/debian/debian_specs/passenger_enterprise/passenger_ruby_utils.c.erb +0 -1
- data/packaging/debian/debian_specs/passenger_enterprise/passenger_system_ruby.c.erb +0 -1
- data/packaging/debian/debian_specs/passenger_enterprise/patches/series +0 -0
- data/packaging/debian/debian_specs/passenger_enterprise/rules.erb +0 -84
- data/packaging/debian/debian_specs/passenger_enterprise/source/format +0 -1
- data/packaging/debian/docker_images/Makefile +0 -38
- data/packaging/debian/docker_images/buildbox/CONTAINER_VERSION.txt +0 -0
- data/packaging/debian/docker_images/buildbox/Dockerfile +0 -3
- data/packaging/debian/docker_images/buildbox/Gemfile +0 -9
- data/packaging/debian/docker_images/buildbox/Gemfile.lock +0 -42
- data/packaging/debian/docker_images/buildbox/install.sh +0 -85
- data/packaging/debian/docker_images/buildbox/pbuilderrc +0 -4
- data/packaging/debian/docker_images/buildbox/sudoers.conf +0 -6
- data/packaging/debian/docker_images/setup-buildbox-docker-image +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-debian-6 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-debian-7 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-debian-8 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-ubuntu-12.04 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-ubuntu-14.04 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-ubuntu-15.04 +0 -7
- data/packaging/debian/docker_images/setup-testbox-docker-image-ubuntu-15.10 +0 -7
- data/packaging/debian/docker_images/testbox-debian-6/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-debian-6/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-debian-6/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-debian-6/argparse.py +0 -2374
- data/packaging/debian/docker_images/testbox-debian-6/install.sh +0 -78
- data/packaging/debian/docker_images/testbox-debian-7/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-debian-7/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-debian-7/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-debian-7/install.sh +0 -71
- data/packaging/debian/docker_images/testbox-debian-8/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-debian-8/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-debian-8/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-debian-8/install.sh +0 -70
- data/packaging/debian/docker_images/testbox-ubuntu-12.04/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-ubuntu-12.04/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-ubuntu-12.04/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-ubuntu-12.04/install.sh +0 -69
- data/packaging/debian/docker_images/testbox-ubuntu-14.04/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-ubuntu-14.04/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-ubuntu-14.04/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-ubuntu-14.04/install.sh +0 -69
- data/packaging/debian/docker_images/testbox-ubuntu-15.04/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-ubuntu-15.04/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-ubuntu-15.04/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-ubuntu-15.04/install.sh +0 -69
- data/packaging/debian/docker_images/testbox-ubuntu-15.10/Dockerfile +0 -3
- data/packaging/debian/docker_images/testbox-ubuntu-15.10/Gemfile +0 -2
- data/packaging/debian/docker_images/testbox-ubuntu-15.10/Gemfile.lock +0 -23
- data/packaging/debian/docker_images/testbox-ubuntu-15.10/install.sh +0 -69
- data/packaging/debian/internal/build/Rakefile +0 -235
- data/packaging/debian/internal/build/build-passenger-orig-tarball.sh +0 -76
- data/packaging/debian/internal/build/build-source-package.rb +0 -121
- data/packaging/debian/internal/build/download-nginx-orig-tarball.sh +0 -17
- data/packaging/debian/internal/build/rakefile_support.rb +0 -96
- data/packaging/debian/internal/build/setup-environment-essentials.sh +0 -15
- data/packaging/debian/internal/build/setup-environment.sh +0 -29
- data/packaging/debian/internal/lib/distro_info.rb +0 -82
- data/packaging/debian/internal/lib/distro_info.sh +0 -303
- data/packaging/debian/internal/lib/distro_info.sh.erb +0 -65
- data/packaging/debian/internal/lib/library.sh +0 -83
- data/packaging/debian/internal/lib/preprocessor.rb +0 -173
- data/packaging/debian/internal/lib/tracking.rb +0 -95
- data/packaging/debian/internal/lib/tracking_category.rb +0 -45
- data/packaging/debian/internal/lib/tracking_database.rb +0 -132
- data/packaging/debian/internal/lib/tracking_task.rb +0 -148
- data/packaging/debian/internal/lib/utils.rb +0 -78
- data/packaging/debian/internal/publish/Rakefile +0 -97
- data/packaging/debian/internal/publish/oss-binaries.phusionpassenger.com-fingerprint.txt +0 -1
- data/packaging/debian/internal/publish/packagecloud_fingerprint.txt +0 -1
- data/packaging/debian/internal/publish/passenger_website_fingerprint.txt +0 -1
- data/packaging/debian/internal/publish/preinit.sh +0 -7
- data/packaging/debian/internal/publish/rakefile_support.rb +0 -183
- data/packaging/debian/internal/scripts/gpg_noninteractive/gpg +0 -11
- data/packaging/debian/internal/scripts/initccache.sh +0 -35
- data/packaging/debian/internal/scripts/inituidgid.sh +0 -19
- data/packaging/debian/internal/scripts/my_init +0 -340
- data/packaging/debian/internal/scripts/pin_certificates +0 -34
- data/packaging/debian/internal/scripts/regen_distro_info_script.sh +0 -3
- data/packaging/debian/internal/scripts/setup-vagrant.sh +0 -12
- data/packaging/debian/internal/scripts/setuser +0 -31
- data/packaging/debian/internal/shell/initpbuilder.sh +0 -3
- data/packaging/debian/internal/shell/preinit.sh +0 -28
- data/packaging/debian/internal/shell/sudoers.conf +0 -1
- data/packaging/debian/internal/test/apache/apache-24.conf +0 -5
- data/packaging/debian/internal/test/apache/apache-pre-24.conf +0 -4
- data/packaging/debian/internal/test/apache/vhost.conf +0 -17
- data/packaging/debian/internal/test/misc/config.json +0 -15
- data/packaging/debian/internal/test/misc/hosts.conf +0 -4
- data/packaging/debian/internal/test/misc/init.sh +0 -25
- data/packaging/debian/internal/test/misc/nodejs_test_app.js +0 -6
- data/packaging/debian/internal/test/misc/python_test_app.py +0 -3
- data/packaging/debian/internal/test/misc/ruby_test_app.rb +0 -5
- data/packaging/debian/internal/test/misc/test_support.rb +0 -61
- data/packaging/debian/internal/test/nginx/vhost.conf +0 -23
- data/packaging/debian/internal/test/system_web_server_test.rb +0 -126
- data/packaging/debian/internal/test/test.sh +0 -141
- data/packaging/debian/jenkins/publish/clear_caches.rb +0 -48
- data/packaging/debian/jenkins/publish/publish.sh +0 -69
- data/packaging/debian/jenkins/test/test.sh +0 -63
- data/packaging/debian/passenger_apt_automation.sublime-project +0 -14
- data/packaging/debian/publish +0 -172
- data/packaging/debian/shell +0 -116
- data/packaging/debian/test +0 -142
- data/packaging/rpm/passenger_spec/rubygem-passenger-4.0.18-gcc47-include-sys_types.patch +0 -45
- data/test/cxx/Base64Test.cpp +0 -50
- data/test/cxx/FileBackedPipeTest.cpp +0 -626
- data/test/cxx/HttpHeaderBuffererTest.cpp +0 -257
- data/test/cxx/ScgiRequestParserTest.cpp +0 -423
- data/test/cxx/ServerInstanceDirTest.cpp +0 -175
- data/test/ruby/admin_tools_spec.rb +0 -360
- data/test/ruby/classic_rails/loader_spec.rb +0 -46
- data/test/ruby/classic_rails/preloader_spec.rb +0 -52
- data/test/ruby/standalone/runtime_locator_spec.rb +0 -214
- data/test/stub/rails2.3/Rakefile +0 -10
- data/test/stub/rails2.3/app/controllers/application_controller.rb +0 -10
- data/test/stub/rails2.3/app/controllers/bar_controller_1.rb +0 -5
- data/test/stub/rails2.3/app/controllers/bar_controller_2.rb +0 -5
- data/test/stub/rails2.3/app/controllers/foo_controller.rb +0 -21
- data/test/stub/rails2.3/app/helpers/application_helper.rb +0 -3
- data/test/stub/rails2.3/app/helpers/bar_helper.rb +0 -2
- data/test/stub/rails2.3/app/helpers/foo_helper.rb +0 -2
- data/test/stub/rails2.3/config/boot.rb +0 -110
- data/test/stub/rails2.3/config/database.yml +0 -19
- data/test/stub/rails2.3/config/environment.rb +0 -62
- data/test/stub/rails2.3/config/environments/development.rb +0 -17
- data/test/stub/rails2.3/config/environments/production.rb +0 -18
- data/test/stub/rails2.3/config/environments/staging.rb +0 -18
- data/test/stub/rails2.3/config/initializers/inflections.rb +0 -10
- data/test/stub/rails2.3/config/initializers/mime_types.rb +0 -5
- data/test/stub/rails2.3/config/routes.rb +0 -35
- data/test/stub/rails2.3/log/.gitignore +0 -1
- data/test/stub/rails2.3/public/.gitignore +0 -1
- data/test/stub/rails2.3/script/about +0 -3
- data/test/stub/rails2.3/script/console +0 -3
- data/test/stub/rails2.3/script/dbconsole +0 -3
- data/test/stub/rails2.3/script/destroy +0 -3
- data/test/stub/rails2.3/script/generate +0 -3
- data/test/stub/rails2.3/script/performance/benchmarker +0 -3
- data/test/stub/rails2.3/script/performance/profiler +0 -3
- data/test/stub/rails2.3/script/performance/request +0 -3
- data/test/stub/rails2.3/script/plugin +0 -3
- data/test/stub/rails2.3/script/process/inspector +0 -3
- data/test/stub/rails2.3/script/process/reaper +0 -3
- data/test/stub/rails2.3/script/process/spawner +0 -3
- data/test/stub/rails2.3/script/runner +0 -3
- data/test/stub/rails2.3/script/server +0 -3
- data/test/stub/rails2.3/tmp/cache/.gitignore +0 -1
- data/test/stub/rails2.3/tmp/pids/.gitignore +0 -1
- data/test/stub/rails2.3/tmp/sessions/.gitignore +0 -1
- data/test/stub/rails2.3/tmp/sockets/.gitignore +0 -1
@@ -1,53 +0,0 @@
|
|
1
|
-
Nginx Upstream Fair Proxy Load Balancer
|
2
|
-
--
|
3
|
-
|
4
|
-
Description:
|
5
|
-
--
|
6
|
-
|
7
|
-
The Nginx fair proxy balancer enhances the standard round-robin load balancer provided
|
8
|
-
with Nginx so that it will track busy back end servers (e.g. Thin, Ebb, Mongrel)
|
9
|
-
and balance the load to non-busy server processes.
|
10
|
-
|
11
|
-
Further information can be found on http://nginx.localdomain.pl/
|
12
|
-
|
13
|
-
Ezra Zygmuntowicz has a good writeup of the fair proxy load balancer and how to use it here:
|
14
|
-
http://brainspl.at/articles/2007/11/09/a-fair-proxy-balancer-for-nginx-and-mongrel
|
15
|
-
|
16
|
-
|
17
|
-
Installation:
|
18
|
-
--
|
19
|
-
|
20
|
-
You'll need to re-compile Nginx from source to include this module.
|
21
|
-
Modify your compile of Nginx by adding the following directive
|
22
|
-
(modified to suit your path of course):
|
23
|
-
|
24
|
-
./configure --with-http_ssl_module --add-module=/absolute/path/to/nginx-upstream-fair
|
25
|
-
make
|
26
|
-
make install
|
27
|
-
|
28
|
-
|
29
|
-
Usage:
|
30
|
-
--
|
31
|
-
|
32
|
-
Change your Nginx config file's upstream block to include the 'fair' directive:
|
33
|
-
|
34
|
-
upstream mongrel {
|
35
|
-
fair;
|
36
|
-
server 127.0.0.1:5000;
|
37
|
-
server 127.0.0.1:5001;
|
38
|
-
server 127.0.0.1:5002;
|
39
|
-
}
|
40
|
-
|
41
|
-
|
42
|
-
If you encounter any issues, please report them using the bugtracker at
|
43
|
-
http://nginx.localdomain.pl/
|
44
|
-
|
45
|
-
Contributing:
|
46
|
-
--
|
47
|
-
|
48
|
-
Git source repositories:
|
49
|
-
http://github.com/gnosek/nginx-upstream-fair/tree/master
|
50
|
-
http://git.localdomain.pl/?p=nginx-upstream-fair.git;a=summary
|
51
|
-
|
52
|
-
Please feel free to fork the project at GitHub and submit pull requests or patches.
|
53
|
-
|
data/packaging/debian/debian_specs/nginx/modules/nginx-upstream-fair/ngx_http_upstream_fair_module.c
DELETED
@@ -1,1356 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (C) 2007 Grzegorz Nosek
|
3
|
-
* Work sponsored by Ezra Zygmuntowicz & EngineYard.com
|
4
|
-
*
|
5
|
-
* Based on nginx source (C) Igor Sysoev
|
6
|
-
*/
|
7
|
-
|
8
|
-
#include <ngx_config.h>
|
9
|
-
#include <ngx_core.h>
|
10
|
-
#include <ngx_http.h>
|
11
|
-
|
12
|
-
typedef struct {
|
13
|
-
ngx_uint_t nreq;
|
14
|
-
ngx_uint_t total_req;
|
15
|
-
ngx_uint_t last_req_id;
|
16
|
-
ngx_uint_t fails;
|
17
|
-
ngx_uint_t current_weight;
|
18
|
-
} ngx_http_upstream_fair_shared_t;
|
19
|
-
|
20
|
-
typedef struct ngx_http_upstream_fair_peers_s ngx_http_upstream_fair_peers_t;
|
21
|
-
|
22
|
-
typedef struct {
|
23
|
-
ngx_rbtree_node_t node;
|
24
|
-
ngx_uint_t generation;
|
25
|
-
uintptr_t peers; /* forms a unique cookie together with generation */
|
26
|
-
ngx_uint_t total_nreq;
|
27
|
-
ngx_uint_t total_requests;
|
28
|
-
ngx_atomic_t lock;
|
29
|
-
ngx_http_upstream_fair_shared_t stats[1];
|
30
|
-
} ngx_http_upstream_fair_shm_block_t;
|
31
|
-
|
32
|
-
/* ngx_spinlock is defined without a matching unlock primitive */
|
33
|
-
#define ngx_spinlock_unlock(lock) (void) ngx_atomic_cmp_set(lock, ngx_pid, 0)
|
34
|
-
|
35
|
-
typedef struct {
|
36
|
-
ngx_http_upstream_fair_shared_t *shared;
|
37
|
-
struct sockaddr *sockaddr;
|
38
|
-
socklen_t socklen;
|
39
|
-
ngx_str_t name;
|
40
|
-
|
41
|
-
ngx_uint_t weight;
|
42
|
-
ngx_uint_t max_fails;
|
43
|
-
time_t fail_timeout;
|
44
|
-
|
45
|
-
time_t accessed;
|
46
|
-
ngx_uint_t down:1;
|
47
|
-
|
48
|
-
#if (NGX_HTTP_SSL)
|
49
|
-
ngx_ssl_session_t *ssl_session; /* local to a process */
|
50
|
-
#endif
|
51
|
-
|
52
|
-
} ngx_http_upstream_fair_peer_t;
|
53
|
-
|
54
|
-
#define NGX_HTTP_UPSTREAM_FAIR_NO_RR (1<<26)
|
55
|
-
#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE (1<<27)
|
56
|
-
#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK (1<<28)
|
57
|
-
#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK ((1<<27) | (1<<28))
|
58
|
-
|
59
|
-
enum { WM_DEFAULT = 0, WM_IDLE, WM_PEAK };
|
60
|
-
|
61
|
-
struct ngx_http_upstream_fair_peers_s {
|
62
|
-
ngx_http_upstream_fair_shm_block_t *shared;
|
63
|
-
ngx_uint_t current;
|
64
|
-
ngx_uint_t size_err:1;
|
65
|
-
ngx_uint_t no_rr:1;
|
66
|
-
ngx_uint_t weight_mode:2;
|
67
|
-
ngx_uint_t number;
|
68
|
-
ngx_str_t *name;
|
69
|
-
ngx_http_upstream_fair_peers_t *next; /* for backup peers support, not really used yet */
|
70
|
-
ngx_http_upstream_fair_peer_t peer[1];
|
71
|
-
};
|
72
|
-
|
73
|
-
|
74
|
-
#define NGX_PEER_INVALID (~0UL)
|
75
|
-
|
76
|
-
typedef struct {
|
77
|
-
ngx_http_upstream_fair_peers_t *peers;
|
78
|
-
ngx_uint_t current;
|
79
|
-
uintptr_t *tried;
|
80
|
-
uintptr_t *done;
|
81
|
-
uintptr_t data;
|
82
|
-
uintptr_t data2;
|
83
|
-
} ngx_http_upstream_fair_peer_data_t;
|
84
|
-
|
85
|
-
|
86
|
-
static ngx_int_t ngx_http_upstream_init_fair(ngx_conf_t *cf,
|
87
|
-
ngx_http_upstream_srv_conf_t *us);
|
88
|
-
static ngx_int_t ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc,
|
89
|
-
void *data);
|
90
|
-
static void ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc,
|
91
|
-
void *data, ngx_uint_t state);
|
92
|
-
static ngx_int_t ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
|
93
|
-
ngx_http_upstream_srv_conf_t *us);
|
94
|
-
static char *ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd,
|
95
|
-
void *conf);
|
96
|
-
static char *ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf,
|
97
|
-
ngx_command_t *cmd, void *conf);
|
98
|
-
static ngx_int_t ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle);
|
99
|
-
|
100
|
-
#if (NGX_HTTP_EXTENDED_STATUS)
|
101
|
-
static ngx_chain_t *ngx_http_upstream_fair_report_status(ngx_http_request_t *r,
|
102
|
-
ngx_int_t *length);
|
103
|
-
#endif
|
104
|
-
|
105
|
-
#if (NGX_HTTP_SSL)
|
106
|
-
static ngx_int_t ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc,
|
107
|
-
void *data);
|
108
|
-
static void ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc,
|
109
|
-
void *data);
|
110
|
-
#endif
|
111
|
-
|
112
|
-
static ngx_command_t ngx_http_upstream_fair_commands[] = {
|
113
|
-
|
114
|
-
{ ngx_string("fair"),
|
115
|
-
NGX_HTTP_UPS_CONF|NGX_CONF_ANY,
|
116
|
-
ngx_http_upstream_fair,
|
117
|
-
0,
|
118
|
-
0,
|
119
|
-
NULL },
|
120
|
-
|
121
|
-
{ ngx_string("upstream_fair_shm_size"),
|
122
|
-
NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
|
123
|
-
ngx_http_upstream_fair_set_shm_size,
|
124
|
-
0,
|
125
|
-
0,
|
126
|
-
NULL },
|
127
|
-
|
128
|
-
ngx_null_command
|
129
|
-
};
|
130
|
-
|
131
|
-
|
132
|
-
static ngx_http_module_t ngx_http_upstream_fair_module_ctx = {
|
133
|
-
NULL, /* preconfiguration */
|
134
|
-
NULL, /* postconfiguration */
|
135
|
-
|
136
|
-
NULL, /* create main configuration */
|
137
|
-
NULL, /* init main configuration */
|
138
|
-
|
139
|
-
NULL, /* create server configuration */
|
140
|
-
NULL, /* merge server configuration */
|
141
|
-
|
142
|
-
NULL, /* create location configuration */
|
143
|
-
NULL, /* merge location configuration */
|
144
|
-
|
145
|
-
#if (NGX_HTTP_EXTENDED_STATUS)
|
146
|
-
ngx_http_upstream_fair_report_status,
|
147
|
-
#endif
|
148
|
-
};
|
149
|
-
|
150
|
-
|
151
|
-
ngx_module_t ngx_http_upstream_fair_module = {
|
152
|
-
NGX_MODULE_V1,
|
153
|
-
&ngx_http_upstream_fair_module_ctx, /* module context */
|
154
|
-
ngx_http_upstream_fair_commands, /* module directives */
|
155
|
-
NGX_HTTP_MODULE, /* module type */
|
156
|
-
NULL, /* init master */
|
157
|
-
ngx_http_upstream_fair_init_module, /* init module */
|
158
|
-
NULL, /* init process */
|
159
|
-
NULL, /* init thread */
|
160
|
-
NULL, /* exit thread */
|
161
|
-
NULL, /* exit process */
|
162
|
-
NULL, /* exit master */
|
163
|
-
NGX_MODULE_V1_PADDING
|
164
|
-
};
|
165
|
-
|
166
|
-
|
167
|
-
static ngx_uint_t ngx_http_upstream_fair_shm_size;
|
168
|
-
static ngx_shm_zone_t * ngx_http_upstream_fair_shm_zone;
|
169
|
-
static ngx_rbtree_t * ngx_http_upstream_fair_rbtree;
|
170
|
-
static ngx_uint_t ngx_http_upstream_fair_generation;
|
171
|
-
|
172
|
-
static int
|
173
|
-
ngx_http_upstream_fair_compare_rbtree_node(const ngx_rbtree_node_t *v_left,
|
174
|
-
const ngx_rbtree_node_t *v_right)
|
175
|
-
{
|
176
|
-
ngx_http_upstream_fair_shm_block_t *left, *right;
|
177
|
-
|
178
|
-
left = (ngx_http_upstream_fair_shm_block_t *) v_left;
|
179
|
-
right = (ngx_http_upstream_fair_shm_block_t *) v_right;
|
180
|
-
|
181
|
-
if (left->generation < right->generation) {
|
182
|
-
return -1;
|
183
|
-
} else if (left->generation > right->generation) {
|
184
|
-
return 1;
|
185
|
-
} else { /* left->generation == right->generation */
|
186
|
-
if (left->peers < right->peers) {
|
187
|
-
return -1;
|
188
|
-
} else if (left->peers > right->peers) {
|
189
|
-
return 1;
|
190
|
-
} else {
|
191
|
-
return 0;
|
192
|
-
}
|
193
|
-
}
|
194
|
-
}
|
195
|
-
|
196
|
-
/*
|
197
|
-
* generic functions start here
|
198
|
-
*/
|
199
|
-
static void
|
200
|
-
ngx_rbtree_generic_insert(ngx_rbtree_node_t *temp,
|
201
|
-
ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel,
|
202
|
-
int (*compare)(const ngx_rbtree_node_t *left, const ngx_rbtree_node_t *right))
|
203
|
-
{
|
204
|
-
for ( ;; ) {
|
205
|
-
if (node->key < temp->key) {
|
206
|
-
|
207
|
-
if (temp->left == sentinel) {
|
208
|
-
temp->left = node;
|
209
|
-
break;
|
210
|
-
}
|
211
|
-
|
212
|
-
temp = temp->left;
|
213
|
-
|
214
|
-
} else if (node->key > temp->key) {
|
215
|
-
|
216
|
-
if (temp->right == sentinel) {
|
217
|
-
temp->right = node;
|
218
|
-
break;
|
219
|
-
}
|
220
|
-
|
221
|
-
temp = temp->right;
|
222
|
-
|
223
|
-
} else { /* node->key == temp->key */
|
224
|
-
if (compare(node, temp) < 0) {
|
225
|
-
|
226
|
-
if (temp->left == sentinel) {
|
227
|
-
temp->left = node;
|
228
|
-
break;
|
229
|
-
}
|
230
|
-
|
231
|
-
temp = temp->left;
|
232
|
-
|
233
|
-
} else {
|
234
|
-
|
235
|
-
if (temp->right == sentinel) {
|
236
|
-
temp->right = node;
|
237
|
-
break;
|
238
|
-
}
|
239
|
-
|
240
|
-
temp = temp->right;
|
241
|
-
}
|
242
|
-
}
|
243
|
-
}
|
244
|
-
|
245
|
-
node->parent = temp;
|
246
|
-
node->left = sentinel;
|
247
|
-
node->right = sentinel;
|
248
|
-
ngx_rbt_red(node);
|
249
|
-
}
|
250
|
-
|
251
|
-
#define NGX_BITVECTOR_ELT_SIZE (sizeof(uintptr_t) * 8)
|
252
|
-
|
253
|
-
static uintptr_t *
|
254
|
-
ngx_bitvector_alloc(ngx_pool_t *pool, ngx_uint_t size, uintptr_t *small)
|
255
|
-
{
|
256
|
-
ngx_uint_t nelts = (size + NGX_BITVECTOR_ELT_SIZE - 1) / NGX_BITVECTOR_ELT_SIZE;
|
257
|
-
|
258
|
-
if (small && nelts == 1) {
|
259
|
-
*small = 0;
|
260
|
-
return small;
|
261
|
-
}
|
262
|
-
|
263
|
-
return ngx_pcalloc(pool, nelts * NGX_BITVECTOR_ELT_SIZE);
|
264
|
-
}
|
265
|
-
|
266
|
-
static ngx_int_t
|
267
|
-
ngx_bitvector_test(uintptr_t *bv, ngx_uint_t bit)
|
268
|
-
{
|
269
|
-
ngx_uint_t n, m;
|
270
|
-
|
271
|
-
n = bit / NGX_BITVECTOR_ELT_SIZE;
|
272
|
-
m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
|
273
|
-
|
274
|
-
return bv[n] & m;
|
275
|
-
}
|
276
|
-
|
277
|
-
static void
|
278
|
-
ngx_bitvector_set(uintptr_t *bv, ngx_uint_t bit)
|
279
|
-
{
|
280
|
-
ngx_uint_t n, m;
|
281
|
-
|
282
|
-
n = bit / NGX_BITVECTOR_ELT_SIZE;
|
283
|
-
m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
|
284
|
-
|
285
|
-
bv[n] |= m;
|
286
|
-
}
|
287
|
-
|
288
|
-
/*
|
289
|
-
* generic functions end here
|
290
|
-
*/
|
291
|
-
|
292
|
-
static ngx_int_t
|
293
|
-
ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle)
|
294
|
-
{
|
295
|
-
ngx_http_upstream_fair_generation++;
|
296
|
-
return NGX_OK;
|
297
|
-
}
|
298
|
-
|
299
|
-
static void
|
300
|
-
ngx_http_upstream_fair_rbtree_insert(ngx_rbtree_node_t *temp,
|
301
|
-
ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
|
302
|
-
|
303
|
-
ngx_rbtree_generic_insert(temp, node, sentinel,
|
304
|
-
ngx_http_upstream_fair_compare_rbtree_node);
|
305
|
-
}
|
306
|
-
|
307
|
-
|
308
|
-
static ngx_int_t
|
309
|
-
ngx_http_upstream_fair_init_shm_zone(ngx_shm_zone_t *shm_zone, void *data)
|
310
|
-
{
|
311
|
-
ngx_slab_pool_t *shpool;
|
312
|
-
ngx_rbtree_t *tree;
|
313
|
-
ngx_rbtree_node_t *sentinel;
|
314
|
-
|
315
|
-
if (data) {
|
316
|
-
shm_zone->data = data;
|
317
|
-
return NGX_OK;
|
318
|
-
}
|
319
|
-
|
320
|
-
shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
|
321
|
-
tree = ngx_slab_alloc(shpool, sizeof *tree);
|
322
|
-
if (tree == NULL) {
|
323
|
-
return NGX_ERROR;
|
324
|
-
}
|
325
|
-
|
326
|
-
sentinel = ngx_slab_alloc(shpool, sizeof *sentinel);
|
327
|
-
if (sentinel == NULL) {
|
328
|
-
return NGX_ERROR;
|
329
|
-
}
|
330
|
-
|
331
|
-
ngx_rbtree_sentinel_init(sentinel);
|
332
|
-
tree->root = sentinel;
|
333
|
-
tree->sentinel = sentinel;
|
334
|
-
tree->insert = ngx_http_upstream_fair_rbtree_insert;
|
335
|
-
shm_zone->data = tree;
|
336
|
-
ngx_http_upstream_fair_rbtree = tree;
|
337
|
-
|
338
|
-
return NGX_OK;
|
339
|
-
}
|
340
|
-
|
341
|
-
|
342
|
-
static char *
|
343
|
-
ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
344
|
-
{
|
345
|
-
ssize_t new_shm_size;
|
346
|
-
ngx_str_t *value;
|
347
|
-
|
348
|
-
value = cf->args->elts;
|
349
|
-
|
350
|
-
new_shm_size = ngx_parse_size(&value[1]);
|
351
|
-
if (new_shm_size == NGX_ERROR) {
|
352
|
-
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid memory area size `%V'", &value[1]);
|
353
|
-
return NGX_CONF_ERROR;
|
354
|
-
}
|
355
|
-
|
356
|
-
new_shm_size = ngx_align(new_shm_size, ngx_pagesize);
|
357
|
-
|
358
|
-
if (new_shm_size < 8 * (ssize_t) ngx_pagesize) {
|
359
|
-
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The upstream_fair_shm_size value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
|
360
|
-
new_shm_size = 8 * ngx_pagesize;
|
361
|
-
}
|
362
|
-
|
363
|
-
if (ngx_http_upstream_fair_shm_size &&
|
364
|
-
ngx_http_upstream_fair_shm_size != (ngx_uint_t) new_shm_size) {
|
365
|
-
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
|
366
|
-
} else {
|
367
|
-
ngx_http_upstream_fair_shm_size = new_shm_size;
|
368
|
-
}
|
369
|
-
ngx_conf_log_error(NGX_LOG_DEBUG, cf, 0, "Using %udKiB of shared memory for upstream_fair", new_shm_size >> 10);
|
370
|
-
|
371
|
-
return NGX_CONF_OK;
|
372
|
-
}
|
373
|
-
|
374
|
-
|
375
|
-
static char *
|
376
|
-
ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
377
|
-
{
|
378
|
-
ngx_http_upstream_srv_conf_t *uscf;
|
379
|
-
ngx_uint_t i;
|
380
|
-
ngx_uint_t extra_peer_flags = 0;
|
381
|
-
|
382
|
-
for (i = 1; i < cf->args->nelts; i++) {
|
383
|
-
ngx_str_t *value = cf->args->elts;
|
384
|
-
if (ngx_strcmp(value[i].data, "no_rr") == 0) {
|
385
|
-
extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_NO_RR;
|
386
|
-
} else if (ngx_strcmp(value[i].data, "weight_mode=peak") == 0) {
|
387
|
-
if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
|
388
|
-
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
|
389
|
-
return NGX_CONF_ERROR;
|
390
|
-
}
|
391
|
-
extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK;
|
392
|
-
} else if (ngx_strcmp(value[i].data, "weight_mode=idle") == 0) {
|
393
|
-
if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
|
394
|
-
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
|
395
|
-
return NGX_CONF_ERROR;
|
396
|
-
}
|
397
|
-
extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE;
|
398
|
-
} else {
|
399
|
-
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid `fair' parameter `%V'", &value[i]);
|
400
|
-
return NGX_CONF_ERROR;
|
401
|
-
}
|
402
|
-
}
|
403
|
-
|
404
|
-
uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
|
405
|
-
|
406
|
-
uscf->peer.init_upstream = ngx_http_upstream_init_fair;
|
407
|
-
|
408
|
-
uscf->flags = NGX_HTTP_UPSTREAM_CREATE
|
409
|
-
|NGX_HTTP_UPSTREAM_WEIGHT
|
410
|
-
|NGX_HTTP_UPSTREAM_MAX_FAILS
|
411
|
-
|NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
|
412
|
-
|NGX_HTTP_UPSTREAM_DOWN
|
413
|
-
|extra_peer_flags;
|
414
|
-
|
415
|
-
return NGX_CONF_OK;
|
416
|
-
}
|
417
|
-
|
418
|
-
|
419
|
-
static ngx_int_t
|
420
|
-
ngx_http_upstream_cmp_servers(const void *one, const void *two)
|
421
|
-
{
|
422
|
-
const ngx_http_upstream_fair_peer_t *first, *second;
|
423
|
-
|
424
|
-
first = one;
|
425
|
-
second = two;
|
426
|
-
|
427
|
-
return (first->weight < second->weight);
|
428
|
-
}
|
429
|
-
|
430
|
-
|
431
|
-
/* TODO: Actually support backup servers */
|
432
|
-
static ngx_int_t
|
433
|
-
ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
|
434
|
-
{
|
435
|
-
ngx_url_t u;
|
436
|
-
ngx_uint_t i, j, n;
|
437
|
-
ngx_http_upstream_server_t *server;
|
438
|
-
ngx_http_upstream_fair_peers_t *peers, *backup;
|
439
|
-
|
440
|
-
if (us->servers) {
|
441
|
-
server = us->servers->elts;
|
442
|
-
|
443
|
-
n = 0;
|
444
|
-
|
445
|
-
for (i = 0; i < us->servers->nelts; i++) {
|
446
|
-
if (server[i].backup) {
|
447
|
-
continue;
|
448
|
-
}
|
449
|
-
|
450
|
-
n += server[i].naddrs;
|
451
|
-
}
|
452
|
-
|
453
|
-
peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
|
454
|
-
+ sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
|
455
|
-
if (peers == NULL) {
|
456
|
-
return NGX_ERROR;
|
457
|
-
}
|
458
|
-
|
459
|
-
peers->number = n;
|
460
|
-
peers->name = &us->host;
|
461
|
-
|
462
|
-
n = 0;
|
463
|
-
|
464
|
-
for (i = 0; i < us->servers->nelts; i++) {
|
465
|
-
for (j = 0; j < server[i].naddrs; j++) {
|
466
|
-
if (server[i].backup) {
|
467
|
-
continue;
|
468
|
-
}
|
469
|
-
|
470
|
-
peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
|
471
|
-
peers->peer[n].socklen = server[i].addrs[j].socklen;
|
472
|
-
peers->peer[n].name = server[i].addrs[j].name;
|
473
|
-
peers->peer[n].max_fails = server[i].max_fails;
|
474
|
-
peers->peer[n].fail_timeout = server[i].fail_timeout;
|
475
|
-
peers->peer[n].down = server[i].down;
|
476
|
-
peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
|
477
|
-
n++;
|
478
|
-
}
|
479
|
-
}
|
480
|
-
|
481
|
-
us->peer.data = peers;
|
482
|
-
|
483
|
-
ngx_sort(&peers->peer[0], (size_t) n,
|
484
|
-
sizeof(ngx_http_upstream_fair_peer_t),
|
485
|
-
ngx_http_upstream_cmp_servers);
|
486
|
-
|
487
|
-
/* backup servers */
|
488
|
-
|
489
|
-
n = 0;
|
490
|
-
|
491
|
-
for (i = 0; i < us->servers->nelts; i++) {
|
492
|
-
if (!server[i].backup) {
|
493
|
-
continue;
|
494
|
-
}
|
495
|
-
|
496
|
-
n += server[i].naddrs;
|
497
|
-
}
|
498
|
-
|
499
|
-
if (n == 0) {
|
500
|
-
return NGX_OK;
|
501
|
-
}
|
502
|
-
|
503
|
-
backup = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
|
504
|
-
+ sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
|
505
|
-
if (backup == NULL) {
|
506
|
-
return NGX_ERROR;
|
507
|
-
}
|
508
|
-
|
509
|
-
backup->number = n;
|
510
|
-
backup->name = &us->host;
|
511
|
-
|
512
|
-
n = 0;
|
513
|
-
|
514
|
-
for (i = 0; i < us->servers->nelts; i++) {
|
515
|
-
for (j = 0; j < server[i].naddrs; j++) {
|
516
|
-
if (!server[i].backup) {
|
517
|
-
continue;
|
518
|
-
}
|
519
|
-
|
520
|
-
backup->peer[n].sockaddr = server[i].addrs[j].sockaddr;
|
521
|
-
backup->peer[n].socklen = server[i].addrs[j].socklen;
|
522
|
-
backup->peer[n].name = server[i].addrs[j].name;
|
523
|
-
backup->peer[n].weight = server[i].weight;
|
524
|
-
backup->peer[n].max_fails = server[i].max_fails;
|
525
|
-
backup->peer[n].fail_timeout = server[i].fail_timeout;
|
526
|
-
backup->peer[n].down = server[i].down;
|
527
|
-
n++;
|
528
|
-
}
|
529
|
-
}
|
530
|
-
|
531
|
-
peers->next = backup;
|
532
|
-
|
533
|
-
ngx_sort(&backup->peer[0], (size_t) n,
|
534
|
-
sizeof(ngx_http_upstream_fair_peer_t),
|
535
|
-
ngx_http_upstream_cmp_servers);
|
536
|
-
|
537
|
-
return NGX_OK;
|
538
|
-
}
|
539
|
-
|
540
|
-
|
541
|
-
/* an upstream implicitly defined by proxy_pass, etc. */
|
542
|
-
|
543
|
-
if (us->port == 0 && us->default_port == 0) {
|
544
|
-
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
545
|
-
"no port in upstream \"%V\" in %s:%ui",
|
546
|
-
&us->host, us->file_name, us->line);
|
547
|
-
return NGX_ERROR;
|
548
|
-
}
|
549
|
-
|
550
|
-
ngx_memzero(&u, sizeof(ngx_url_t));
|
551
|
-
|
552
|
-
u.host = us->host;
|
553
|
-
u.port = (in_port_t) (us->port ? us->port : us->default_port);
|
554
|
-
|
555
|
-
if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
|
556
|
-
if (u.err) {
|
557
|
-
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
|
558
|
-
"%s in upstream \"%V\" in %s:%ui",
|
559
|
-
u.err, &us->host, us->file_name, us->line);
|
560
|
-
}
|
561
|
-
|
562
|
-
return NGX_ERROR;
|
563
|
-
}
|
564
|
-
|
565
|
-
n = u.naddrs;
|
566
|
-
|
567
|
-
peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
|
568
|
-
+ sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
|
569
|
-
if (peers == NULL) {
|
570
|
-
return NGX_ERROR;
|
571
|
-
}
|
572
|
-
|
573
|
-
peers->number = n;
|
574
|
-
peers->name = &us->host;
|
575
|
-
|
576
|
-
for (i = 0; i < u.naddrs; i++) {
|
577
|
-
peers->peer[i].sockaddr = u.addrs[i].sockaddr;
|
578
|
-
peers->peer[i].socklen = u.addrs[i].socklen;
|
579
|
-
peers->peer[i].name = u.addrs[i].name;
|
580
|
-
peers->peer[i].weight = 1;
|
581
|
-
peers->peer[i].max_fails = 1;
|
582
|
-
peers->peer[i].fail_timeout = 10;
|
583
|
-
}
|
584
|
-
|
585
|
-
us->peer.data = peers;
|
586
|
-
|
587
|
-
/* implicitly defined upstream has no backup servers */
|
588
|
-
|
589
|
-
return NGX_OK;
|
590
|
-
}
|
591
|
-
|
592
|
-
static ngx_int_t
|
593
|
-
ngx_http_upstream_init_fair(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
|
594
|
-
{
|
595
|
-
ngx_http_upstream_fair_peers_t *peers;
|
596
|
-
ngx_uint_t n;
|
597
|
-
ngx_str_t *shm_name;
|
598
|
-
|
599
|
-
/* do the dirty work using rr module */
|
600
|
-
if (ngx_http_upstream_init_fair_rr(cf, us) != NGX_OK) {
|
601
|
-
return NGX_ERROR;
|
602
|
-
}
|
603
|
-
|
604
|
-
/* setup our wrapper around rr */
|
605
|
-
peers = ngx_palloc(cf->pool, sizeof *peers);
|
606
|
-
if (peers == NULL) {
|
607
|
-
return NGX_ERROR;
|
608
|
-
}
|
609
|
-
peers = us->peer.data;
|
610
|
-
n = peers->number;
|
611
|
-
|
612
|
-
shm_name = ngx_palloc(cf->pool, sizeof *shm_name);
|
613
|
-
shm_name->len = sizeof("upstream_fair") - 1;
|
614
|
-
shm_name->data = (unsigned char *) "upstream_fair";
|
615
|
-
|
616
|
-
if (ngx_http_upstream_fair_shm_size == 0) {
|
617
|
-
ngx_http_upstream_fair_shm_size = 8 * ngx_pagesize;
|
618
|
-
}
|
619
|
-
|
620
|
-
ngx_http_upstream_fair_shm_zone = ngx_shared_memory_add(
|
621
|
-
cf, shm_name, ngx_http_upstream_fair_shm_size, &ngx_http_upstream_fair_module);
|
622
|
-
if (ngx_http_upstream_fair_shm_zone == NULL) {
|
623
|
-
return NGX_ERROR;
|
624
|
-
}
|
625
|
-
ngx_http_upstream_fair_shm_zone->init = ngx_http_upstream_fair_init_shm_zone;
|
626
|
-
|
627
|
-
peers->shared = NULL;
|
628
|
-
peers->current = n - 1;
|
629
|
-
if (us->flags & NGX_HTTP_UPSTREAM_FAIR_NO_RR) {
|
630
|
-
peers->no_rr = 1;
|
631
|
-
}
|
632
|
-
if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE) {
|
633
|
-
peers->weight_mode = WM_IDLE;
|
634
|
-
} else if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK) {
|
635
|
-
peers->weight_mode = WM_PEAK;
|
636
|
-
}
|
637
|
-
peers->size_err = 0;
|
638
|
-
|
639
|
-
us->peer.init = ngx_http_upstream_init_fair_peer;
|
640
|
-
|
641
|
-
return NGX_OK;
|
642
|
-
}
|
643
|
-
|
644
|
-
|
645
|
-
static void
|
646
|
-
ngx_http_upstream_fair_update_nreq(ngx_http_upstream_fair_peer_data_t *fp, int delta, ngx_log_t *log)
|
647
|
-
{
|
648
|
-
#if (NGX_DEBUG)
|
649
|
-
ngx_uint_t nreq;
|
650
|
-
ngx_uint_t total_nreq;
|
651
|
-
|
652
|
-
nreq = (fp->peers->peer[fp->current].shared->nreq += delta);
|
653
|
-
total_nreq = (fp->peers->shared->total_nreq += delta);
|
654
|
-
|
655
|
-
ngx_log_debug6(NGX_LOG_DEBUG_HTTP, log, 0,
|
656
|
-
"[upstream_fair] nreq for peer %ui @ %p/%p now %d, total %d, delta %d",
|
657
|
-
fp->current, fp->peers, fp->peers->peer[fp->current].shared, nreq,
|
658
|
-
total_nreq, delta);
|
659
|
-
#endif
|
660
|
-
}
|
661
|
-
|
662
|
-
/*
|
663
|
-
* SCHED_COUNTER_BITS is the portion of an ngx_uint_t which represents
|
664
|
-
* the req_delta part (number of requests serviced on _other_
|
665
|
-
* backends). The rest (top bits) represents the number of currently
|
666
|
-
* processed requests.
|
667
|
-
*
|
668
|
-
* The value is not too critical because overflow is handled via
|
669
|
-
* saturation. With the default value of 20, scheduling is exact for
|
670
|
-
* fewer than 4k concurrent requests per backend (on 32-bit
|
671
|
-
* architectures) and fewer than 1M concurrent requests to all backends
|
672
|
-
* together. Beyond these limits, the algorithm essentially falls back
|
673
|
-
* to pure weighted round-robin.
|
674
|
-
*
|
675
|
-
* A higher score means less suitable.
|
676
|
-
*
|
677
|
-
* The `delta' parameter is bit-negated so that high values yield low
|
678
|
-
* scores and get chosen more often.
|
679
|
-
*/
|
680
|
-
|
681
|
-
#define SCHED_COUNTER_BITS 20
|
682
|
-
#define SCHED_NREQ_MAX ((~0UL) >> SCHED_COUNTER_BITS)
|
683
|
-
#define SCHED_COUNTER_MAX ((1 << SCHED_COUNTER_BITS) - 1)
|
684
|
-
#define SCHED_SCORE(nreq,delta) (((nreq) << SCHED_COUNTER_BITS) | (~(delta) & SCHED_COUNTER_MAX))
|
685
|
-
#define ngx_upstream_fair_min(a,b) (((a) < (b)) ? (a) : (b))
|
686
|
-
|
687
|
-
static ngx_uint_t
|
688
|
-
ngx_http_upstream_fair_sched_score(ngx_peer_connection_t *pc,
|
689
|
-
ngx_http_upstream_fair_peer_data_t *fp,
|
690
|
-
ngx_uint_t n)
|
691
|
-
{
|
692
|
-
ngx_http_upstream_fair_peer_t *peer = &fp->peers->peer[n];
|
693
|
-
ngx_http_upstream_fair_shared_t *fs = peer->shared;
|
694
|
-
ngx_uint_t req_delta = fp->peers->shared->total_requests - fs->last_req_id;
|
695
|
-
|
696
|
-
/* sanity check */
|
697
|
-
if ((ngx_int_t)fs->nreq < 0) {
|
698
|
-
ngx_log_error(NGX_LOG_WARN, pc->log, 0, "[upstream_fair] upstream %ui has negative nreq (%i)", n, fs->nreq);
|
699
|
-
return SCHED_SCORE(0, req_delta);
|
700
|
-
}
|
701
|
-
|
702
|
-
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %ui: nreq = %i, req_delta = %ui", n, fs->nreq, req_delta);
|
703
|
-
|
704
|
-
return SCHED_SCORE(
|
705
|
-
ngx_upstream_fair_min(fs->nreq, SCHED_NREQ_MAX),
|
706
|
-
ngx_upstream_fair_min(req_delta, SCHED_COUNTER_MAX));
|
707
|
-
}
|
708
|
-
|
709
|
-
/*
|
710
|
-
* the core of load balancing logic
|
711
|
-
*/
|
712
|
-
|
713
|
-
static ngx_int_t
|
714
|
-
ngx_http_upstream_fair_try_peer(ngx_peer_connection_t *pc,
|
715
|
-
ngx_http_upstream_fair_peer_data_t *fp,
|
716
|
-
ngx_uint_t peer_id)
|
717
|
-
{
|
718
|
-
ngx_http_upstream_fair_peer_t *peer;
|
719
|
-
|
720
|
-
if (ngx_bitvector_test(fp->tried, peer_id))
|
721
|
-
return NGX_BUSY;
|
722
|
-
|
723
|
-
peer = &fp->peers->peer[peer_id];
|
724
|
-
|
725
|
-
if (!peer->down) {
|
726
|
-
if (peer->max_fails == 0 || peer->shared->fails < peer->max_fails) {
|
727
|
-
return NGX_OK;
|
728
|
-
}
|
729
|
-
|
730
|
-
if (ngx_time() - peer->accessed > peer->fail_timeout) {
|
731
|
-
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] resetting fail count for peer %d, time delta %d > %d",
|
732
|
-
peer_id, ngx_time() - peer->accessed, peer->fail_timeout);
|
733
|
-
peer->shared->fails = 0;
|
734
|
-
return NGX_OK;
|
735
|
-
}
|
736
|
-
}
|
737
|
-
|
738
|
-
return NGX_BUSY;
|
739
|
-
}
|
740
|
-
|
741
|
-
static ngx_uint_t
|
742
|
-
ngx_http_upstream_choose_fair_peer_idle(ngx_peer_connection_t *pc,
|
743
|
-
ngx_http_upstream_fair_peer_data_t *fp)
|
744
|
-
{
|
745
|
-
ngx_uint_t i, n;
|
746
|
-
ngx_uint_t npeers = fp->peers->number;
|
747
|
-
ngx_uint_t weight_mode = fp->peers->weight_mode;
|
748
|
-
ngx_uint_t best_idx = NGX_PEER_INVALID;
|
749
|
-
ngx_uint_t best_nreq = ~0U;
|
750
|
-
|
751
|
-
for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
|
752
|
-
ngx_uint_t nreq = fp->peers->peer[n].shared->nreq;
|
753
|
-
ngx_uint_t weight = fp->peers->peer[n].weight;
|
754
|
-
|
755
|
-
if (fp->peers->peer[n].shared->fails > 0)
|
756
|
-
continue;
|
757
|
-
|
758
|
-
if (nreq >= weight || (nreq > 0 && weight_mode != WM_IDLE)) {
|
759
|
-
continue;
|
760
|
-
}
|
761
|
-
|
762
|
-
if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
|
763
|
-
continue;
|
764
|
-
}
|
765
|
-
|
766
|
-
/* not in WM_IDLE+no_rr mode: the first completely idle backend gets chosen */
|
767
|
-
if (weight_mode != WM_IDLE || !fp->peers->no_rr) {
|
768
|
-
best_idx = n;
|
769
|
-
break;
|
770
|
-
}
|
771
|
-
|
772
|
-
/* in WM_IDLE+no_rr mode we actually prefer slightly loaded backends
|
773
|
-
* to totally idle ones, under the assumption that they're spawned
|
774
|
-
* on demand and can handle up to 'weight' concurrent requests
|
775
|
-
*/
|
776
|
-
if (best_idx == NGX_PEER_INVALID || nreq) {
|
777
|
-
if (best_nreq <= nreq) {
|
778
|
-
continue;
|
779
|
-
}
|
780
|
-
best_idx = n;
|
781
|
-
best_nreq = nreq;
|
782
|
-
}
|
783
|
-
}
|
784
|
-
|
785
|
-
return best_idx;
|
786
|
-
}
|
787
|
-
|
788
|
-
static ngx_int_t
|
789
|
-
ngx_http_upstream_choose_fair_peer_busy(ngx_peer_connection_t *pc,
|
790
|
-
ngx_http_upstream_fair_peer_data_t *fp)
|
791
|
-
{
|
792
|
-
ngx_uint_t i, n;
|
793
|
-
ngx_uint_t npeers = fp->peers->number;
|
794
|
-
ngx_uint_t weight_mode = fp->peers->weight_mode;
|
795
|
-
ngx_uint_t best_idx = NGX_PEER_INVALID;
|
796
|
-
ngx_uint_t sched_score;
|
797
|
-
ngx_uint_t best_sched_score = ~0UL;
|
798
|
-
|
799
|
-
/*
|
800
|
-
* calculate sched scores for all the peers, choosing the lowest one
|
801
|
-
*/
|
802
|
-
for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
|
803
|
-
ngx_http_upstream_fair_peer_t *peer;
|
804
|
-
ngx_uint_t nreq;
|
805
|
-
ngx_uint_t weight;
|
806
|
-
|
807
|
-
peer = &fp->peers->peer[n];
|
808
|
-
nreq = fp->peers->peer[n].shared->nreq;
|
809
|
-
|
810
|
-
if (weight_mode == WM_PEAK && nreq >= peer->weight) {
|
811
|
-
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d has nreq %ui >= weight %ui in WM_PEAK mode", n, nreq, peer->weight);
|
812
|
-
continue;
|
813
|
-
}
|
814
|
-
|
815
|
-
if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
|
816
|
-
if (!pc->tries) {
|
817
|
-
ngx_log_debug(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] all backends exhausted");
|
818
|
-
return NGX_PEER_INVALID;
|
819
|
-
}
|
820
|
-
|
821
|
-
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d already tried", n);
|
822
|
-
continue;
|
823
|
-
}
|
824
|
-
|
825
|
-
sched_score = ngx_http_upstream_fair_sched_score(pc, fp, n);
|
826
|
-
|
827
|
-
if (weight_mode == WM_DEFAULT) {
|
828
|
-
/*
|
829
|
-
* take peer weight into account
|
830
|
-
*/
|
831
|
-
weight = peer->shared->current_weight;
|
832
|
-
if (peer->max_fails) {
|
833
|
-
ngx_uint_t mf = peer->max_fails;
|
834
|
-
weight = peer->shared->current_weight * (mf - peer->shared->fails) / mf;
|
835
|
-
}
|
836
|
-
if (weight > 0) {
|
837
|
-
sched_score /= weight;
|
838
|
-
}
|
839
|
-
ngx_log_debug8(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] bss = %ui, ss = %ui (n = %d, w = %d/%d, f = %d/%d, weight = %d)",
|
840
|
-
best_sched_score, sched_score, n, peer->shared->current_weight, peer->weight, peer->shared->fails, peer->max_fails, weight);
|
841
|
-
}
|
842
|
-
|
843
|
-
if (sched_score <= best_sched_score) {
|
844
|
-
best_idx = n;
|
845
|
-
best_sched_score = sched_score;
|
846
|
-
}
|
847
|
-
}
|
848
|
-
|
849
|
-
return best_idx;
|
850
|
-
}
|
851
|
-
|
852
|
-
static ngx_int_t
|
853
|
-
ngx_http_upstream_choose_fair_peer(ngx_peer_connection_t *pc,
|
854
|
-
ngx_http_upstream_fair_peer_data_t *fp, ngx_uint_t *peer_id)
|
855
|
-
{
|
856
|
-
ngx_uint_t npeers;
|
857
|
-
ngx_uint_t best_idx = NGX_PEER_INVALID;
|
858
|
-
ngx_uint_t weight_mode;
|
859
|
-
|
860
|
-
npeers = fp->peers->number;
|
861
|
-
weight_mode = fp->peers->weight_mode;
|
862
|
-
|
863
|
-
/* just a single backend */
|
864
|
-
if (npeers == 1) {
|
865
|
-
*peer_id = 0;
|
866
|
-
return NGX_OK;
|
867
|
-
}
|
868
|
-
|
869
|
-
/* any idle backends? */
|
870
|
-
best_idx = ngx_http_upstream_choose_fair_peer_idle(pc, fp);
|
871
|
-
if (best_idx != NGX_PEER_INVALID) {
|
872
|
-
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %i is idle", best_idx);
|
873
|
-
goto chosen;
|
874
|
-
}
|
875
|
-
|
876
|
-
/* no idle backends, choose the least loaded one */
|
877
|
-
best_idx = ngx_http_upstream_choose_fair_peer_busy(pc, fp);
|
878
|
-
if (best_idx != NGX_PEER_INVALID) {
|
879
|
-
goto chosen;
|
880
|
-
}
|
881
|
-
|
882
|
-
return NGX_BUSY;
|
883
|
-
|
884
|
-
chosen:
|
885
|
-
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] chose peer %i", best_idx);
|
886
|
-
*peer_id = best_idx;
|
887
|
-
ngx_bitvector_set(fp->tried, best_idx);
|
888
|
-
|
889
|
-
if (weight_mode == WM_DEFAULT) {
|
890
|
-
ngx_http_upstream_fair_peer_t *peer = &fp->peers->peer[best_idx];
|
891
|
-
|
892
|
-
if (peer->shared->current_weight-- == 0) {
|
893
|
-
peer->shared->current_weight = peer->weight;
|
894
|
-
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %d expired weight, reset to %d", best_idx, peer->weight);
|
895
|
-
}
|
896
|
-
}
|
897
|
-
return NGX_OK;
|
898
|
-
}
|
899
|
-
|
900
|
-
ngx_int_t
|
901
|
-
ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc, void *data)
|
902
|
-
{
|
903
|
-
ngx_int_t ret;
|
904
|
-
ngx_uint_t peer_id, i;
|
905
|
-
ngx_http_upstream_fair_peer_data_t *fp = data;
|
906
|
-
ngx_http_upstream_fair_peer_t *peer;
|
907
|
-
ngx_atomic_t *lock;
|
908
|
-
|
909
|
-
peer_id = fp->current;
|
910
|
-
fp->current = (fp->current + 1) % fp->peers->number;
|
911
|
-
|
912
|
-
lock = &fp->peers->shared->lock;
|
913
|
-
ngx_spinlock(lock, ngx_pid, 1024);
|
914
|
-
ret = ngx_http_upstream_choose_fair_peer(pc, fp, &peer_id);
|
915
|
-
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, peer_id = %d, ret = %d",
|
916
|
-
fp->current, peer_id, ret);
|
917
|
-
|
918
|
-
if (pc)
|
919
|
-
pc->tries--;
|
920
|
-
|
921
|
-
if (ret == NGX_BUSY) {
|
922
|
-
for (i = 0; i < fp->peers->number; i++) {
|
923
|
-
fp->peers->peer[i].shared->fails = 0;
|
924
|
-
}
|
925
|
-
|
926
|
-
pc->name = fp->peers->name;
|
927
|
-
fp->current = NGX_PEER_INVALID;
|
928
|
-
ngx_spinlock_unlock(lock);
|
929
|
-
return NGX_BUSY;
|
930
|
-
}
|
931
|
-
|
932
|
-
/* assert(ret == NGX_OK); */
|
933
|
-
peer = &fp->peers->peer[peer_id];
|
934
|
-
fp->current = peer_id;
|
935
|
-
if (!fp->peers->no_rr) {
|
936
|
-
fp->peers->current = peer_id;
|
937
|
-
}
|
938
|
-
pc->sockaddr = peer->sockaddr;
|
939
|
-
pc->socklen = peer->socklen;
|
940
|
-
pc->name = &peer->name;
|
941
|
-
|
942
|
-
peer->shared->last_req_id = fp->peers->shared->total_requests;
|
943
|
-
ngx_http_upstream_fair_update_nreq(fp, 1, pc->log);
|
944
|
-
peer->shared->total_req++;
|
945
|
-
ngx_spinlock_unlock(lock);
|
946
|
-
return ret;
|
947
|
-
}
|
948
|
-
|
949
|
-
|
950
|
-
void
|
951
|
-
ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc, void *data,
|
952
|
-
ngx_uint_t state)
|
953
|
-
{
|
954
|
-
ngx_http_upstream_fair_peer_data_t *fp = data;
|
955
|
-
ngx_http_upstream_fair_peer_t *peer;
|
956
|
-
ngx_atomic_t *lock;
|
957
|
-
|
958
|
-
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, state = %ui, pc->tries = %d, pc->data = %p",
|
959
|
-
fp->current, state, pc->tries, pc->data);
|
960
|
-
|
961
|
-
if (fp->current == NGX_PEER_INVALID) {
|
962
|
-
return;
|
963
|
-
}
|
964
|
-
|
965
|
-
lock = &fp->peers->shared->lock;
|
966
|
-
ngx_spinlock(lock, ngx_pid, 1024);
|
967
|
-
if (!ngx_bitvector_test(fp->done, fp->current)) {
|
968
|
-
ngx_bitvector_set(fp->done, fp->current);
|
969
|
-
ngx_http_upstream_fair_update_nreq(fp, -1, pc->log);
|
970
|
-
}
|
971
|
-
|
972
|
-
if (fp->peers->number == 1) {
|
973
|
-
pc->tries = 0;
|
974
|
-
}
|
975
|
-
|
976
|
-
if (state & NGX_PEER_FAILED) {
|
977
|
-
peer = &fp->peers->peer[fp->current];
|
978
|
-
|
979
|
-
peer->shared->fails++;
|
980
|
-
peer->accessed = ngx_time();
|
981
|
-
}
|
982
|
-
ngx_spinlock_unlock(lock);
|
983
|
-
}
|
984
|
-
|
985
|
-
/*
|
986
|
-
* walk through the rbtree, removing old entries and looking for
|
987
|
-
* a matching one -- compared by (cycle, peers) pair
|
988
|
-
*
|
989
|
-
* no attempt at optimisation is made, for two reasons:
|
990
|
-
* - the tree will be quite small, anyway
|
991
|
-
* - being called once per worker startup per upstream block,
|
992
|
-
* this code isn't really the hot path
|
993
|
-
*/
|
994
|
-
static ngx_http_upstream_fair_shm_block_t *
|
995
|
-
ngx_http_upstream_fair_walk_shm(
|
996
|
-
ngx_slab_pool_t *shpool,
|
997
|
-
ngx_rbtree_node_t *node,
|
998
|
-
ngx_rbtree_node_t *sentinel,
|
999
|
-
ngx_http_upstream_fair_peers_t *peers)
|
1000
|
-
{
|
1001
|
-
ngx_http_upstream_fair_shm_block_t *uf_node;
|
1002
|
-
ngx_http_upstream_fair_shm_block_t *found_node = NULL;
|
1003
|
-
ngx_http_upstream_fair_shm_block_t *tmp_node;
|
1004
|
-
|
1005
|
-
if (node == sentinel) {
|
1006
|
-
return NULL;
|
1007
|
-
}
|
1008
|
-
|
1009
|
-
/* visit left node */
|
1010
|
-
if (node->left != sentinel) {
|
1011
|
-
tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->left,
|
1012
|
-
sentinel, peers);
|
1013
|
-
if (tmp_node) {
|
1014
|
-
found_node = tmp_node;
|
1015
|
-
}
|
1016
|
-
}
|
1017
|
-
|
1018
|
-
/* visit right node */
|
1019
|
-
if (node->right != sentinel) {
|
1020
|
-
tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->right,
|
1021
|
-
sentinel, peers);
|
1022
|
-
if (tmp_node) {
|
1023
|
-
found_node = tmp_node;
|
1024
|
-
}
|
1025
|
-
}
|
1026
|
-
|
1027
|
-
/* visit current node */
|
1028
|
-
uf_node = (ngx_http_upstream_fair_shm_block_t *) node;
|
1029
|
-
if (uf_node->generation != ngx_http_upstream_fair_generation) {
|
1030
|
-
ngx_spinlock(&uf_node->lock, ngx_pid, 1024);
|
1031
|
-
if (uf_node->total_nreq == 0) {
|
1032
|
-
/* don't bother unlocking */
|
1033
|
-
ngx_rbtree_delete(ngx_http_upstream_fair_rbtree, node);
|
1034
|
-
ngx_slab_free_locked(shpool, node);
|
1035
|
-
}
|
1036
|
-
ngx_spinlock_unlock(&uf_node->lock);
|
1037
|
-
} else if (uf_node->peers == (uintptr_t) peers) {
|
1038
|
-
found_node = uf_node;
|
1039
|
-
}
|
1040
|
-
|
1041
|
-
return found_node;
|
1042
|
-
}
|
1043
|
-
|
1044
|
-
static ngx_int_t
|
1045
|
-
ngx_http_upstream_fair_shm_alloc(ngx_http_upstream_fair_peers_t *usfp, ngx_log_t *log)
|
1046
|
-
{
|
1047
|
-
ngx_slab_pool_t *shpool;
|
1048
|
-
ngx_uint_t i;
|
1049
|
-
|
1050
|
-
if (usfp->shared) {
|
1051
|
-
return NGX_OK;
|
1052
|
-
}
|
1053
|
-
|
1054
|
-
shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
|
1055
|
-
|
1056
|
-
ngx_shmtx_lock(&shpool->mutex);
|
1057
|
-
|
1058
|
-
usfp->shared = ngx_http_upstream_fair_walk_shm(shpool,
|
1059
|
-
ngx_http_upstream_fair_rbtree->root,
|
1060
|
-
ngx_http_upstream_fair_rbtree->sentinel,
|
1061
|
-
usfp);
|
1062
|
-
|
1063
|
-
if (usfp->shared) {
|
1064
|
-
ngx_shmtx_unlock(&shpool->mutex);
|
1065
|
-
return NGX_OK;
|
1066
|
-
}
|
1067
|
-
|
1068
|
-
usfp->shared = ngx_slab_alloc_locked(shpool,
|
1069
|
-
sizeof(ngx_http_upstream_fair_shm_block_t) +
|
1070
|
-
(usfp->number - 1) * sizeof(ngx_http_upstream_fair_shared_t));
|
1071
|
-
|
1072
|
-
if (!usfp->shared) {
|
1073
|
-
ngx_shmtx_unlock(&shpool->mutex);
|
1074
|
-
if (!usfp->size_err) {
|
1075
|
-
ngx_log_error(NGX_LOG_EMERG, log, 0,
|
1076
|
-
"upstream_fair_shm_size too small (current value is %udKiB)",
|
1077
|
-
ngx_http_upstream_fair_shm_size >> 10);
|
1078
|
-
usfp->size_err = 1;
|
1079
|
-
}
|
1080
|
-
return NGX_ERROR;
|
1081
|
-
}
|
1082
|
-
|
1083
|
-
usfp->shared->node.key = ngx_crc32_short((u_char *) &ngx_cycle, sizeof ngx_cycle) ^
|
1084
|
-
ngx_crc32_short((u_char *) &usfp, sizeof(usfp));
|
1085
|
-
|
1086
|
-
usfp->shared->generation = ngx_http_upstream_fair_generation;
|
1087
|
-
usfp->shared->peers = (uintptr_t) usfp;
|
1088
|
-
usfp->shared->total_nreq = 0;
|
1089
|
-
usfp->shared->total_requests = 0;
|
1090
|
-
|
1091
|
-
for (i = 0; i < usfp->number; i++) {
|
1092
|
-
usfp->shared->stats[i].nreq = 0;
|
1093
|
-
usfp->shared->stats[i].last_req_id = 0;
|
1094
|
-
usfp->shared->stats[i].total_req = 0;
|
1095
|
-
}
|
1096
|
-
|
1097
|
-
ngx_rbtree_insert(ngx_http_upstream_fair_rbtree, &usfp->shared->node);
|
1098
|
-
|
1099
|
-
ngx_shmtx_unlock(&shpool->mutex);
|
1100
|
-
return NGX_OK;
|
1101
|
-
}
|
1102
|
-
|
1103
|
-
ngx_int_t
|
1104
|
-
ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
|
1105
|
-
ngx_http_upstream_srv_conf_t *us)
|
1106
|
-
{
|
1107
|
-
ngx_http_upstream_fair_peer_data_t *fp;
|
1108
|
-
ngx_http_upstream_fair_peers_t *usfp;
|
1109
|
-
ngx_uint_t n;
|
1110
|
-
|
1111
|
-
fp = r->upstream->peer.data;
|
1112
|
-
|
1113
|
-
if (fp == NULL) {
|
1114
|
-
fp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_fair_peer_data_t));
|
1115
|
-
if (fp == NULL) {
|
1116
|
-
return NGX_ERROR;
|
1117
|
-
}
|
1118
|
-
|
1119
|
-
r->upstream->peer.data = fp;
|
1120
|
-
}
|
1121
|
-
|
1122
|
-
usfp = us->peer.data;
|
1123
|
-
|
1124
|
-
fp->tried = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data);
|
1125
|
-
fp->done = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data2);
|
1126
|
-
|
1127
|
-
if (fp->tried == NULL || fp->done == NULL) {
|
1128
|
-
return NGX_ERROR;
|
1129
|
-
}
|
1130
|
-
|
1131
|
-
/* set up shared memory area */
|
1132
|
-
ngx_http_upstream_fair_shm_alloc(usfp, r->connection->log);
|
1133
|
-
|
1134
|
-
fp->current = usfp->current;
|
1135
|
-
fp->peers = usfp;
|
1136
|
-
usfp->shared->total_requests++;
|
1137
|
-
|
1138
|
-
for (n = 0; n < usfp->number; n++) {
|
1139
|
-
usfp->peer[n].shared = &usfp->shared->stats[n];
|
1140
|
-
}
|
1141
|
-
|
1142
|
-
r->upstream->peer.get = ngx_http_upstream_get_fair_peer;
|
1143
|
-
r->upstream->peer.free = ngx_http_upstream_free_fair_peer;
|
1144
|
-
r->upstream->peer.tries = usfp->number;
|
1145
|
-
#if (NGX_HTTP_SSL)
|
1146
|
-
r->upstream->peer.set_session =
|
1147
|
-
ngx_http_upstream_fair_set_session;
|
1148
|
-
r->upstream->peer.save_session =
|
1149
|
-
ngx_http_upstream_fair_save_session;
|
1150
|
-
#endif
|
1151
|
-
|
1152
|
-
return NGX_OK;
|
1153
|
-
}
|
1154
|
-
|
1155
|
-
#if (NGX_HTTP_SSL)
|
1156
|
-
static ngx_int_t
|
1157
|
-
ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
|
1158
|
-
{
|
1159
|
-
ngx_http_upstream_fair_peer_data_t *fp = data;
|
1160
|
-
|
1161
|
-
ngx_int_t rc;
|
1162
|
-
ngx_ssl_session_t *ssl_session;
|
1163
|
-
ngx_http_upstream_fair_peer_t *peer;
|
1164
|
-
|
1165
|
-
if (fp->current == NGX_PEER_INVALID)
|
1166
|
-
return NGX_OK;
|
1167
|
-
|
1168
|
-
peer = &fp->peers->peer[fp->current];
|
1169
|
-
|
1170
|
-
/* TODO: threads only mutex */
|
1171
|
-
/* ngx_lock_mutex(fp->peers->mutex); */
|
1172
|
-
|
1173
|
-
ssl_session = peer->ssl_session;
|
1174
|
-
|
1175
|
-
rc = ngx_ssl_set_session(pc->connection, ssl_session);
|
1176
|
-
|
1177
|
-
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
1178
|
-
"set session: %p:%d",
|
1179
|
-
ssl_session, ssl_session ? ssl_session->references : 0);
|
1180
|
-
|
1181
|
-
/* ngx_unlock_mutex(fp->peers->mutex); */
|
1182
|
-
|
1183
|
-
return rc;
|
1184
|
-
}
|
1185
|
-
|
1186
|
-
static void
|
1187
|
-
ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
|
1188
|
-
{
|
1189
|
-
ngx_http_upstream_fair_peer_data_t *fp = data;
|
1190
|
-
|
1191
|
-
ngx_ssl_session_t *old_ssl_session, *ssl_session;
|
1192
|
-
ngx_http_upstream_fair_peer_t *peer;
|
1193
|
-
|
1194
|
-
if (fp->current == NGX_PEER_INVALID)
|
1195
|
-
return;
|
1196
|
-
|
1197
|
-
ssl_session = ngx_ssl_get_session(pc->connection);
|
1198
|
-
|
1199
|
-
if (ssl_session == NULL) {
|
1200
|
-
return;
|
1201
|
-
}
|
1202
|
-
|
1203
|
-
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
1204
|
-
"save session: %p:%d", ssl_session, ssl_session->references);
|
1205
|
-
|
1206
|
-
peer = &fp->peers->peer[fp->current];
|
1207
|
-
|
1208
|
-
/* TODO: threads only mutex */
|
1209
|
-
/* ngx_lock_mutex(fp->peers->mutex); */
|
1210
|
-
|
1211
|
-
old_ssl_session = peer->ssl_session;
|
1212
|
-
peer->ssl_session = ssl_session;
|
1213
|
-
|
1214
|
-
/* ngx_unlock_mutex(fp->peers->mutex); */
|
1215
|
-
|
1216
|
-
if (old_ssl_session) {
|
1217
|
-
|
1218
|
-
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
1219
|
-
"old session: %p:%d",
|
1220
|
-
old_ssl_session, old_ssl_session->references);
|
1221
|
-
|
1222
|
-
/* TODO: may block */
|
1223
|
-
|
1224
|
-
ngx_ssl_free_session(old_ssl_session);
|
1225
|
-
}
|
1226
|
-
}
|
1227
|
-
|
1228
|
-
#endif
|
1229
|
-
|
1230
|
-
#if (NGX_HTTP_EXTENDED_STATUS)
|
1231
|
-
static void
|
1232
|
-
ngx_http_upstream_fair_walk_status(ngx_pool_t *pool, ngx_chain_t *cl, ngx_int_t *length,
|
1233
|
-
ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
|
1234
|
-
{
|
1235
|
-
ngx_http_upstream_fair_shm_block_t *s_node = (ngx_http_upstream_fair_shm_block_t *) node;
|
1236
|
-
ngx_http_upstream_fair_peers_t *peers;
|
1237
|
-
ngx_chain_t *new_cl;
|
1238
|
-
ngx_buf_t *b;
|
1239
|
-
ngx_uint_t size, i;
|
1240
|
-
|
1241
|
-
if (node == sentinel) {
|
1242
|
-
return;
|
1243
|
-
}
|
1244
|
-
|
1245
|
-
if (node->left != sentinel) {
|
1246
|
-
ngx_http_upstream_fair_walk_status(pool, cl, length, node->left, sentinel);
|
1247
|
-
}
|
1248
|
-
|
1249
|
-
if (s_node->generation != ngx_http_upstream_fair_generation) {
|
1250
|
-
size = 100;
|
1251
|
-
peers = NULL;
|
1252
|
-
} else {
|
1253
|
-
/* this is rather ugly (casting an uintptr_t back into a pointer
|
1254
|
-
* but as long as the generation is still the same (verified above),
|
1255
|
-
* it should be still safe
|
1256
|
-
*/
|
1257
|
-
peers = (ngx_http_upstream_fair_peers_t *) s_node->peers;
|
1258
|
-
if (!peers->shared) {
|
1259
|
-
goto next;
|
1260
|
-
}
|
1261
|
-
|
1262
|
-
size = 200 + peers->number * 120; /* LOTS of slack */
|
1263
|
-
}
|
1264
|
-
|
1265
|
-
b = ngx_create_temp_buf(pool, size);
|
1266
|
-
if (!b) {
|
1267
|
-
goto next;
|
1268
|
-
}
|
1269
|
-
|
1270
|
-
new_cl = ngx_alloc_chain_link(pool);
|
1271
|
-
if (!new_cl) {
|
1272
|
-
goto next;
|
1273
|
-
}
|
1274
|
-
|
1275
|
-
new_cl->buf = b;
|
1276
|
-
new_cl->next = NULL;
|
1277
|
-
|
1278
|
-
while (cl->next) {
|
1279
|
-
cl = cl->next;
|
1280
|
-
}
|
1281
|
-
cl->next = new_cl;
|
1282
|
-
|
1283
|
-
if (peers) {
|
1284
|
-
b->last = ngx_sprintf(b->last, "upstream %V (%p): current peer %d/%d, total requests: %ui\n", peers->name, (void*) node, peers->current, peers->number, s_node->total_requests);
|
1285
|
-
for (i = 0; i < peers->number; i++) {
|
1286
|
-
ngx_http_upstream_fair_peer_t *peer = &peers->peer[i];
|
1287
|
-
ngx_http_upstream_fair_shared_t *sh = peer->shared;
|
1288
|
-
b->last = ngx_sprintf(b->last, " peer %d: %V weight: %d/%d, fails: %d/%d, acc: %d, down: %d, nreq: %d, total_req: %ui, last_req: %ui\n",
|
1289
|
-
i, &peer->name, sh->current_weight, peer->weight, sh->fails, peer->max_fails, peer->accessed, peer->down,
|
1290
|
-
sh->nreq, sh->total_req, sh->last_req_id);
|
1291
|
-
}
|
1292
|
-
} else {
|
1293
|
-
b->last = ngx_sprintf(b->last, "upstream %p: gen %ui != %ui, total_nreq = %ui", (void*) node, s_node->generation, ngx_http_upstream_fair_generation, s_node->total_nreq);
|
1294
|
-
}
|
1295
|
-
b->last = ngx_sprintf(b->last, "\n");
|
1296
|
-
b->last_buf = 1;
|
1297
|
-
|
1298
|
-
*length += b->last - b->pos;
|
1299
|
-
|
1300
|
-
if (cl->buf) {
|
1301
|
-
cl->buf->last_buf = 0;
|
1302
|
-
}
|
1303
|
-
|
1304
|
-
cl = cl->next;
|
1305
|
-
next:
|
1306
|
-
|
1307
|
-
if (node->right != sentinel) {
|
1308
|
-
ngx_http_upstream_fair_walk_status(pool, cl, length, node->right, sentinel);
|
1309
|
-
}
|
1310
|
-
}
|
1311
|
-
|
1312
|
-
static ngx_chain_t*
|
1313
|
-
ngx_http_upstream_fair_report_status(ngx_http_request_t *r, ngx_int_t *length)
|
1314
|
-
{
|
1315
|
-
ngx_buf_t *b;
|
1316
|
-
ngx_chain_t *cl;
|
1317
|
-
ngx_slab_pool_t *shpool;
|
1318
|
-
|
1319
|
-
b = ngx_create_temp_buf(r->pool, sizeof("\nupstream_fair status report:\n"));
|
1320
|
-
if (!b) {
|
1321
|
-
return NULL;
|
1322
|
-
}
|
1323
|
-
|
1324
|
-
cl = ngx_alloc_chain_link(r->pool);
|
1325
|
-
if (!cl) {
|
1326
|
-
return NULL;
|
1327
|
-
}
|
1328
|
-
cl->next = NULL;
|
1329
|
-
cl->buf = b;
|
1330
|
-
|
1331
|
-
b->last = ngx_cpymem(b->last, "\nupstream_fair status report:\n",
|
1332
|
-
sizeof("\nupstream_fair status report:\n") - 1);
|
1333
|
-
|
1334
|
-
*length = b->last - b->pos;
|
1335
|
-
|
1336
|
-
shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
|
1337
|
-
|
1338
|
-
ngx_shmtx_lock(&shpool->mutex);
|
1339
|
-
|
1340
|
-
ngx_http_upstream_fair_walk_status(r->pool, cl,
|
1341
|
-
length,
|
1342
|
-
ngx_http_upstream_fair_rbtree->root,
|
1343
|
-
ngx_http_upstream_fair_rbtree->sentinel);
|
1344
|
-
|
1345
|
-
ngx_shmtx_unlock(&shpool->mutex);
|
1346
|
-
|
1347
|
-
if (!cl->next || !cl->next->buf) {
|
1348
|
-
/* no upstream_fair status to report */
|
1349
|
-
return NULL;
|
1350
|
-
}
|
1351
|
-
|
1352
|
-
return cl;
|
1353
|
-
}
|
1354
|
-
#endif
|
1355
|
-
|
1356
|
-
/* vim: set et ts=4 sw=4: */
|