passenger 4.0.20 → 4.0.21

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.

Files changed (496) hide show
  1. checksums.yaml +8 -8
  2. checksums.yaml.gz.asc +7 -7
  3. data.tar.gz.asc +7 -7
  4. data/.gitignore +1 -0
  5. data/.travis.yml +1 -1
  6. data/NEWS +15 -0
  7. data/README.md +5 -3
  8. data/Rakefile +1 -0
  9. data/bin/passenger-config +1 -5
  10. data/bin/passenger-install-apache2-module +53 -5
  11. data/bin/passenger-install-nginx-module +19 -6
  12. data/bin/passenger-memory-stats +3 -3
  13. data/build/agents.rb +11 -8
  14. data/build/apache2.rb +9 -5
  15. data/build/basics.rb +15 -21
  16. data/build/common_library.rb +16 -6
  17. data/build/cplusplus_support.rb +5 -5
  18. data/build/cxx_tests.rb +3 -3
  19. data/build/documentation.rb +1 -1
  20. data/build/misc.rb +4 -37
  21. data/build/node_tests.rb +29 -0
  22. data/build/oxt_tests.rb +1 -1
  23. data/build/packaging.rb +29 -10
  24. data/build/preprocessor.rb +2 -1
  25. data/build/test_basics.rb +15 -6
  26. data/debian.template/locations.ini.template +1 -0
  27. data/debian.template/passenger.install.template +1 -0
  28. data/dev/copy_boost_headers.rb +7 -3
  29. data/dev/run_travis.sh +32 -16
  30. data/doc/Users guide Apache.idmap.txt +22 -34
  31. data/doc/Users guide Apache.txt +20 -234
  32. data/doc/Users guide Nginx.idmap.txt +84 -66
  33. data/doc/Users guide Nginx.txt +50 -1
  34. data/doc/Users guide Standalone.idmap.txt +74 -0
  35. data/doc/Users guide Standalone.txt +22 -9
  36. data/doc/Users guide.txt +51 -0
  37. data/doc/users_guide_snippets/environment_variables.txt +0 -3
  38. data/doc/users_guide_snippets/installation.txt +337 -380
  39. data/doc/users_guide_snippets/installation/run_installer.txt +58 -0
  40. data/doc/users_guide_snippets/installation/verify_running_epilogue.txt +6 -0
  41. data/doc/users_guide_snippets/support_information.txt +2 -9
  42. data/doc/users_guide_snippets/troubleshooting/default.txt +112 -0
  43. data/doc/users_guide_snippets/troubleshooting/rails.txt +56 -0
  44. data/doc/users_guide_snippets/where_to_get_support.txt +9 -0
  45. data/ext/apache2/Bucket.h +1 -1
  46. data/ext/apache2/Configuration.hpp +0 -44
  47. data/ext/apache2/CreateDirConfig.cpp +1 -1
  48. data/ext/apache2/CreateDirConfig.cpp.erb +1 -1
  49. data/ext/apache2/Hooks.cpp +28 -21
  50. data/ext/apache2/MergeDirConfig.cpp +1 -0
  51. data/ext/apache2/MergeDirConfig.cpp.erb +1 -1
  52. data/ext/apache2/SetHeaders.cpp +73 -0
  53. data/ext/apache2/SetHeaders.cpp.erb +88 -0
  54. data/ext/boost/algorithm/string/detail/find_format.hpp +5 -5
  55. data/ext/boost/algorithm/string/detail/find_format_all.hpp +5 -5
  56. data/ext/boost/algorithm/string/detail/finder.hpp +1 -1
  57. data/ext/boost/algorithm/string/formatter.hpp +2 -2
  58. data/ext/boost/assert.hpp +6 -1
  59. data/ext/boost/atomic.hpp +18 -0
  60. data/ext/boost/atomic/atomic.hpp +241 -0
  61. data/ext/boost/atomic/detail/base.hpp +585 -0
  62. data/ext/boost/atomic/detail/cas32strong.hpp +885 -0
  63. data/ext/boost/atomic/detail/cas32weak.hpp +947 -0
  64. data/ext/boost/atomic/detail/cas64strong.hpp +443 -0
  65. data/ext/boost/atomic/detail/config.hpp +54 -0
  66. data/ext/boost/atomic/detail/gcc-alpha.hpp +368 -0
  67. data/ext/boost/atomic/detail/gcc-armv6plus.hpp +252 -0
  68. data/ext/boost/atomic/detail/gcc-cas.hpp +157 -0
  69. data/ext/boost/atomic/detail/gcc-ppc.hpp +2850 -0
  70. data/ext/boost/atomic/detail/gcc-sparcv9.hpp +1259 -0
  71. data/ext/boost/atomic/detail/gcc-x86.hpp +1766 -0
  72. data/ext/boost/atomic/detail/generic-cas.hpp +206 -0
  73. data/ext/boost/atomic/detail/interlocked.hpp +200 -0
  74. data/ext/boost/atomic/detail/linux-arm.hpp +189 -0
  75. data/ext/boost/atomic/detail/lockpool.hpp +97 -0
  76. data/ext/boost/atomic/detail/platform.hpp +62 -0
  77. data/ext/boost/atomic/detail/type-classification.hpp +45 -0
  78. data/ext/boost/chrono/config.hpp +8 -3
  79. data/ext/boost/chrono/duration.hpp +9 -10
  80. data/ext/boost/chrono/system_clocks.hpp +1 -1
  81. data/ext/boost/chrono/time_point.hpp +4 -3
  82. data/ext/boost/config/auto_link.hpp +53 -52
  83. data/ext/boost/config/compiler/borland.hpp +1 -0
  84. data/ext/boost/config/compiler/clang.hpp +24 -1
  85. data/ext/boost/config/compiler/codegear.hpp +1 -0
  86. data/ext/boost/config/compiler/common_edg.hpp +1 -0
  87. data/ext/boost/config/compiler/cray.hpp +1 -0
  88. data/ext/boost/config/compiler/digitalmars.hpp +1 -0
  89. data/ext/boost/config/compiler/gcc.hpp +29 -3
  90. data/ext/boost/config/compiler/gcc_xml.hpp +2 -1
  91. data/ext/boost/config/compiler/hp_acc.hpp +1 -0
  92. data/ext/boost/config/compiler/intel.hpp +1 -1
  93. data/ext/boost/config/compiler/metrowerks.hpp +1 -0
  94. data/ext/boost/config/compiler/mpw.hpp +1 -0
  95. data/ext/boost/config/compiler/pathscale.hpp +1 -0
  96. data/ext/boost/config/compiler/pgi.hpp +1 -0
  97. data/ext/boost/config/compiler/sunpro_cc.hpp +1 -0
  98. data/ext/boost/config/compiler/vacpp.hpp +3 -2
  99. data/ext/boost/config/compiler/visualc.hpp +25 -11
  100. data/ext/boost/config/platform/vxworks.hpp +353 -15
  101. data/ext/boost/config/select_compiler_config.hpp +4 -4
  102. data/ext/boost/config/stdlib/dinkumware.hpp +10 -3
  103. data/ext/boost/config/stdlib/libstdcpp3.hpp +2 -1
  104. data/ext/boost/config/suffix.hpp +45 -19
  105. data/ext/boost/date_time/format_date_parser.hpp +1 -11
  106. data/ext/boost/date_time/strings_from_facet.hpp +5 -3
  107. data/ext/boost/detail/atomic_redef_macros.hpp +19 -0
  108. data/ext/boost/detail/atomic_undef_macros.hpp +39 -0
  109. data/ext/boost/detail/endian.hpp +52 -4
  110. data/ext/boost/detail/scoped_enum_emulation.hpp +10 -10
  111. data/ext/boost/detail/select_type.hpp +36 -0
  112. data/ext/boost/exception/current_exception_cast.hpp +1 -1
  113. data/ext/boost/exception/detail/error_info_impl.hpp +3 -5
  114. data/ext/boost/exception/detail/exception_ptr.hpp +3 -3
  115. data/ext/boost/exception/detail/is_output_streamable.hpp +1 -1
  116. data/ext/boost/exception/detail/object_hex_dump.hpp +1 -1
  117. data/ext/boost/exception/detail/type_info.hpp +1 -1
  118. data/ext/boost/exception/diagnostic_information.hpp +15 -14
  119. data/ext/boost/exception/exception.hpp +1 -1
  120. data/ext/boost/exception/get_error_info.hpp +1 -1
  121. data/ext/boost/exception/info.hpp +12 -13
  122. data/ext/boost/exception/to_string.hpp +6 -1
  123. data/ext/boost/exception/to_string_stub.hpp +9 -1
  124. data/ext/boost/foreach.hpp +5 -5
  125. data/ext/boost/function/function_template.hpp +6 -6
  126. data/ext/boost/functional/hash/detail/float_functions.hpp +90 -0
  127. data/ext/boost/functional/hash/detail/hash_float.hpp +11 -2
  128. data/ext/boost/functional/hash/extensions.hpp +14 -2
  129. data/ext/boost/functional/hash/hash.hpp +26 -5
  130. data/ext/boost/get_pointer.hpp +17 -2
  131. data/ext/boost/integer_traits.hpp +1 -1
  132. data/ext/boost/lexical_cast.hpp +615 -395
  133. data/ext/boost/libs/atomic/lockpool.cpp +24 -0
  134. data/ext/boost/libs/system/src/error_code.cpp +25 -18
  135. data/ext/boost/libs/thread/src/future.cpp +7 -5
  136. data/ext/boost/libs/thread/src/pthread/once.cpp +9 -3
  137. data/ext/boost/libs/thread/src/pthread/once_atomic.cpp +90 -0
  138. data/ext/boost/libs/thread/src/pthread/thread.cpp +129 -95
  139. data/ext/boost/libs/thread/src/pthread/timeconv.inl +20 -1
  140. data/ext/boost/limits.hpp +1 -1
  141. data/ext/boost/math/policies/policy.hpp +10 -0
  142. data/ext/boost/math/special_functions/detail/round_fwd.hpp +17 -4
  143. data/ext/boost/math/special_functions/fpclassify.hpp +114 -45
  144. data/ext/boost/math/special_functions/math_fwd.hpp +195 -83
  145. data/ext/boost/math/special_functions/sign.hpp +13 -8
  146. data/ext/boost/math/tools/config.hpp +38 -16
  147. data/ext/boost/move/algorithm.hpp +275 -0
  148. data/ext/boost/move/core.hpp +332 -0
  149. data/ext/boost/move/detail/config_begin.hpp +23 -0
  150. data/ext/boost/move/detail/config_end.hpp +20 -0
  151. data/ext/boost/move/detail/meta_utils.hpp +158 -0
  152. data/ext/boost/move/iterator.hpp +298 -0
  153. data/ext/boost/move/move.hpp +10 -1256
  154. data/ext/boost/move/traits.hpp +142 -0
  155. data/ext/boost/move/utility.hpp +194 -0
  156. data/ext/boost/mpl/assert.hpp +72 -4
  157. data/ext/boost/noncopyable.hpp +15 -3
  158. data/ext/boost/pointer_to_other.hpp +55 -0
  159. data/ext/boost/range/concepts.hpp +4 -4
  160. data/ext/boost/range/detail/extract_optional_type.hpp +1 -1
  161. data/ext/boost/range/empty.hpp +1 -1
  162. data/ext/boost/range/iterator_range_core.hpp +4 -1
  163. data/ext/boost/range/iterator_range_io.hpp +2 -2
  164. data/ext/boost/ratio/config.hpp +6 -0
  165. data/ext/boost/ratio/detail/overflow_helpers.hpp +2 -2
  166. data/ext/boost/smart_ptr/allocate_shared_array.hpp +250 -0
  167. data/ext/boost/smart_ptr/detail/allocate_array_helper.hpp +169 -0
  168. data/ext/boost/smart_ptr/detail/array_deleter.hpp +124 -0
  169. data/ext/boost/smart_ptr/detail/array_traits.hpp +53 -0
  170. data/ext/boost/smart_ptr/detail/array_utility.hpp +178 -0
  171. data/ext/boost/smart_ptr/detail/make_array_helper.hpp +157 -0
  172. data/ext/boost/smart_ptr/detail/operator_bool.hpp +16 -9
  173. data/ext/boost/smart_ptr/detail/shared_count.hpp +78 -7
  174. data/ext/boost/smart_ptr/detail/sp_convertible.hpp +15 -0
  175. data/ext/boost/smart_ptr/detail/sp_counted_base.hpp +12 -6
  176. data/ext/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp +1 -0
  177. data/ext/boost/smart_ptr/detail/sp_counted_base_aix.hpp +1 -0
  178. data/ext/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp +1 -0
  179. data/ext/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp +1 -0
  180. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp +1 -0
  181. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +1 -0
  182. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp +1 -0
  183. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp +1 -0
  184. data/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp +1 -0
  185. data/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp +1 -0
  186. data/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp +1 -0
  187. data/ext/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp +162 -0
  188. data/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp +1 -0
  189. data/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp +1 -0
  190. data/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp +1 -0
  191. data/ext/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp +1 -0
  192. data/ext/boost/smart_ptr/detail/sp_counted_impl.hpp +15 -0
  193. data/ext/boost/smart_ptr/detail/sp_forward.hpp +39 -0
  194. data/ext/boost/smart_ptr/detail/sp_has_sync.hpp +19 -3
  195. data/ext/boost/smart_ptr/detail/sp_if_array.hpp +31 -0
  196. data/ext/boost/smart_ptr/detail/sp_nullptr_t.hpp +45 -0
  197. data/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +5 -12
  198. data/ext/boost/smart_ptr/enable_shared_from_this.hpp +4 -4
  199. data/ext/boost/smart_ptr/make_shared.hpp +5 -1060
  200. data/ext/boost/smart_ptr/make_shared_array.hpp +247 -0
  201. data/ext/boost/smart_ptr/make_shared_object.hpp +1128 -0
  202. data/ext/boost/smart_ptr/scoped_array.hpp +32 -7
  203. data/ext/boost/smart_ptr/scoped_ptr.hpp +31 -5
  204. data/ext/boost/smart_ptr/shared_array.hpp +135 -20
  205. data/ext/boost/smart_ptr/shared_ptr.hpp +444 -126
  206. data/ext/boost/smart_ptr/weak_ptr.hpp +39 -28
  207. data/ext/boost/static_assert.hpp +74 -17
  208. data/ext/boost/system/error_code.hpp +76 -68
  209. data/ext/boost/system/system_error.hpp +5 -1
  210. data/ext/boost/thread/barrier.hpp +6 -2
  211. data/ext/boost/thread/completion_latch.hpp +233 -0
  212. data/ext/boost/thread/condition.hpp +6 -1
  213. data/ext/boost/thread/detail/async_func.hpp +571 -0
  214. data/ext/boost/thread/detail/config.hpp +248 -40
  215. data/ext/boost/thread/detail/counter.hpp +93 -0
  216. data/ext/boost/thread/detail/delete.hpp +12 -0
  217. data/ext/boost/thread/detail/invoke.hpp +1351 -0
  218. data/ext/boost/thread/detail/is_convertible.hpp +48 -0
  219. data/ext/boost/thread/detail/lockable_wrapper.hpp +45 -0
  220. data/ext/boost/thread/detail/log.hpp +83 -0
  221. data/ext/boost/thread/detail/make_tuple_indices.hpp +224 -0
  222. data/ext/boost/thread/detail/move.hpp +32 -16
  223. data/ext/boost/thread/detail/thread.hpp +236 -41
  224. data/ext/boost/thread/detail/thread_group.hpp +55 -9
  225. data/ext/boost/thread/detail/thread_interruption.hpp +4 -1
  226. data/ext/boost/thread/exceptions.hpp +2 -0
  227. data/ext/boost/thread/externally_locked.hpp +351 -0
  228. data/ext/boost/thread/externally_locked_stream.hpp +170 -0
  229. data/ext/boost/thread/future.hpp +2517 -455
  230. data/ext/boost/thread/future_error_code.hpp +61 -0
  231. data/ext/boost/thread/is_locked_by_this_thread.hpp +39 -0
  232. data/ext/boost/thread/latch.hpp +142 -0
  233. data/ext/boost/thread/lock_algorithms.hpp +468 -0
  234. data/ext/boost/thread/lock_concepts.hpp +197 -0
  235. data/ext/boost/thread/lock_factories.hpp +78 -0
  236. data/ext/boost/thread/lock_guard.hpp +88 -0
  237. data/ext/boost/thread/lock_options.hpp +31 -0
  238. data/ext/boost/thread/lock_traits.hpp +45 -0
  239. data/ext/boost/thread/lock_types.hpp +1226 -0
  240. data/ext/boost/thread/lockable_adapter.hpp +226 -0
  241. data/ext/boost/thread/lockable_concepts.hpp +157 -0
  242. data/ext/boost/thread/lockable_traits.hpp +207 -0
  243. data/ext/boost/thread/locks.hpp +5 -1816
  244. data/ext/boost/thread/mutex.hpp +33 -1
  245. data/ext/boost/thread/null_mutex.hpp +243 -0
  246. data/ext/boost/thread/once.hpp +10 -1
  247. data/ext/boost/thread/poly_lockable.hpp +68 -0
  248. data/ext/boost/thread/poly_lockable_adapter.hpp +89 -0
  249. data/ext/boost/thread/poly_shared_lockable.hpp +135 -0
  250. data/ext/boost/thread/poly_shared_lockable_adapter.hpp +170 -0
  251. data/ext/boost/thread/pthread/condition_variable.hpp +74 -26
  252. data/ext/boost/thread/pthread/condition_variable_fwd.hpp +54 -27
  253. data/ext/boost/thread/pthread/mutex.hpp +101 -38
  254. data/ext/boost/thread/pthread/once.hpp +459 -44
  255. data/ext/boost/thread/pthread/once_atomic.hpp +313 -0
  256. data/ext/boost/thread/pthread/recursive_mutex.hpp +19 -10
  257. data/ext/boost/thread/pthread/shared_mutex.hpp +226 -61
  258. data/ext/boost/thread/pthread/shared_mutex_assert.hpp +724 -0
  259. data/ext/boost/thread/pthread/thread_data.hpp +53 -50
  260. data/ext/boost/thread/pthread/timespec.hpp +96 -12
  261. data/ext/boost/thread/recursive_mutex.hpp +44 -1
  262. data/ext/boost/thread/reverse_lock.hpp +3 -2
  263. data/ext/boost/thread/scoped_thread.hpp +285 -0
  264. data/ext/boost/thread/shared_lock_guard.hpp +2 -1
  265. data/ext/boost/thread/shared_mutex.hpp +23 -0
  266. data/ext/boost/thread/strict_lock.hpp +235 -0
  267. data/ext/boost/thread/sync_bounded_queue.hpp +594 -0
  268. data/ext/boost/thread/sync_queue.hpp +516 -0
  269. data/ext/boost/thread/synchronized_value.hpp +1001 -0
  270. data/ext/boost/thread/testable_mutex.hpp +148 -0
  271. data/ext/boost/thread/thread.hpp +1 -13
  272. data/ext/boost/thread/thread_functors.hpp +57 -0
  273. data/ext/boost/thread/thread_guard.hpp +46 -0
  274. data/ext/boost/thread/thread_only.hpp +29 -0
  275. data/ext/boost/thread/v2/shared_mutex.hpp +1062 -0
  276. data/ext/boost/thread/v2/thread.hpp +37 -10
  277. data/ext/boost/thread/xtime.hpp +2 -1
  278. data/ext/boost/token_functions.hpp +16 -16
  279. data/ext/boost/type_traits/add_lvalue_reference.hpp +26 -0
  280. data/ext/boost/type_traits/add_reference.hpp +1 -1
  281. data/ext/boost/type_traits/add_rvalue_reference.hpp +4 -4
  282. data/ext/boost/type_traits/aligned_storage.hpp +13 -0
  283. data/ext/boost/type_traits/common_type.hpp +11 -12
  284. data/ext/boost/type_traits/config.hpp +1 -1
  285. data/ext/boost/type_traits/detail/common_type_imp.hpp +1 -1
  286. data/ext/boost/type_traits/detail/has_binary_operator.hpp +1 -1
  287. data/ext/boost/type_traits/detail/is_function_ptr_tester.hpp +1 -1
  288. data/ext/boost/type_traits/has_left_shift.hpp +49 -0
  289. data/ext/boost/type_traits/has_right_shift.hpp +49 -0
  290. data/ext/boost/type_traits/has_trivial_move_assign.hpp +57 -0
  291. data/ext/boost/type_traits/has_trivial_move_constructor.hpp +57 -0
  292. data/ext/boost/type_traits/intrinsics.hpp +18 -2
  293. data/ext/boost/type_traits/is_abstract.hpp +1 -1
  294. data/ext/boost/type_traits/is_array.hpp +1 -1
  295. data/ext/boost/type_traits/is_const.hpp +1 -1
  296. data/ext/boost/type_traits/is_convertible.hpp +78 -17
  297. data/ext/boost/type_traits/is_function.hpp +6 -1
  298. data/ext/boost/type_traits/is_integral.hpp +6 -1
  299. data/ext/boost/type_traits/is_nothrow_move_assignable.hpp +84 -0
  300. data/ext/boost/type_traits/is_nothrow_move_constructible.hpp +84 -0
  301. data/ext/boost/type_traits/is_pod.hpp +3 -1
  302. data/ext/boost/type_traits/is_rvalue_reference.hpp +1 -1
  303. data/ext/boost/type_traits/is_volatile.hpp +1 -1
  304. data/ext/boost/type_traits/make_signed.hpp +153 -0
  305. data/ext/boost/type_traits/make_unsigned.hpp +16 -0
  306. data/ext/boost/type_traits/remove_const.hpp +1 -1
  307. data/ext/boost/type_traits/remove_cv.hpp +1 -1
  308. data/ext/boost/type_traits/remove_reference.hpp +1 -1
  309. data/ext/boost/type_traits/remove_volatile.hpp +1 -1
  310. data/ext/boost/unordered/detail/allocate.hpp +1120 -0
  311. data/ext/boost/unordered/detail/buckets.hpp +876 -0
  312. data/ext/boost/unordered/detail/equivalent.hpp +680 -0
  313. data/ext/boost/unordered/detail/extract_key.hpp +183 -0
  314. data/ext/boost/unordered/detail/fwd.hpp +23 -0
  315. data/ext/boost/unordered/detail/table.hpp +861 -0
  316. data/ext/boost/unordered/detail/unique.hpp +622 -0
  317. data/ext/boost/unordered/detail/util.hpp +260 -0
  318. data/ext/boost/unordered/unordered_map.hpp +1652 -0
  319. data/ext/boost/unordered/unordered_map_fwd.hpp +65 -0
  320. data/ext/boost/unordered/unordered_set.hpp +1549 -0
  321. data/ext/boost/unordered/unordered_set_fwd.hpp +63 -0
  322. data/ext/boost/unordered_map.hpp +18 -0
  323. data/ext/boost/unordered_set.hpp +18 -0
  324. data/ext/boost/utility/addressof.hpp +2 -2
  325. data/ext/boost/utility/result_of.hpp +8 -1
  326. data/ext/boost/version.hpp +2 -2
  327. data/ext/common/Account.h +1 -1
  328. data/ext/common/AccountsDatabase.h +1 -1
  329. data/ext/common/AgentsStarter.cpp +3 -1
  330. data/ext/common/AgentsStarter.h +2 -2
  331. data/ext/common/ApplicationPool2/AppTypes.cpp +24 -6
  332. data/ext/common/ApplicationPool2/AppTypes.h +17 -8
  333. data/ext/common/ApplicationPool2/Common.h +12 -12
  334. data/ext/common/ApplicationPool2/DirectSpawner.h +2 -2
  335. data/ext/common/ApplicationPool2/DummySpawner.h +3 -3
  336. data/ext/common/ApplicationPool2/Group.h +6 -6
  337. data/ext/common/ApplicationPool2/Implementation.cpp +19 -19
  338. data/ext/common/ApplicationPool2/PipeWatcher.h +5 -5
  339. data/ext/common/ApplicationPool2/Pool.h +21 -21
  340. data/ext/common/ApplicationPool2/Process.h +6 -6
  341. data/ext/common/ApplicationPool2/Session.h +1 -1
  342. data/ext/common/ApplicationPool2/SmartSpawner.h +24 -12
  343. data/ext/common/ApplicationPool2/Socket.h +2 -2
  344. data/ext/common/ApplicationPool2/Spawner.h +64 -14
  345. data/ext/common/ApplicationPool2/SpawnerFactory.h +7 -7
  346. data/ext/common/ApplicationPool2/SuperGroup.h +5 -5
  347. data/ext/common/BackgroundEventLoop.cpp +4 -4
  348. data/ext/common/BackgroundEventLoop.h +1 -1
  349. data/ext/common/Constants.h +13 -1
  350. data/ext/common/EventedBufferedInput.h +8 -8
  351. data/ext/common/Exceptions.cpp +71 -0
  352. data/ext/common/Exceptions.h +60 -7
  353. data/ext/common/FileDescriptor.h +4 -4
  354. data/ext/common/MessageClient.h +1 -1
  355. data/ext/common/MessageServer.h +5 -5
  356. data/ext/common/MultiLibeio.cpp +3 -3
  357. data/ext/common/MultiLibeio.h +2 -2
  358. data/ext/common/RandomGenerator.h +11 -11
  359. data/ext/common/ResourceLocator.h +8 -1
  360. data/ext/common/SafeLibev.h +12 -12
  361. data/ext/common/ServerInstanceDir.h +11 -3
  362. data/ext/common/UnionStation.h +10 -10
  363. data/ext/common/Utils.cpp +11 -13
  364. data/ext/common/Utils.h +9 -9
  365. data/ext/common/Utils/BlockingQueue.h +10 -10
  366. data/ext/common/Utils/BufferedIO.h +1 -1
  367. data/ext/common/Utils/CachedFileStat.hpp +2 -2
  368. data/ext/common/Utils/FileChangeChecker.h +1 -1
  369. data/ext/common/Utils/HashMap.h +13 -4
  370. data/ext/common/Utils/IOUtils.cpp +33 -10
  371. data/ext/common/Utils/IniFile.h +3 -3
  372. data/ext/common/Utils/Lock.h +2 -2
  373. data/ext/common/Utils/MessagePassing.h +10 -10
  374. data/ext/common/Utils/ProcessMetricsCollector.h +24 -6
  375. data/ext/common/Utils/ScopeGuard.h +5 -5
  376. data/ext/common/Utils/jsoncpp.cpp +2 -0
  377. data/ext/common/agents/HelperAgent/FileBackedPipe.h +26 -26
  378. data/ext/common/agents/HelperAgent/Main.cpp +18 -18
  379. data/ext/common/agents/HelperAgent/RequestHandler.cpp +4 -4
  380. data/ext/common/agents/HelperAgent/RequestHandler.h +30 -21
  381. data/ext/common/agents/LoggingAgent/AdminController.h +1 -1
  382. data/ext/common/agents/LoggingAgent/FilterSupport.h +13 -11
  383. data/ext/common/agents/LoggingAgent/LoggingServer.h +11 -11
  384. data/ext/common/agents/LoggingAgent/Main.cpp +9 -9
  385. data/ext/common/agents/LoggingAgent/RemoteSender.h +3 -3
  386. data/ext/common/agents/SpawnPreparer.cpp +1 -0
  387. data/ext/common/agents/Watchdog/AgentWatcher.cpp +8 -7
  388. data/ext/common/agents/Watchdog/Main.cpp +81 -73
  389. data/ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp +1 -1
  390. data/ext/libev/Changes +57 -0
  391. data/ext/libev/LICENSE +2 -1
  392. data/ext/libev/Makefile.in +110 -50
  393. data/ext/libev/README +8 -8
  394. data/ext/libev/aclocal.m4 +1503 -861
  395. data/ext/libev/config.guess +290 -304
  396. data/ext/libev/config.sub +77 -198
  397. data/ext/libev/configure +1735 -890
  398. data/ext/libev/configure.ac +3 -2
  399. data/ext/libev/ev++.h +6 -6
  400. data/ext/libev/ev.c +541 -214
  401. data/ext/libev/ev.h +106 -100
  402. data/ext/libev/ev_epoll.c +1 -1
  403. data/ext/libev/ev_kqueue.c +20 -4
  404. data/ext/libev/ev_vars.h +15 -16
  405. data/ext/libev/ev_win32.c +12 -2
  406. data/ext/libev/ev_wrap.h +162 -160
  407. data/ext/libev/event.c +29 -6
  408. data/ext/libev/event.h +9 -2
  409. data/ext/libev/ltmain.sh +2632 -1384
  410. data/ext/nginx/ConfigurationCommands.c +1 -1
  411. data/ext/nginx/ConfigurationCommands.c.erb +3 -1
  412. data/ext/nginx/ContentHandler.c +25 -2
  413. data/ext/nginx/CreateLocationConfig.c +1 -0
  414. data/ext/nginx/CreateLocationConfig.c.erb +1 -1
  415. data/ext/nginx/MergeLocationConfig.c +1 -0
  416. data/ext/nginx/MergeLocationConfig.c.erb +1 -1
  417. data/ext/nginx/config +12 -0
  418. data/ext/oxt/dynamic_thread_group.hpp +7 -4
  419. data/ext/oxt/system_calls.cpp +5 -1
  420. data/ext/oxt/system_calls.hpp +3 -0
  421. data/helper-scripts/node-loader.js +117 -249
  422. data/lib/phusion_passenger.rb +27 -5
  423. data/lib/phusion_passenger/abstract_installer.rb +104 -9
  424. data/lib/phusion_passenger/admin_tools/memory_stats.rb +10 -9
  425. data/lib/phusion_passenger/apache2/config_options.rb +6 -3
  426. data/lib/phusion_passenger/common_library.rb +7 -1
  427. data/lib/phusion_passenger/constants.rb +6 -0
  428. data/lib/phusion_passenger/loader_shared_helpers.rb +7 -4
  429. data/lib/phusion_passenger/nginx/config_options.rb +2 -1
  430. data/lib/phusion_passenger/packaging.rb +3 -0
  431. data/lib/phusion_passenger/platform_info/apache.rb +43 -6
  432. data/lib/phusion_passenger/platform_info/apache_detector.rb +15 -5
  433. data/lib/phusion_passenger/platform_info/compiler.rb +167 -32
  434. data/lib/phusion_passenger/platform_info/cxx_portability.rb +133 -77
  435. data/lib/phusion_passenger/platform_info/depcheck.rb +17 -7
  436. data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +3 -3
  437. data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb +4 -4
  438. data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb +5 -6
  439. data/lib/phusion_passenger/platform_info/linux.rb +2 -1
  440. data/lib/phusion_passenger/platform_info/operating_system.rb +1 -1
  441. data/lib/phusion_passenger/platform_info/ruby.rb +18 -3
  442. data/lib/phusion_passenger/standalone/runtime_installer.rb +6 -2
  443. data/lib/phusion_passenger/standalone/start_command.rb +8 -2
  444. data/lib/phusion_passenger/utils/ansi_colors.rb +9 -0
  445. data/lib/phusion_passenger/utils/hosts_file_parser.rb +4 -2
  446. data/node_lib/phusion_passenger/httplib_emulation.js +141 -0
  447. data/node_lib/phusion_passenger/line_reader.js +154 -0
  448. data/node_lib/phusion_passenger/request_handler.js +65 -0
  449. data/node_lib/phusion_passenger/session_protocol_parser.js +113 -0
  450. data/resources/templates/apache2/deployment_example.txt.erb +2 -1
  451. data/resources/templates/apache2/installing_against_a_different_apache.txt.erb +14 -0
  452. data/resources/templates/apache2/multiple_apache_installations_detected.txt.erb +15 -0
  453. data/resources/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb +4 -5
  454. data/resources/templates/general_error_with_html.html.template +1 -1
  455. data/resources/templates/installer_common/gem_install_permission_problems.txt.erb +17 -0
  456. data/resources/templates/installer_common/low_amount_of_memory_warning.txt.erb +6 -4
  457. data/resources/templates/installer_common/world_inaccessible_directories.txt.erb +16 -0
  458. data/resources/templates/nginx/deployment_example.txt.erb +2 -1
  459. data/resources/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb +4 -5
  460. data/resources/templates/standalone/config.erb +1 -0
  461. data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +3 -3
  462. data/test/cxx/ApplicationPool2/PoolTest.cpp +4 -4
  463. data/test/cxx/ApplicationPool2/ProcessTest.cpp +5 -5
  464. data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +5 -5
  465. data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +1 -1
  466. data/test/cxx/EventedBufferedInputTest.cpp +6 -6
  467. data/test/cxx/FileBackedPipeTest.cpp +1 -1
  468. data/test/cxx/MessagePassingTest.cpp +1 -1
  469. data/test/cxx/MessageServerTest.cpp +4 -4
  470. data/test/cxx/RequestHandlerTest.cpp +7 -7
  471. data/test/cxx/UnionStationTest.cpp +2 -2
  472. data/test/node/line_reader_spec.js +338 -0
  473. data/test/node/spec_helper.js +27 -0
  474. data/test/ruby/standalone/runtime_installer_spec.rb +2 -1
  475. metadata +131 -22
  476. metadata.gz.asc +7 -7
  477. data/ext/boost/functional/hash/detail/container_fwd_0x.hpp +0 -29
  478. data/ext/boost/lambda/core.hpp +0 -79
  479. data/ext/boost/lambda/detail/actions.hpp +0 -174
  480. data/ext/boost/lambda/detail/arity_code.hpp +0 -110
  481. data/ext/boost/lambda/detail/function_adaptors.hpp +0 -789
  482. data/ext/boost/lambda/detail/is_instance_of.hpp +0 -104
  483. data/ext/boost/lambda/detail/lambda_config.hpp +0 -48
  484. data/ext/boost/lambda/detail/lambda_functor_base.hpp +0 -615
  485. data/ext/boost/lambda/detail/lambda_functors.hpp +0 -324
  486. data/ext/boost/lambda/detail/lambda_fwd.hpp +0 -74
  487. data/ext/boost/lambda/detail/lambda_traits.hpp +0 -578
  488. data/ext/boost/lambda/detail/member_ptr.hpp +0 -737
  489. data/ext/boost/lambda/detail/operator_actions.hpp +0 -139
  490. data/ext/boost/lambda/detail/operator_lambda_func_base.hpp +0 -271
  491. data/ext/boost/lambda/detail/operator_return_type_traits.hpp +0 -917
  492. data/ext/boost/lambda/detail/operators.hpp +0 -370
  493. data/ext/boost/lambda/detail/ret.hpp +0 -325
  494. data/ext/boost/lambda/detail/return_type_traits.hpp +0 -282
  495. data/ext/boost/lambda/detail/select_functions.hpp +0 -74
  496. data/ext/boost/lambda/lambda.hpp +0 -34
