passenger 5.0.30 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 722c1e1bd4ec567159a9176ac6ccb0e207f605af
-  data.tar.gz: 51d23530f41934e66d5c8a8c13d68386400765fb
+  metadata.gz: d5ca56d2326b729cc6c4f2368298916d7cd5b8b9
+  data.tar.gz: 3f00d42375d7ebbfd44dd39cb2a344d3d2b6a50a
 SHA512:
-  metadata.gz: 746361cde0146a6ad7ff161553d61eee22889cbf682e45306e1510337d0826957ea6f61b434ca659b450c82b58e8af2ff578ddbdf2297dc937b5adfa14817e8c
-  data.tar.gz: afd17292ab8b5764edd39574914817462268fd85293ab49c8ffc7b3a117239726c9817b332bcf9675f0649f88994938e8e5fc9f5dea53ad724f97a621b83cf92
+  metadata.gz: dae6078363636179a8518af992befdf05d3cc177d3f33d1d73903b3471d111bb93f3edc321ff0fe433dc13db8d09147e46956f039835967600f25a66792925de
+  data.tar.gz: d0284ac79900ce6829686b5d87d78be45bd369b203ea2443e674af4e5658942258635fb4ba975c53ef91dcf1761871f22df237ca830c054de31aaafbdf3be6c3

data/CHANGELOG

@@ -1,3 +1,32 @@
+Next version (not yet released)
+-------------------------------
+
+ * Upgrades union_station_hooks_core to version 2.1.2.
+ * [Enterprise] When running a Rails app in multithreaded mode, Passenger Enterprise automatically tags Rails logs with the current thread number. This makes it possible to distinguish logs generated by different threads.
+ * Fixes permissions issue on Linux when setting OOM score after lowering privileges. Closes GH-1858.
+ * [Standalone] Allows raw json envvars in Passengerfile.json. Closes GH-1837.
+ * [Standalone] Make the `max_requests` option available on the command line as well. 
+ * Fixes unaligned memory access in base64 decoder on platforms that have strict aliasing requirements (non x86/x86_64). Closes GH-1646.
+ * Introduces daily Passenger security update check to warn (error log) if there are newer Passenger versions with important security fixes (describing what was discovered, what is affected, which version has the fix).
+ * Fixes compilation on Linux when a non-glibc C library is in use. Closes GH-1870.
+ * `passenger-install-nginx-module` and the standalone compiler now add the http v2, realip and addition module flags for Nginx (just like the APT/RPM/autobuilder already had). Closes GH-1788. 
+ * [Apache] Fixes PassengerShowVersionInHeader option. Thanks to Sebastian Welther for contributing this.
+ * Passenger now reports when you try to use Node.js or Meteor clustering, and tries to continue with just a nonfunctional shim in place, so that if your code uses the clustering APIs your app may still work.
+ * Updates libev config.sub and config.guess to support newer platforms such as the IBM power 8.
+ * Fixes an issue where passenger-config couldn't restart an app if the TMPDIR variable was set to /tmp
+ * `passenger-install-apache-module` now suggests the correct apache package on Ubuntu Xenial. Closes GH-1884.
+ * [Standalone] The TempDirToucher will now spend most of its time with reduced privileges, except when it's actively touching files. This allows it to be killed when Passenger is quit in most circumstances. Closes GH-1678.
+ * Fixes a file overwrite vulnerability caused by a predictable temporary file being written by `passenger-install-nginx-module`. Thanks to Jeremy Evans for reporting this.
+ * [Standalone] Fixes starting Passenger as a non-extant user. Closes GH-1849.
+ * Improved look of the error pages for failing to spawn an application (development & production mode), and Error ID is now also shown in production mode.
+ * [Standalone] Enable ipv6 support by default in builtin nginx. Closes GH-1873.
+ * [Nginx] Updates to APT package builder (Debian & Ubuntu) with fix for www-data to root privilege escalation via log file handling (CVE-2016-1247/USN-3114-1).
+ * [Nginx] Updates to RPM package builder (CentOS & RHEL) with fix for 1.10.x system nginx package overriding the nginx from the Passenger repo. Closes GH-1895.
+ * [Nginx] The preferred Nginx version is now 1.10.2 (previously 1.10.1).
+ * RPM pkg builder fix for breaking SELinux change in RHEL 7.3.
+ * RPM pkg builder fix for RHEL6/CentOS6 incompatibility and replacement in Passenger.
+
+
 Release 5.0.30
 --------------
 
