passenger 5.1.4 → 5.1.5

data/build/test_basics.rb

@@ -51,7 +51,7 @@ task 'test:install_deps' do
   install_doctools  = boolean_option('DOCTOOLS', default)
 
   if deps_target = string_option('DEPS_TARGET')
-    bundle_args = "--path #{deps_target} #{ENV['BUNDLE_ARGS']}".strip
+    bundle_args = "--path #{Shellwords.escape deps_target} #{ENV['BUNDLE_ARGS']}".strip
   else
     bundle_args = ENV['BUNDLE_ARGS'].to_s
   end
@@ -70,7 +70,7 @@ 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"
@@ -81,7 +81,7 @@ task 'test:install_deps' do
     # 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" \

data/dev/boost-patches/0001-Patch-boost-thread-so-that-oxt-thread-can-use-it.patch

@@ -0,0 +1,48 @@
+From 6b92660c98818a3f9630492cf8c79b8c610b3cef Mon Sep 17 00:00:00 2001
+From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
+Date: Mon, 15 Feb 2016 12:21:52 +0100
+Subject: [PATCH] Patch boost::thread so that oxt::thread can use it
+
+---
+ src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp | 4 ++--
+ src/cxx_supportlib/vendor-modified/boost/thread/once.hpp          | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp
+index 9e7e8b8f5..fa6edc2b5 100644
+--- a/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp
+@@ -162,7 +162,7 @@ namespace boost
+       typedef thread_attributes attributes;
+ 
+       BOOST_THREAD_MOVABLE_ONLY(thread)
+-    private:
++    protected:
+ 
+         struct dummy;
+ 
+@@ -170,7 +170,7 @@ namespace boost
+ 
+         detail::thread_data_ptr thread_info;
+ 
+-    private:
++    protected:
+         bool start_thread_noexcept();
+         bool start_thread_noexcept(const attributes& attr);
+         void start_thread()
+diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp
+index 9fcfb5333..9a3e9e55d 100644
+--- a/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp
+@@ -32,7 +32,7 @@ namespace boost
+   // template<class Callable, class ...Args> void
+   // call_once(once_flag& flag, Callable&& func, Args&&... args);
+ template<typename Function>
+-inline void call_once(Function func,once_flag& flag)
++inline void call_once(Function func,boost::once_flag& flag)
+ //inline void call_once(void (*func)(),once_flag& flag)
+     {
+         call_once(flag,func);
+-- 
+2.13.0
+

data/dev/boost-patches/0002-Make-boost-thread_interrupted-derive-from-oxt-tracab.patch

@@ -0,0 +1,33 @@
+From 581af47e251b34f0ae410c29758884c1f033610e Mon Sep 17 00:00:00 2001
+From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
+Date: Mon, 15 Feb 2016 12:22:44 +0100
+Subject: [PATCH] Make boost::thread_interrupted derive from
+ oxt::tracable_exception
+
+---
+ src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp
+index d97465b75..3f780bfb1 100644
+--- a/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp
+@@ -21,6 +21,7 @@
+ #include <stdexcept>
+ #include <boost/system/system_error.hpp>
+ #include <boost/system/error_code.hpp>
++#include <oxt/tracable_exception.hpp>
+ 
+ 
+ #include <boost/config/abi_prefix.hpp>
+@@ -30,6 +31,7 @@ namespace boost
+ 
+ #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+     class BOOST_SYMBOL_VISIBLE thread_interrupted
++      : public oxt::tracable_exception
+     {};
+ #endif
+ 
+-- 
+2.13.0
+

data/dev/boost-patches/0003-Disable-a-Clang-pragma-to-prevent-warnings-on-OS-X.patch

@@ -0,0 +1,25 @@
+From 4503df46a907a46a37238bbff04f887c65c7f376 Mon Sep 17 00:00:00 2001
+From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
+Date: Mon, 15 Feb 2016 12:38:22 +0100
+Subject: [PATCH] Disable a Clang pragma to prevent warnings on OS X
+
+---
+ src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp b/src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp
+index 05ac71a68..5e63db629 100644
+--- a/src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp
++++ b/src/cxx_supportlib/vendor-modified/boost/regex/v4/instances.hpp
+@@ -121,7 +121,7 @@ template class BOOST_REGEX_TEMPLATE_DECL ::boost::BOOST_REGEX_DETAIL_NS::perl_ma
+ 
+ #ifdef __clang__
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wkeyword-macro"
++//#pragma clang diagnostic ignored "-Wkeyword-macro"
+ #endif
+ 
+ #  ifndef BOOST_REGEX_INSTANTIATE
+-- 
+2.13.0
+

data/dev/ci/README.md

@@ -0,0 +1,121 @@
+# Continuous integration test suite
+
+This directory contains scripts that invoke the Passenger test suite. These scripts are invoked from the Passenger continuous integration environment, based on Jenkins.
+
+The following diagrams explain how the different files fit together.
+
+## Flow on Linux
+
+~~~
+Invoke: dev/ci/setup-host
+   |     |
+   |     +-- Load: dev/ci/scripts/setup-host
+   |           |
+   |           +-- Relax file permissions (if in Jenkins)
+   |           |
+   |           +-- Create cache directories
+   |
+Invoke: dev/ci/run-tests-with-docker <test name>
+   |
+   +-- Exec: Docker container
+       Entrypoint: dev/ci/scripts/docker-entrypoint.sh
+         |
+         +-- Exec: dev/ci/scripts/debug-console-wrapper.sh dev/ci/scripts/docker-entrypoint-stage2.sh
+               |
+               +-- Invoke: dev/ci/scripts/docker-entrypoint-stage2.sh
+               |     |
+               |     +-- Load: dev/ci/lib/setup-container.sh <test name>
+               |     |     |
+               |     |     +-- Create test/config.json
+               |     |     |
+               |     |     +-- Relax home permission
+               |     |     |
+               |     |     +-- Remove previous build products
+               |     |     |
+               |     |     +-- Load: dev/ci/lib/set-container-envvars.sh
+               |     |     |     |
+               |     |     |     +-- Set RVM version and various envvars
+               |     |     |
+               |     |     +-- Load: dev/ci/tests/<test name>/setup
+               |     |
+               |     +-- Load: dev/ci/tests/<test name>/run
+               |
+               +-- (if docker-entrypoint-stage2.sh exited with an error,
+               |    and DEBUG_CONSOLE is set to 0)
+               |   Print error message and exit
+               |
+               +-- (if docker-entrypoint-stage2.sh exited with an error,
+                    and DEBUG_CONSOLE is set to 1)
+                      |
+                      +-- Load: dev/ci/lib/set-container-envvars.sh
+                      |     |
+                      |     +-- Set RVM version and various envvars
+                      |
+                      +-- Invoke: bash
+~~~
+
+## Flow on macOS
+
+~~~
+Invoke: dev/ci/setup-host <test name>
+   |      |
+   |      +-- Relax file permissions (if in Jenkins)
+   |      |
+   |      +-- Create cache directories
+   |      |
+   |      +-- Exec: dev/ci/scripts/debug-console-wrapper.sh dev/ci/scripts/setup-host-natively.sh <test name>
+   |           |
+   |           +-- Invoke: dev/ci/scripts/setup-host-natively.sh
+   |           |     |
+   |           |     +-- Load: dev/ci/lib/setup-container.sh
+   |           |           |
+   |           |           +-- Create test/config.json
+   |           |           |
+   |           |           +-- Relax home permission
+   |           |           |
+   |           |           +-- Remove previous build products
+   |           |           |
+   |           |           +-- Load: dev/ci/lib/set-container-envvars.sh
+   |           |           |     |
+   |           |           |     +-- Set RVM version and various envvars
+   |           |           |
+   |           |           +-- Load: dev/ci/tests/<test name>/setup
+   |           |
+   |           +-- (if setup-host exited with an error,
+   |           |    and DEBUG_CONSOLE is set to 0)
+   |           |   Print error message and exit
+   |           |
+   |           +-- (if setup-host exited with an error,
+   |                and DEBUG_CONSOLE is set to 1)
+   |                 |
+   |                 +-- Load: dev/ci/lib/set-container-envvars.sh
+   |                 |     |
+   |                 |     +-- Set RVM version and various envvars
+   |                 |
+   |                 +-- Invoke: bash
+   |
+Invoke: dev/ci/run-tests-natively <test name>
+   |
+   +-- Exec: dev/ci/scripts/debug-console-wrapper.sh dev/ci/scripts/run-tests-natively-stage2.sh <test name>
+         |
+         +-- Invoke: dev/ci/scripts/run-tests-natively-stage2.sh
+         |     |
+         |     +-- Load: dev/lib/set-container-envvars.sh
+         |     |     |
+         |     |     +-- Set RVM version and various envvars
+         |     |
+         |     +-- Load: dev/ci/tests/<test name>/run
+         |
+         +-- (if run-tests-natively-stage2.sh exited with an error,
+         |    and DEBUG_CONSOLE is set to 0)
+         |   Print error message and exit
+         |
+         +-- (if run-tests-natively-stage2.sh exited with an error,
+              and DEBUG_CONSOLE is set to 1)
+               |
+               +-- Load: dev/ci/lib/set-container-envvars.sh
+               |     |
+               |     +-- Set RVM version and various envvars
+               |
+               +-- Invoke: bash
+~~~

data/dev/ci/lib/functions.sh

@@ -0,0 +1,129 @@
+#!/bin/bash
+set -e
+
+RESET=$(echo -e "\033[0m")
+BOLD=$(echo -e "\033[1m")
+YELLOW=$(echo -e "\033[33m")
+BLUE_BG=$(echo -e "\033[44m")
+
+function header()
+{
+	local title="$1"
+	echo "${BLUE_BG}${YELLOW}${BOLD}${title}${RESET}"
+	echo "------------------------------------------"
+}
+
+function header2()
+{
+	local title="$1"
+	echo "### ${BOLD}${title}${RESET}"
+	echo
+}
+
+function run()
+{
+	echo "+ $*"
+	"$@"
+}
+
+function run_exec()
+{
+	echo "+ exec $*"
+	exec "$@"
+}
+
+function retry_run()
+{
+	local reset='\x1B[0m'
+	local red='\x1B[31m'
+	local yellow='\x1B[33m'
+
+	local max_tries="$1"
+	local number=2
+	shift
+
+	echo "+ $*"
+	while true; do
+		if "$@"; then
+			return 0
+		elif [[ $number -le $max_tries ]]; then
+			echo -e "${yellow}The command \"$*\" failed. Retrying, $number of $max_tries:${reset}"
+			(( number++ ))
+		else
+			echo -e "${red}The command \"$*\" failed after $max_tries attempts. Giving up.${reset}"
+			return 1
+		fi
+	done
+}
+
+function autodetect_environment()
+{
+	echo "Environment autodetection results:"
+	if [[ "$JENKINS_HOME" != "" ]]; then
+		echo "Running in Jenkins: yes"
+		export IN_JEKINS=true
+		export CACHE_DIR="$JENKINS_HOME/cache/$JOB_NAME/executor-$EXECUTOR_NUMBER"
+	else
+		echo "Running in Jenkins: no"
+		export IN_JENKINS=false
+		export CACHE_DIR="$PASSENGER_ROOT/.ci_cache"
+	fi
+	if [[ -e /usr/bin/sw_vers ]]; then
+		echo "Operating system: macOS"
+		export OS=macos
+	else
+		echo "Operating system: Linux"
+		export OS=linux
+	fi
+	echo "Cache directory: $CACHE_DIR"
+}
+
+function sanity_check_environment()
+{
+	if $IN_JENKINS; then
+		if [[ "$JOB_NAME" = "" ]]; then
+			echo "ERROR: Jenkins environment detected, but JOB_NAME environment variable not set." >&2
+			return 1
+		fi
+		if [[ "$EXECUTOR_NUMBER" = "" ]]; then
+			echo "ERROR: Jenkins environment detected, but EXECUTOR_NUMBER environment variable not set." >&2
+			return 1
+		fi
+	fi
+}
+
+# The following is necessary to make the C++ tests work.
+# They invoke Ruby scripts which require gems installed
+# by Bundler, but these scripts are not invoked with
+# Bundler, so they can only find these gems through GEM_PATH.
+function add_bundler_path_to_gem_path()
+{
+	local bundle_path
+	
+	if bundle_path=$(bundle show rake); then
+		bundle_path=$(dirname "$bundle_path")
+		bundle_path=$(dirname "$bundle_path")
+		echo "Adding $bundle_path to GEM_PATH"
+		export GEM_PATH="$bundle_path:$GEM_PATH"
+
+		local bundle_bin_path="$bundle_path/bin"
+		echo "Adding $bundle_bin_path to PATH"
+		export PATH="$bundle_bin_path:$PATH"
+	fi
+}
+
+function _cleanup()
+{
+	set +e
+	local pids
+	pids=$(jobs -p)
+	if [[ "$pids" != "" ]]; then
+		# shellcheck disable=SC2086
+		kill $pids 2>/dev/null
+	fi
+	if [[ $(type -t cleanup) == function ]]; then
+		cleanup
+	fi
+}
+
+trap _cleanup EXIT

data/dev/ci/lib/set-container-envvars.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Do not `set -e` here because debug-console-wrapper.sh
+# relies on this fact.
+
+export DEVDEPS_DEFAULT=no
+# shellcheck disable=SC2153
+export DEPS_TARGET="$CACHE_DIR/bundle"
+export USE_CCACHE=true
+export COMPILE_CONCURRENCY=${COMPILE_CONCURRENCY:-2}
+export CCACHE_DIR="$CACHE_DIR/ccache"
+export CCACHE_COMPRESS=1
+export CCACHE_COMPRESSLEVEL=3
+export CCACHE_BASEDIR="$PASSENGER_ROOT"
+export CCACHE_SLOPPINESS=time_macros
+# We want Bundler invocations to be explicit. For example,
+# when running 'rake test:install_deps', we do not want
+# to invoke Bundler there because the goal might be to
+# install the Rake version as specified in the Gemfile,
+# which we may not have yet.
+export NOEXEC_DISABLE=1
+
+if [[ "$OS" = macos ]]; then
+	# Ensure that Homebrew tools can be found
+	export PATH=$PATH:/usr/local/bin
+else
+	export LC_CTYPE=C.UTF-8
+fi
+
+if [[ -f ~/.rvm/scripts/rvm ]]; then
+	# shellcheck source=/dev/null
+	source ~/.rvm/scripts/rvm
+else
+	# shellcheck source=/dev/null
+	source /usr/local/rvm/scripts/rvm
+fi
+
+if [[ "$TEST_RUBY_VERSION" != "" ]]; then
+	header2 "Using Ruby version $TEST_RUBY_VERSION"
+	run rvm use "$TEST_RUBY_VERSION"
+	echo
+fi
+
+# RVM's cd override causes problems (probably thanks to bash
+# error handling being weird and quirky:
+# https://news.ycombinator.com/item?id=14321213)
+unset cd

data/dev/ci/lib/setup-container.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if ! grep -q passenger.test /etc/hosts; then
+	header2 "Updating /etc/hosts"
+	sudo sh -c "cat >> /etc/hosts" <<EOF
+127.0.0.1 passenger.test
+127.0.0.1 mycook.passenger.test
+127.0.0.1 zsfa.passenger.test
+127.0.0.1 norails.passenger.test
+127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test
+127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test
+127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test
+EOF
+	echo
+fi
+
+header2 "Creating test/config.json"
+if [[ "$OS" = linux ]]; then
+	run cp test/config.json.travis test/config.json
+else
+	sed -e "s/_USER_/$USER/" test/config.json.travis-osx > test/config.json
+fi
+echo "+ Done."
+echo
+
+# Relax permissions on home directory so that the application root
+# permission checks pass.
+header2 "Relaxing home permission"
+run chmod g+x,o+x "$HOME"
+echo
+
+header2 "Removing previous build products"
+run rm -rf buildout
+echo
+
+# shellcheck source=../lib/set-container-envvars.sh
+source "$PASSENGER_ROOT/dev/ci/lib/set-container-envvars.sh"
+
+header "Running test-specific preparations"
+# shellcheck source=/dev/null
+source "$PASSENGER_ROOT/dev/ci/tests/$1/setup"
+echo '+ Done.'
+echo