data/ext/libev/config.sub CHANGED
@@ -1,10 +1,10 @@
1
1
  #! /bin/sh
2
2
  # Configuration validation subroutine script.
3
3
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
- # 2011, 2012 Free Software Foundation, Inc.
4
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
+ # Free Software Foundation, Inc.
6
6
 
7
- timestamp='2012-04-18'
7
+ timestamp='2008-01-16'
8
8
 
9
9
  # This file is (in principle) common to ALL GNU software.
10
10
  # The presence of a machine in this file suggests that SOME GNU software
@@ -21,7 +21,9 @@ timestamp='2012-04-18'
21
21
  # GNU General Public License for more details.
22
22
  #
23
23
  # You should have received a copy of the GNU General Public License
24
- # along with this program; if not, see <http://www.gnu.org/licenses/>.
24
+ # along with this program; if not, write to the Free Software
25
+ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26
+ # 02110-1301, USA.
25
27
  #
26
28
  # As a special exception to the GNU General Public License, if you
27
29
  # distribute this file as part of a program that contains a
@@ -30,16 +32,13 @@ timestamp='2012-04-18'
30
32
 
31
33
 
32
34
  # Please send patches to <config-patches@gnu.org>. Submit a context
33
- # diff and a properly formatted GNU ChangeLog entry.
35
+ # diff and a properly formatted ChangeLog entry.
34
36
  #