@@ -269,7 +298,7 @@ Release 5.0.10
 
  * It is now possible to run `passenger-status`, `passenger-config restart-app` and other admin commands without using sudo. When run without sudo, these admin commands will allow you to operate on apps and processes that are owned by the user that invoked the admin command. Closes GH-1392.
  * Fixes a crash introduces in 5.0.9 due to not properly initializing a variable. Closes GH-1530.
- * The `passenger-config reopen-logs` command now works by instructing the Watchdog process to reopen the log file, while instructing the other Passenger processes to re-inerhit the log file from the Watchdog instead of trying to reopen the log file on their own. This makes log file reopening more robust. Closes GH-1452.
+ * The `passenger-config reopen-logs` command now works by instructing the Watchdog process to reopen the log file, while instructing the other Passenger processes to re-inherit the log file from the Watchdog instead of trying to reopen the log file on their own. This makes log file reopening more robust. Closes GH-1452.
  * `passenger-config restart-app` no longer leaves the terminal in a state with black background. Closes GH-1526.
  * `passenger-config admin-command` has been renamed to `passenger-config api-call` in order to avoid confusion with any potential admin interfaces that we will introduce in the future.
  * If Union Station support is enabled, process and system metrics weren't being sent correctly to Union Station. This has been fixed.

data/CONTRIBUTING.md

@@ -29,7 +29,7 @@ You can contribute in one of the following areas:
  * Community support.
  * Code.
 