35
37
  # Configuration subroutine to validate and canonicalize a configuration type.
36
38
  # Supply the specified configuration type as an argument.
37
39
  # If it is invalid, we print an error message on stderr and exit with code 1.
38
40
  # Otherwise, we print the canonical config type on stdout and succeed.
39
41
 
40
- # You can get the latest version of this script from:
41
- # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
42
-
43
42
  # This file is supposed to be the same for all GNU packages
44
43
  # and recognize all the CPU types, system types and aliases
45
44
  # that are meaningful with *any* GNU software.
@@ -73,9 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
73
72
  version="\
74
73
  GNU config.sub ($timestamp)
75
74
 
76
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78
- Free Software Foundation, Inc.
75
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
79
77
 
80
78
  This is free software; see the source for copying conditions. There is NO
81
79
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -122,18 +120,12 @@ esac
122
120
  # Here we must recognize all the valid KERNEL-OS combinations.
123
121
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
124
122
  case $maybe_os in
125
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
126
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
127
- knetbsd*-gnu* | netbsd*-gnu* | \
128
- kopensolaris*-gnu* | \
123
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
129
125
  storm-chaos* | os2-emx* | rtmk-nova*)
130
126
  os=-$maybe_os
131
127
  basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
132
128
  ;;
133
- android-linux)
134
- os=-linux-android
135
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136
- ;;
137
129
  *)