-We require contributors to sign our [contributor agreement](http://www.phusion.nl/forms/contributor_agreement) before we can merge their patches.
+We require contributors to sign our [contributor agreement](https://www.phusion.nl/contributor) before we can merge their patches.
 
 Please submit patches in the form of a Github pull request or as a patch on the [bug tracker](https://github.com/phusion/passenger/issues). Pull requests are preferred and generally get more attention because Github has better email notifications and better discussion capabilities.
 

data/CONTRIBUTORS

@@ -88,6 +88,7 @@ Saimon Moore
 Sam Pohlenz
 Sean Wilkinson
 Sebastian Delmont
+Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
@@ -95,6 +96,7 @@ Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)
 Tugdual de Kerviler
+Valters Jansons
 W. Andrew Loe III
 Weyert de Boer
 Yichun Zhang

data/bin/passenger-install-nginx-module

@@ -38,11 +38,11 @@ PhusionPassenger.locate_directories
 require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
+require 'tmpdir'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
-PhusionPassenger.require_passenger_lib 'utils/tmpio'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 DOWNLOAD_OPTION = {
@@ -547,8 +547,11 @@ private
 
     command = "sh ./configure --prefix='#{prefix}' "
     command << "--with-http_ssl_module "
+    command << "--with-http_v2_module "
+    command << "--with-http_realip_module "
     command << "--with-http_gzip_static_module "
     command << "--with-http_stub_status_module "
+    command << "--with-http_addition_module "
     command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
     command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
     if @pcre_source_dir
@@ -563,19 +566,21 @@ private
 
   def pcre_is_installed?
     if @pcre_is_installed.nil?
-      @pcre_is_installed = begin
-        File.open('/tmp/passenger-check.c', 'w') do |f|
-          f.puts("#include <pcre.h>")
-        end
-        Dir.chdir('/tmp') do
-          # Nginx checks for PCRE in multiple places...
-          system("(gcc -I/usr/local/include -I/usr/include/pcre " <<
-            "-I/usr/pkg/include -I/opt/local/include " <<
-            "-c passenger-check.c) >/dev/null 2>/dev/null")
+      Dir.mktmpdir do |safe_tmpdir|
+        @pcre_is_installed = begin
+          File.open("#{safe_tmpdir}/passenger-check.c", 'w') do |f|
+            f.puts("#include <pcre.h>")
+          end
+          Dir.chdir("#{safe_tmpdir}") do
+            # Nginx checks for PCRE in multiple places...
+            system("(gcc -I/usr/local/include -I/usr/include/pcre " <<
+              "-I/usr/pkg/include -I/opt/local/include " <<
+              "-c passenger-check.c) >/dev/null 2>/dev/null")
+          end
+        ensure
+          File.unlink("#{safe_tmpdir}/passenger-check.c") rescue nil
+          File.unlink("#{safe_tmpdir}/passenger-check.o") rescue nil
         end
-      ensure
-        File.unlink('/tmp/passenger-check.c') rescue nil
-        File.unlink('/tmp/passenger-check.o') rescue nil
       end
     end
     return @pcre_is_installed

data/build/agent.rb

@@ -89,6 +89,7 @@ file(AGENT_TARGET => dependencies) do
       libuv_libs,
       PlatformInfo.curl_libs,
       PlatformInfo.zlib_libs,
+      PlatformInfo.crypto_libs,
       PlatformInfo.portability_cxx_ldflags,
       AGENT_LDFLAGS
     ]

data/build/basics.rb

@@ -39,6 +39,7 @@ PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/curl'
 PhusionPassenger.require_passenger_lib 'platform_info/zlib'
+PhusionPassenger.require_passenger_lib 'platform_info/crypto'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'platform_info/cxx_portability'
 

data/build/cxx_tests.rb

@@ -46,6 +46,8 @@ TEST_CXX_OBJECTS = {
     "test/cxx/Core/UnionStationTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Core/ResponseCacheTest.o" =>
     "test/cxx/Core/ResponseCacheTest.cpp",
+  "#{TEST_OUTPUT_DIR}cxx/Core/SecurityUpdateCheckerTest.o" =>
+      "test/cxx/Core/SecurityUpdateCheckerTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Core/ControllerTest.o" =>
     "test/cxx/Core/ControllerTest.cpp",
 
@@ -108,7 +110,9 @@ TEST_CXX_OBJECTS = {
   "#{TEST_OUTPUT_DIR}cxx/IOUtilsTest.o" =>
     "test/cxx/IOUtilsTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/TemplateTest.o" =>
-    "test/cxx/TemplateTest.cpp"
+    "test/cxx/TemplateTest.cpp",
+  "#{TEST_OUTPUT_DIR}cxx/Base64DecodingTest.o" =>
+    "test/cxx/Base64DecodingTest.cpp"
 }
 
 def basic_test_cxx_flags
@@ -147,6 +151,7 @@ def test_cxx_ldflags
       "#{TEST_BOOST_OXT_LIBRARY} #{libev_libs} #{libuv_libs} " <<
       "#{PlatformInfo.curl_libs} " <<
       "#{PlatformInfo.zlib_libs} " <<
+      "#{PlatformInfo.crypto_libs} " <<
       "#{PlatformInfo.portability_cxx_ldflags}"
     result << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
     result << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN

data/build/misc.rb

@@ -189,6 +189,9 @@ task :compile_app => dependencies do
         LIBBOOST_OXT_LINKARG,
         libev_libs,
         libuv_libs,
+        PlatformInfo.curl_libs,
+        PlatformInfo.zlib_libs,
+        PlatformInfo.crypto_libs,
         PlatformInfo.portability_cxx_ldflags
       ]
     )

data/build/packaging.rb

@@ -129,7 +129,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
   require 'net/https'
   basename   = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
   version    = PhusionPassenger::VERSION_STRING
-  is_beta        = !!version.split('.')[3]
+  is_beta    = !!version.split('.')[3]
 
   if !`git status --porcelain | grep -Ev '^\\?\\? '`.empty?
     STDERR.puts "-------------------"
@@ -355,7 +355,7 @@ task 'package:update_homebrew' do
   sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
   sh "cd #{homebrew_dir} && git push -f"
   if boolean_option('HOMEBREW_TEST', true)
-    sh "cp /tmp/homebrew/Formula/passenger.rb /usr/local/Library/Formula/passenger.rb"
+    sh "cp /tmp/homebrew/Formula/passenger.rb /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/passenger.rb"
     if `brew info passenger` !~ /^Not installed$/
       sh "brew uninstall passenger"
     end
@@ -370,7 +370,6 @@ task 'package:initiate_binaries_building' do
   require 'uri'
   require 'net/http'
   require 'net/https'
-  version = VERSION_STRING
   begin
     website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
   rescue Errno::ENOENT
@@ -398,7 +397,7 @@ task 'package:initiate_binaries_building' do
   end
 
   uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
-    "job=Passenger%20#{type}%20binaries%20(release)&tag=#{git_tag}")
+    "job=Passenger%20#{type}%20binaries%20(release)&ref=#{git_tag}&testing=false")
   http = Net::HTTP.new(uri.host, uri.port)
   http.use_ssl = true
   http.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -418,7 +417,6 @@ task 'package:initiate_debian_building' do
   require 'uri'
   require 'net/http'
   require 'net/https'