138
130
  basic_machine=`echo $1 | sed 's/-[^-]*$//'`
139
131
  if [ $basic_machine != $1 ]
@@ -156,13 +148,10 @@ case $os in
156
148
  -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
157
149
  -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
158
150
  -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
159
- -apple | -axis | -knuth | -cray | -microblaze)
151
+ -apple | -axis | -knuth | -cray)
160
152
  os=
161
153
  basic_machine=$1
162
154
  ;;
163
- -bluegene*)
164
- os=-cnk
165
- ;;
166
155
  -sim | -cisco | -oki | -wec | -winbond)
167
156
  os=
168
157
  basic_machine=$1
@@ -177,10 +166,10 @@ case $os in
177
166
  os=-chorusos
178
167
  basic_machine=$1
179
168
  ;;
180
- -chorusrdb)
181
- os=-chorusrdb
169
+ -chorusrdb)
170
+ os=-chorusrdb
182
171
  basic_machine=$1
183
- ;;
172
+ ;;
184
173
  -hiux*)
185
174
  os=-hiuxwe2
186
175
  ;;
@@ -225,12 +214,6 @@ case $os in
225
214
  -isc*)
226
215
  basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
227
216
  ;;
228
- -lynx*178)
229
- os=-lynxos178
230
- ;;
231
- -lynx*5)
232
- os=-lynxos5
233
- ;;
234
217
  -lynx*)
235
218
  os=-lynxos
236
219
  ;;
@@ -255,32 +238,24 @@ case $basic_machine in
255
238
  # Some are omitted here because they have special meanings below.
256
239
  1750a | 580 \
257
240
  | a29k \
258
- | aarch64 | aarch64_be \
259
241
  | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
260
242
  | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
261
243
  | am33_2.0 \
262
244
  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
263
- | be32 | be64 \
264
245
  | bfin \
265
246
  | c4x | clipper \
266
247
  | d10v | d30v | dlx | dsp16xx \
267
- | epiphany \
268
248
  | fido | fr30 | frv \
269
249
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
270
- | hexagon \
271
250
  | i370 | i860 | i960 | ia64 \
272
251
  | ip2k | iq2000 \
273
- | le32 | le64 \
274
- | lm32 \
275
252
  | m32c | m32r | m32rle | m68000 | m68k | m88k \
276
- | maxq | mb | microblaze | mcore | mep | metag \
253
+ | maxq | mb | microblaze | mcore | mep \
277
254
  | mips | mipsbe | mipseb | mipsel | mipsle \
278
255
  | mips16 \
279
256
  | mips64 | mips64el \
280
- | mips64octeon | mips64octeonel \
281
- | mips64orion | mips64orionel \
282
- | mips64r5900 | mips64r5900el \
283
257
  | mips64vr | mips64vrel \