-  version = VERSION_STRING
   begin
     website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
   rescue Errno::ENOENT
@@ -466,7 +464,6 @@ task 'package:initiate_rpm_building' do
   require 'uri'
   require 'net/http'
   require 'net/https'
-  version = VERSION_STRING
   begin
     website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
   rescue Errno::ENOENT
@@ -510,17 +507,8 @@ task 'package:initiate_rpm_building' do
 end
 
 task 'package:build_osx_binaries' do
-  if is_open_source?
-    sh "cd ../passenger_autobuilder && " +
-      "git pull && " +
-      "./autobuild-osx https://github.com/phusion/passenger.git passenger " +
-        "psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{git_tag}"
-  else
-    sh "cd ../passenger_autobuilder && " +
-      "git pull && " +
-      "./autobuild-osx #{enterprise_git_url} passenger-enterprise " +
-      "psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{git_tag}"
-  end
+  sh "env ENTERPRISE=#{is_enterprise?} TESTING=false " \
+    "./packaging/binaries/integration/publish/macos.sh"
 end
 
 desc "Remove gem, tarball and signatures"

data/build/support/cxx_dependency_map.rb

@@ -4171,6 +4171,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/OptionParser.h",
    "src/agent/Core/ResponseCache.h",
+   "src/agent/Core/SecurityUpdateChecker.h",
    "src/agent/Core/SpawningKit/BackgroundIOCapturer.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/DirectSpawner.h",
@@ -4194,6 +4195,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/BackgroundEventLoop.cpp",
    "src/cxx_supportlib/BackgroundEventLoop.h",
    "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/Crypto.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/DataStructures/LString.h",
    "src/cxx_supportlib/DataStructures/StringKeyTable.h",
@@ -4238,6 +4240,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/BufferedIO.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/ClassUtils.h",
+   "src/cxx_supportlib/Utils/Curl.h",
    "src/cxx_supportlib/Utils/DateParsing.h",
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/HashMap.h",
@@ -4323,6 +4326,25 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
    "src/cxx_supportlib/oxt/macros.hpp"],