258
+ | mips64orion | mips64orionel \
284
259
  | mips64vr4100 | mips64vr4100el \
285
260
  | mips64vr4300 | mips64vr4300el \
286
261
  | mips64vr5000 | mips64vr5000el \
@@ -293,42 +268,29 @@ case $basic_machine in
293
268
  | mipsisa64sr71k | mipsisa64sr71kel \
294
269
  | mipstx39 | mipstx39el \
295
270
  | mn10200 | mn10300 \
296
- | moxie \
297
271
  | mt \
298
272
  | msp430 \
299
- | nds32 | nds32le | nds32be \
300
273
  | nios | nios2 \
301
274
  | ns16k | ns32k \
302
- | open8 \
303
275
  | or32 \
304
276
  | pdp10 | pdp11 | pj | pjl \
305
- | powerpc | powerpc64 | powerpc64le | powerpcle \
277
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
306
278
  | pyramid \
307
- | rl78 | rx \
308
279
  | score \
309
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
280
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
310
281
  | sh64 | sh64le \
311
282
  | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
312
283
  | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
313
- | spu \
314
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
315
- | ubicom32 \
316
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
284
+ | spu | strongarm \
285
+ | tahoe | thumb | tic4x | tic80 | tron \
286
+ | v850 | v850e \
317
287
  | we32k \
318
- | x86 | xc16x | xstormy16 | xtensa \
319
- | z8k | z80)
288
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
289
+ | z8k)
320
290
  basic_machine=$basic_machine-unknown
321
291
  ;;
322
- c54x)
323
- basic_machine=tic54x-unknown
324
- ;;
325
- c55x)
326
- basic_machine=tic55x-unknown
327
- ;;
328
- c6x)
329
- basic_machine=tic6x-unknown
330
- ;;
331
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
292
+ m6811 | m68hc11 | m6812 | m68hc12)
293
+ # Motorola 68HC11/12.
332
294
  basic_machine=$basic_machine-unknown
333
295
  os=-none
334
296
  ;;
@@ -338,21 +300,6 @@ case $basic_machine in
338
300
  basic_machine=mt-unknown
339
301
  ;;
340
302
 
341
- strongarm | thumb | xscale)
342
- basic_machine=arm-unknown
343
- ;;
344
- xgate)
345
- basic_machine=$basic_machine-unknown
346
- os=-none
347
- ;;
348
- xscaleeb)
349
- basic_machine=armeb-unknown
350
- ;;
351
-
352
- xscaleel)
353
- basic_machine=armel-unknown
354
- ;;
355
-
356
303
  # We use `pc' rather than `unknown'
357
304
  # because (1) that's what they normally are, and
358
305
  # (2) the word "unknown" tends to confuse beginning users.
@@ -367,36 +314,29 @@ case $basic_machine in
367
314
  # Recognize the basic CPU types with company name.
368
315
  580-* \
369
316
  | a29k-* \
370
- | aarch64-* | aarch64_be-* \
371
317
  | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
372
318
  | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
373
319
  | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
374
320
  | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
375
321
  | avr-* | avr32-* \
376
- | be32-* | be64-* \
377
322
  | bfin-* | bs2000-* \
378
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
323
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
379
324
  | clipper-* | craynv-* | cydra-* \
380
325
  | d10v-* | d30v-* | dlx-* \
381
326
  | elxsi-* \
382
327
  | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
383
328
  | h8300-* | h8500-* \
384
329
  | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
385
- | hexagon-* \
386
330
  | i*86-* | i860-* | i960-* | ia64-* \
387
331
  | ip2k-* | iq2000-* \
388
- | le32-* | le64-* \
389
- | lm32-* \
390
332
  | m32c-* | m32r-* | m32rle-* \
391
333
  | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
392
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
334
+ | m88110-* | m88k-* | maxq-* | mcore-* \
393
335
  | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
394
336
  | mips16-* \
395
337
  | mips64-* | mips64el-* \
396
- | mips64octeon-* | mips64octeonel-* \
397
- | mips64orion-* | mips64orionel-* \
398
- | mips64r5900-* | mips64r5900el-* \
399
338
  | mips64vr-* | mips64vrel-* \
339
+ | mips64orion-* | mips64orionel-* \
400
340
  | mips64vr4100-* | mips64vr4100el-* \
401
341
  | mips64vr4300-* | mips64vr4300el-* \
402
342
  | mips64vr5000-* | mips64vr5000el-* \
@@ -411,32 +351,27 @@ case $basic_machine in
411
351
  | mmix-* \
412
352
  | mt-* \
413
353
  | msp430-* \
414
- | nds32-* | nds32le-* | nds32be-* \
415
354
  | nios-* | nios2-* \
416
355
  | none-* | np1-* | ns16k-* | ns32k-* \
417
- | open8-* \
418
356
  | orion-* \
419
357
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
420
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
358
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
421
359
  | pyramid-* \
422
- | rl78-* | romp-* | rs6000-* | rx-* \
423
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
360
+ | romp-* | rs6000-* \
361
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
424
362
  | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
425
363
  | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
426
364
  | sparclite-* \
427
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428
- | tahoe-* \
365
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
366
+ | tahoe-* | thumb-* \
429
367
  | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
430
- | tile*-* \
431
368
  | tron-* \
432
- | ubicom32-* \
433
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
434
- | vax-* \
369
+ | v850-* | v850e-* | vax-* \
435
370
  | we32k-* \
436
- | x86-* | x86_64-* | xc16x-* | xps100-* \
371
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
437
372
  | xstormy16-* | xtensa*-* \
438
373
  | ymp-* \
439
- | z8k-* | z80-*)
374
+ | z8k-*)
440
375
  ;;
441
376
  # Recognize the basic CPU types without company name, with glob match.
442
377
  xtensa*)
@@ -458,7 +393,7 @@ case $basic_machine in
458
393
  basic_machine=a29k-amd
459
394
  os=-udi
460
395
  ;;
461
- abacus)
396
+ abacus)
462
397
  basic_machine=abacus-unknown
463
398
  ;;
464
399
  adobe68k)
@@ -504,10 +439,6 @@ case $basic_machine in
504
439
  basic_machine=m68k-apollo
505
440
  os=-bsd
506
441
  ;;
507
- aros)
508
- basic_machine=i386-pc
509
- os=-aros
510
- ;;
511
442
  aux)
512
443
  basic_machine=m68k-apple
513
444
  os=-aux
@@ -524,27 +455,10 @@ case $basic_machine in
524
455
  basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
525
456
  os=-linux
526
457
  ;;
527
- bluegene*)
528
- basic_machine=powerpc-ibm
529
- os=-cnk
530
- ;;
531
- c54x-*)
532
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
- ;;
534
- c55x-*)
535
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
536
- ;;
537
- c6x-*)
538
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
539
- ;;
540
458
  c90)
541
459
  basic_machine=c90-cray
542
460
  os=-unicos
543
461
  ;;
544
- cegcc)
545
- basic_machine=arm-unknown
546
- os=-cegcc
547
- ;;
548
462
  convex-c1)
549
463
  basic_machine=c1-convex
550
464
  os=-bsd
@@ -573,7 +487,7 @@ case $basic_machine in
573
487
  basic_machine=craynv-cray
574
488
  os=-unicosmp
575
489
  ;;
576
- cr16 | cr16-*)
490
+ cr16)
577
491
  basic_machine=cr16-unknown
578
492
  os=-elf
579
493
  ;;
@@ -612,10 +526,6 @@ case $basic_machine in
612
526
  basic_machine=m88k-motorola
613
527
  os=-sysv3
614
528
  ;;
615
- dicos)
616
- basic_machine=i686-pc
617
- os=-dicos
618
- ;;
619
529
  djgpp)
620
530
  basic_machine=i586-pc
621
531
  os=-msdosdjgpp
@@ -731,6 +641,7 @@ case $basic_machine in
731
641
  i370-ibm* | ibm*)
732
642
  basic_machine=i370-ibm
733
643
  ;;
644
+ # I'm not sure what "Sysv32" means. Should this be sysv3.2?
734
645
  i*86v32)
735
646
  basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
736
647
  os=-sysv32
@@ -788,9 +699,6 @@ case $basic_machine in
788
699
  basic_machine=ns32k-utek
789
700
  os=-sysv
790
701
  ;;
791
- microblaze)
792
- basic_machine=microblaze-xilinx
793
- ;;
794
702
  mingw32)
795
703
  basic_machine=i386-pc
796
704
  os=-mingw32
@@ -827,18 +735,10 @@ case $basic_machine in
827
735
  ms1-*)
828
736
  basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
829
737
  ;;
830
- msys)
831
- basic_machine=i386-pc
832
- os=-msys
833
- ;;
834
738
  mvs)
835
739
  basic_machine=i370-ibm
836
740
  os=-mvs
837
741
  ;;
838
- nacl)
839
- basic_machine=le32-unknown
840
- os=-nacl
841
- ;;
842
742
  ncr3000)
843
743
  basic_machine=i486-ncr
844
744
  os=-sysv4
@@ -903,12 +803,6 @@ case $basic_machine in
903
803
  np1)
904
804
  basic_machine=np1-gould
905
805
  ;;
906
- neo-tandem)
907
- basic_machine=neo-tandem
908
- ;;
909
- nse-tandem)
910
- basic_machine=nse-tandem
911
- ;;
912
806
  nsr-tandem)
913
807
  basic_machine=nsr-tandem
914
808
  ;;
@@ -991,10 +885,9 @@ case $basic_machine in
991
885
  ;;
992
886
  power) basic_machine=power-ibm
993
887
  ;;
994
- ppc | ppcbe) basic_machine=powerpc-unknown
888
+ ppc) basic_machine=powerpc-unknown
995
889
  ;;
996
- ppc-* | ppcbe-*)
997
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
890
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
998
891
  ;;
999
892
  ppcle | powerpclittle | ppc-le | powerpc-little)
1000
893
  basic_machine=powerpcle-unknown