+ "src/agent/Core/SecurityUpdateChecker.h"=>
+  ["src/cxx_supportlib/Crypto.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/oxt/backtrace.hpp",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/BackgroundIOCapturer.h"=>
   ["src/cxx_supportlib/Exceptions.h",
    "src/cxx_supportlib/FileDescriptor.h",
@@ -6096,6 +6118,24 @@ CXX_DEPENDENCY_MAP =
   [],
  "src/cxx_supportlib/Constants.h"=>
   [],
+ "src/cxx_supportlib/Crypto.cpp"=>
+  ["src/cxx_supportlib/Crypto.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/SystemTime.h",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp"],
+ "src/cxx_supportlib/Crypto.h"=>
+  [],
  "src/cxx_supportlib/DataStructures/HashedStaticString.h"=>
   ["src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
@@ -7547,6 +7587,33 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/ruby_native_extension/passenger_native_support.c"=>
   [],
+ "test/cxx/Base64DecodingTest.cpp"=>
+  ["src/cxx_supportlib/BackgroundEventLoop.h",
+   "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/FileDescriptor.h",
+   "src/cxx_supportlib/InstanceDirectory.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/RandomGenerator.h",
+   "src/cxx_supportlib/ResourceLocator.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Utils/IOUtils.h",
+   "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/SystemTime.h",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp",
+   "test/cxx/../tut/tut.h",
+   "test/cxx/TestSupport.h"],
  "test/cxx/BufferedIOTest.cpp"=>
   ["src/cxx_supportlib/BackgroundEventLoop.h",
    "src/cxx_supportlib/Constants.h",
@@ -8222,6 +8289,39 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/tracable_exception.hpp",
    "test/cxx/../tut/tut.h",
    "test/cxx/TestSupport.h"],
+ "test/cxx/Core/SecurityUpdateCheckerTest.cpp"=>
+  ["src/agent/Core/SecurityUpdateChecker.h",
+   "src/cxx_supportlib/BackgroundEventLoop.h",
+   "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/Crypto.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/FileDescriptor.h",
+   "src/cxx_supportlib/InstanceDirectory.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/RandomGenerator.h",
+   "src/cxx_supportlib/ResourceLocator.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Utils/IOUtils.h",
+   "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/SystemTime.h",
+   "src/cxx_supportlib/oxt/backtrace.hpp",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp",
+   "test/cxx/../tut/tut.h",
+   "test/cxx/TestSupport.h"],
  "test/cxx/Core/SpawningKit/DirectSpawnerTest.cpp"=>
   ["src/agent/Core/ApplicationPool/Options.h",
    "src/agent/Core/SpawningKit/BackgroundIOCapturer.h",

data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb

@@ -251,10 +251,13 @@ module CxxCodeBuilder
     #    * foo
     #    * bar
     #    */
-    def comment(text)
+    def comment(text, indent_level = 0)
       add_code '/*'
       prefix = @indent_string * @indent_level
       prefix << ' * '
+      if indent_level > 0
+        prefix << ' ' * indent_level
+      end
       @code << reindent(unindent(text.to_s), prefix, false)
       @code << "\n"
       add_code_without_newline '-'

data/build/test_basics.rb

@@ -57,8 +57,7 @@ task 'test:install_deps' do
   end
 
   if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
-    # workaround for issue "bluecloth not found" when using 1.12.1
-    sh "#{gem_install} bundler --version 1.11.2"
+    sh "#{gem_install} bundler"
   end
 
   if install_base_deps && install_doctools
@@ -71,7 +70,18 @@ task 'test:install_deps' do
       sh "bundle install #{bundle_args} --without base"
     end
   end
+  
+  if install_doctools
+    # workaround for issue "bluecloth not found" when using 1.12.x
+    sh "#{gem_install} bundler --version 1.11.2"
+    sh "rvm list"
+  end
+
   if boolean_option('USH_BUNDLES', default)
+    # see what is available for Submodule tests just in case Travis CI environment changes
+    # || true to avoid missing rvm command triggering a failure on Jenkins CI
+    sh "rvm list || true"
+    
     sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core" \
       " && bundle install #{bundle_args} --with travis --without doc notravis"
     sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails" \