@@ -1088,9 +981,6 @@ case $basic_machine in
1088
981
  basic_machine=i860-stratus
1089
982
  os=-sysv4
1090
983
  ;;
1091
- strongarm-* | thumb-*)
1092
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1093
- ;;
1094
984
  sun2)
1095
985
  basic_machine=m68000-sun
1096
986
  ;;
@@ -1147,8 +1037,20 @@ case $basic_machine in
1147
1037
  basic_machine=t90-cray
1148
1038
  os=-unicos
1149
1039
  ;;
1040
+ tic54x | c54x*)
1041
+ basic_machine=tic54x-unknown
1042
+ os=-coff
1043
+ ;;
1044
+ tic55x | c55x*)
1045
+ basic_machine=tic55x-unknown
1046
+ os=-coff
1047
+ ;;
1048
+ tic6x | c6x*)
1049
+ basic_machine=tic6x-unknown
1050
+ os=-coff
1051
+ ;;
1150
1052
  tile*)
1151
- basic_machine=$basic_machine-unknown
1053
+ basic_machine=tile-unknown
1152
1054
  os=-linux-gnu
1153
1055
  ;;
1154
1056
  tx39)
@@ -1218,9 +1120,6 @@ case $basic_machine in
1218
1120
  xps | xps100)
1219
1121
  basic_machine=xps100-honeywell
1220
1122
  ;;
1221
- xscale-* | xscalee[bl]-*)
1222
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1223
- ;;
1224
1123
  ymp)
1225
1124
  basic_machine=ymp-cray
1226
1125
  os=-unicos
@@ -1229,10 +1128,6 @@ case $basic_machine in
1229
1128
  basic_machine=z8k-unknown
1230
1129
  os=-sim
1231
1130
  ;;
1232
- z80-*-coff)
1233
- basic_machine=z80-unknown
1234
- os=-sim
1235
- ;;
1236
1131
  none)
1237
1132
  basic_machine=none-none
1238
1133
  os=-none
@@ -1271,7 +1166,7 @@ case $basic_machine in
1271
1166
  we32k)
1272
1167
  basic_machine=we32k-att
1273
1168
  ;;
1274
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1169
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1275
1170
  basic_machine=sh-unknown
1276
1171
  ;;
1277
1172
  sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1318,12 +1213,9 @@ esac
1318
1213
  if [ x"$os" != x"" ]
1319
1214
  then
1320
1215
  case $os in
1321
- # First match some system type aliases
1322
- # that might get confused with valid system types.
1216
+ # First match some system type aliases
1217
+ # that might get confused with valid system types.
1323
1218
  # -solaris* is a basic system type, with this one exception.
1324
- -auroraux)
1325
- os=-auroraux
1326
- ;;
1327
1219
  -solaris1 | -solaris1.*)
1328
1220
  os=`echo $os | sed -e 's|solaris1|sunos4|'`
1329
1221
  ;;
@@ -1344,11 +1236,10 @@ case $os in
1344
1236
  # Each alternative MUST END IN A *, to match a version number.
1345
1237
  # -sysv* is not here because it comes later, after sysvr4.
1346
1238
  -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1347
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1348
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1349
- | -sym* | -kopensolaris* \
1239
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1240
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1350
1241
  | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1351
- | -aos* | -aros* \
1242
+ | -aos* \
1352
1243
  | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1353
1244
  | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1354
1245
  | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1357,10 +1248,9 @@ case $os in
1357
1248
  | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1358
1249
  | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1359
1250
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1360
- | -chorusos* | -chorusrdb* | -cegcc* \
1361
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1362
- | -mingw32* | -linux-gnu* | -linux-android* \
1363
- | -linux-newlib* | -linux-uclibc* \
1251
+ | -chorusos* | -chorusrdb* \
1252
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1253
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1364
1254
  | -uxpv* | -beos* | -mpeix* | -udk* \
1365
1255
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1366
1256
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1368,7 +1258,7 @@ case $os in
1368
1258
  | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1369
1259
  | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1370
1260
  | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1371
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1261
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1372
1262
  # Remember, each alternative MUST END IN *, to match a version number.
1373
1263
  ;;
1374
1264
  -qnx*)
@@ -1407,7 +1297,7 @@ case $os in
1407
1297
  -opened*)
1408
1298
  os=-openedition
1409
1299
  ;;
1410
- -os400*)
1300
+ -os400*)
1411
1301
  os=-os400
1412
1302
  ;;
1413
1303
  -wince*)
@@ -1456,7 +1346,7 @@ case $os in
1456
1346
  -sinix*)
1457
1347
  os=-sysv4
1458
1348
  ;;
1459
- -tpf*)
1349
+ -tpf*)
1460
1350
  os=-tpf
1461
1351
  ;;
1462
1352
  -triton*)
@@ -1498,11 +1388,6 @@ case $os in
1498
1388
  -zvmoe)
1499
1389
  os=-zvmoe
1500
1390
  ;;
1501
- -dicos*)
1502
- os=-dicos
1503
- ;;
1504
- -nacl*)
1505
- ;;
1506
1391
  -none)
1507
1392
  ;;
1508
1393
  *)
@@ -1525,10 +1410,10 @@ else
1525
1410
  # system, and we'll never get to this point.
1526
1411
 
1527
1412
  case $basic_machine in
1528
- score-*)
1413
+ score-*)
1529
1414
  os=-elf
1530
1415
  ;;
1531
- spu-*)
1416
+ spu-*)
1532
1417
  os=-elf
1533
1418
  ;;
1534
1419
  *-acorn)
@@ -1540,17 +1425,8 @@ case $basic_machine in
1540
1425
  arm*-semi)
1541
1426
  os=-aout
1542
1427
  ;;
1543
- c4x-* | tic4x-*)
1544
- os=-coff
1545
- ;;
1546
- tic54x-*)
1547
- os=-coff
1548
- ;;
1549
- tic55x-*)
1550
- os=-coff
1551
- ;;
1552
- tic6x-*)
1553
- os=-coff
1428
+ c4x-* | tic4x-*)
1429
+ os=-coff
1554
1430
  ;;
1555
1431
  # This must come before the *-dec entry.
1556
1432
  pdp10-*)
@@ -1570,11 +1446,14 @@ case $basic_machine in
1570
1446
  ;;
1571
1447
  m68000-sun)
1572
1448
  os=-sunos3
1449
+ # This also exists in the configure program, but was not the
1450
+ # default.
1451
+ # os=-sunos4
1573
1452
  ;;
1574
1453
  m68*-cisco)
1575
1454
  os=-aout
1576
1455
  ;;
1577
- mep-*)
1456
+ mep-*)
1578
1457
  os=-elf
1579
1458
  ;;
1580
1459
  mips*-cisco)
@@ -1601,7 +1480,7 @@ case $basic_machine in
1601
1480
  *-ibm)
1602
1481
  os=-aix
1603
1482
  ;;
1604
- *-knuth)
1483
+ *-knuth)
1605
1484
  os=-mmixware
1606
1485
  ;;
1607
1486
  *-wec)
@@ -1706,7 +1585,7 @@ case $basic_machine in
1706
1585
  -sunos*)
1707
1586
  vendor=sun
1708
1587
  ;;
1709
- -cnk*|-aix*)
1588
+ -aix*)
1710
1589
  vendor=ibm
1711
1590
  ;;
1712
1591
  -beos*)