passenger 5.0.18 → 5.0.19

data/build/nginx.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,13 +21,13 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-auto_generated_sources = [
-  'ext/nginx/ConfigurationCommands.c',
-  'ext/nginx/CreateLocationConfig.c',
-  'ext/nginx/MergeLocationConfig.c',
-  'ext/nginx/CacheLocationConfig.c',
-  'ext/nginx/ConfigurationFields.h'
-]
+auto_generated_sources = %w(
+  src/nginx_module/ConfigurationCommands.c
+  src/nginx_module/CreateLocationConfig.c
+  src/nginx_module/MergeLocationConfig.c
+  src/nginx_module/CacheLocationConfig.c
+  src/nginx_module/ConfigurationFields.h
+)
 
 desc "Build Nginx support files"
 task :nginx => [
@@ -40,7 +40,7 @@ task :_nginx => :nginx
 
 task :nginx_without_native_support => [
   auto_generated_sources,
-  AGENT_OUTPUT_DIR + AGENT_EXE,
+  AGENT_TARGET,
   COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
 ].flatten
 
@@ -53,7 +53,7 @@ end
 def create_nginx_auto_generated_source_task(source)
   dependencies = [
     "#{source}.erb",
-    'lib/phusion_passenger/nginx/config_options.rb'
+    'src/ruby_supportlib/phusion_passenger/nginx/config_options.rb'
   ]
   file(source => dependencies) do
     template = TemplateRenderer.new("#{source}.erb")

data/build/oxt_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,37 +23,46 @@
 
 ### OXT library tests ###
 
-TEST_OXT_CFLAGS = "#{EXTRA_PRE_CXXFLAGS} -Iext -Itest/support #{TEST_COMMON_CFLAGS}"
-TEST_OXT_LDFLAGS = "#{TEST_BOOST_OXT_LIBRARY} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}"
-TEST_OXT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
+TEST_OXT_TARGET = "#{TEST_OUTPUT_DIR}oxt/main"
 TEST_OXT_OBJECTS = {
-  'oxt_test_main.o' => %w(oxt_test_main.cpp),
-  'backtrace_test.o' => %w(backtrace_test.cpp counter.hpp),
-  'spin_lock_test.o' => %w(spin_lock_test.cpp),
-  'dynamic_thread_group_test.o' => %w(dynamic_thread_group_test.cpp counter.hpp),
-  'syscall_interruption_test.o' => %w(syscall_interruption_test.cpp)
+  "#{TEST_OUTPUT_DIR}oxt/oxt_test_main.o" => "test/oxt/oxt_test_main.cpp",
+  "#{TEST_OUTPUT_DIR}oxt/backtrace_test.o" => "test/oxt/backtrace_test.cpp",
+  "#{TEST_OUTPUT_DIR}oxt/spin_lock_test.o" => "test/oxt/spin_lock_test.cpp",
+  "#{TEST_OUTPUT_DIR}oxt/dynamic_thread_group_test.o" => "test/oxt/dynamic_thread_group_test.cpp",
+  "#{TEST_OUTPUT_DIR}oxt/syscall_interruption_test.o" => "test/oxt/syscall_interruption_test.cpp"
 }
 
-desc "Run unit tests for the OXT library"
-task 'test:oxt' => 'test/oxt/oxt_test_main' do
-  sh "cd test && ./oxt/oxt_test_main"
+# Define compilation tasks for object files.
+TEST_OXT_OBJECTS.each_pair do |object, source|
+  define_cxx_object_compilation_task(
+    object,
+    source,
+    :include_paths => [
+      "test/support",
+      *CXX_SUPPORTLIB_INCLUDE_PATHS
+    ],
+    :flags => TEST_COMMON_CFLAGS
+  )
 end
 
-# Define task for test/oxt/oxt_test_main.
-oxt_test_main_dependencies = TEST_OXT_OBJECTS.keys.map do |object|
-  "test/oxt/#{object}"
-end
-oxt_test_main_dependencies << TEST_BOOST_OXT_LIBRARY
-file 'test/oxt/oxt_test_main' => oxt_test_main_dependencies do
-  objects = TEST_OXT_OBJECTS.keys.map{ |x| "test/oxt/#{x}" }.join(' ')
-  create_executable("test/oxt/oxt_test_main", objects, TEST_OXT_LDFLAGS)
+# Define compilation task for the test executable.
+dependencies = TEST_OXT_OBJECTS.keys + [TEST_BOOST_OXT_LIBRARY]
+file(TEST_OXT_TARGET => dependencies) do
+  flags = [
+    TEST_BOOST_OXT_LIBRARY,
+    PlatformInfo.portability_cxx_ldflags
+  ]
+  if USE_ASAN
+    flags << PlatformInfo.adress_sanitizer_flag
+  end
+  create_cxx_executable(
+    TEST_OXT_TARGET,
+    TEST_OXT_OBJECTS.keys,
+    :flags => flags
+  )
 end
 
-# Define tasks for each OXT test source file.
-TEST_OXT_OBJECTS.each_pair do |target, sources|
-  file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } do
-    source = "test/oxt/#{sources[0]}"
-    object = source.sub(/\.cpp$/, '.o')
-    compile_cxx source, "#{TEST_OXT_CFLAGS} -o #{object}"
-  end
+desc "Run unit tests for the OXT library"
+task 'test:oxt' => TEST_OXT_TARGET do
+  sh "cd test && #{File.expand_path(TEST_OXT_TARGET)}"
 end

data/build/packaging.rb

@@ -605,9 +605,9 @@ task :fakeroot => [:apache2, :nginx, :doc] do
   sh "mkdir -p #{fake_nodelibdir}"
   sh "cp -R #{PhusionPassenger.node_libdir}/phusion_passenger #{fake_nodelibdir}/"
 
-  # Phusion Passenger common libraries
+  # C++ support libraries
   sh "mkdir -p #{fake_libdir}"
-  sh "cp -R #{PhusionPassenger.lib_dir}/common #{fake_libdir}/"
+  sh "cp -R #{COMMON_OUTPUT_DIR} #{fake_libdir}/"
   sh "rm -rf #{fake_libdir}/common/libboost_oxt"
 
   # Ruby extension binaries
@@ -635,18 +635,18 @@ task :fakeroot => [:apache2, :nginx, :doc] do
   sh "mkdir -p #{fake_include_dir}"
   # Infer headers that the Nginx module needs
   headers = []
-  Dir["ext/nginx/*.[ch]"].each do |filename|
-    File.read(filename).split("\n").grep(%r{#include "common/(.+)"}) do |match|
-      headers << ["ext/common/#{$1}", "common/#{$1}"]
+  Dir["src/nginx_module/*.[ch]"].each do |filename|
+    File.read(filename).split("\n").grep(%r{#include "cxx_supportlib/(.+)"}) do |match|
+      headers << ["src/cxx_supportlib/#{$1}", "cxx_supportlib/#{$1}"]
     end
   end
   # Manually add headers that could not be inferred through
   # the above code
   headers.concat([
-    ["ext/common/Exceptions.h", "common/Exceptions.h"],
-    ["ext/common/Utils/modp_b64.h", "common/Utils/modp_b64.h"],
-    ["ext/common/Utils/modp_b64_data.h", "common/Utils/modp_b64_data.h"],
-    ["ext/boost/detail/endian.hpp", "boost/detail/endian.hpp"]
+    ["src/cxx_supportlib/Exceptions.h", "cxx_supportlib/Exceptions.h"],
+    ["src/cxx_supportlib/vendor-modified/modp_b64.h", "cxx_supportlib/vendor-modified/modp_b64.h"],
+    ["src/cxx_supportlib/vendor-modified/modp_b64_data.h", "cxx_supportlib/vendor-modified/modp_b64_data.h"],
+    ["src/cxx_supportlib/vendor-modified/boost/detail/endian.hpp", "cxx_supportlib/vendor-modified/boost/detail/endian.hpp"]
   ])
   headers.each do |header|
     target = "#{fake_include_dir}/#{header[1]}"
@@ -659,7 +659,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 
   # Nginx module sources
   sh "mkdir -p #{fake_nginx_module_source_dir}"
-  sh "cp ext/nginx/* #{fake_nginx_module_source_dir}/"
+  sh "cp src/nginx_module/* #{fake_nginx_module_source_dir}/"
 
   # Documentation
   sh "mkdir -p #{fake_docdir}"
@@ -692,7 +692,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 
   # Apache 2 module
   sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
-  sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
+  sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
 
   # Ruby extension sources
   sh "mkdir -p #{fake_ruby_extension_source_dir}"

data/build/ruby_extension.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -34,7 +34,7 @@ if !PlatformInfo.passenger_needs_ruby_dev_header?
 else
   output_dir  = RUBY_EXTENSION_OUTPUT_DIR
   output_name = "passenger_native_support.#{LIBEXT}"
-  source_dir  = "ext/ruby"
+  source_dir  = "src/ruby_native_extension"
   NATIVE_SUPPORT_TARGET = File.join(output_dir, output_name)
 
   task :native_support => NATIVE_SUPPORT_TARGET

data/build/ruby_tests.rb

@@ -23,7 +23,7 @@
 
 ### Ruby components tests ###
 
-dependencies = [NATIVE_SUPPORT_TARGET, AGENT_OUTPUT_DIR + AGENT_EXE].compact
+dependencies = [NATIVE_SUPPORT_TARGET, AGENT_TARGET].compact
 desc "Run unit tests for the Ruby libraries"
 task 'test:ruby' => dependencies do
   if maybe_grep = string_option('E')

data/build/test_basics.rb

@@ -23,23 +23,22 @@
 
 TEST_BOOST_OXT_LIBRARY = LIBBOOST_OXT
 TEST_COMMON_LIBRARY    = COMMON_LIBRARY
-
-TEST_COMMON_CFLAGS = "-DTESTING_APPLICATION_POOL #{EXTRA_CXXFLAGS}"
+TEST_COMMON_CFLAGS     = "-DTESTING_APPLICATION_POOL"
 
 desc "Run all unit tests and integration tests"
 task :test => ['test:oxt', 'test:cxx', 'test:ruby', 'test:node', 'test:integration']
 
 desc "Clean all compiled test files"
 task 'test:clean' do
-  sh("rm -rf test/oxt/oxt_test_main test/oxt/*.o test/cxx/*.dSYM test/cxx/CxxTestMain")
-  sh("rm -f test/cxx/*.o test/cxx/*/*.o test/cxx/*.gch")
-  sh("rm -f test/support/allocate_memory")
+  sh("rm -rf #{TEST_OUTPUT_DIR}")
+  sh("rm -f test/cxx/*.gch")
 end
 
 task :clean => 'test:clean'
 
-file 'test/support/allocate_memory' => 'test/support/allocate_memory.c' do
-  create_c_executable('test/support/allocate_memory', 'test/support/allocate_memory.c')
+file "#{TEST_OUTPUT_DIR}allocate_memory" => 'test/support/allocate_memory.c' do
+  compile_c("#{TEST_OUTPUT_DIR}allocate_memory.o", 'test/support/allocate_memory.c')
+  create_c_executable("#{TEST_OUTPUT_DIR}allocate_memory", "#{TEST_OUTPUT_DIR}allocate_memory.o")
 end
 
 desc "Install developer dependencies"
@@ -52,9 +51,11 @@ task 'test:install_deps' do
 
   if deps_target = string_option('DEPS_TARGET')
     bundle_args = "--path #{deps_target} #{ENV['BUNDLE_ARGS']}".strip
+  else
+    bundle_args = ENV['BUNDLE_ARGS'].to_s
   end
 
-  if !PlatformInfo.locate_ruby_tool('bundle')
+  if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
     sh "#{gem_install} bundler"
   end
 
@@ -68,16 +69,23 @@ task 'test:install_deps' do
       sh "bundle install #{bundle_args} --without base"
     end
   end
-  if boolean_option('RAILS_BUNDLES', default)
-    sh "cd test/stub/rails3.0 && bundle install #{bundle_args}"
-    sh "cd test/stub/rails3.1 && bundle install #{bundle_args}"
-    sh "cd test/stub/rails3.2 && bundle install #{bundle_args}"
-    if RUBY_VERSION >= '1.9'
-      sh "cd test/stub/rails4.0 && bundle install #{bundle_args}"
-      sh "cd test/stub/rails4.1 && bundle install #{bundle_args}"
-    end
+  if boolean_option('USH_BUNDLES', default)
+    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" \
+      " && bundle install #{bundle_args} --without doc notravis"
+    sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails" \
+      " && bundle exec rake install_test_app_bundles" \
+      " BUNDLE_ARGS='#{bundle_args}'"
   end
   if boolean_option('NODE_MODULES', default)
     sh "npm install"
   end
 end
+
+
+def bundler_too_old?
+  `bundle --version` =~ /version (.+)/
+  version = $1.split('.').map { |x| x.to_i }
+  version[0] < 1 || version[0] == 1 && version[1] < 10
+end

data/dev/ci/run_travis.sh

@@ -10,8 +10,8 @@ PASSENGER_ROOT_ON_DOCKER_HOST=${PASSENGER_ROOT_ON_DOCKER_HOST:-$PASSENGER_ROOT}
 if [[ "$CACHE_DIR_ON_DOCKER_HOST" != "" ]]; then
 	CACHE_DIR=/host_cache
 else
-	CACHE_DIR=/tmp
-	CACHE_DIR_ON_DOCKER_HOST=/tmp
+	CACHE_DIR="$PWD/cache"
+	CACHE_DIR_ON_DOCKER_HOST="$PWD/cache"
 fi
 
 COMPILE_CONCURRENCY=${COMPILE_CONCURRENCY:-2}
@@ -21,6 +21,11 @@ export TRACE=1
 export DEVDEPS_DEFAULT=no
 export rvmsudo_secure_path=1
 export LC_CTYPE=C.UTF-8
+export DEPS_TARGET="$CACHE_DIR/bundle"
+export USE_CCACHE=true
+export CCACHE_DIR="$CACHE_DIR/ccache"
+export CCACHE_COMPRESS=1
+export CCACHE_COMPRESS_LEVEL=3
 unset BUNDLE_GEMFILE
 
 if [[ -e /etc/workaround-docker-2267 ]]; then
@@ -32,6 +37,9 @@ else
 	HOSTS_FILE=/etc/hosts
 fi
 
+mkdir -p "$DEPS_TARGET"
+mkdir -p "$CCACHE_DIR"
+
 sudo sh -c "cat >> $HOSTS_FILE" <<EOF
 127.0.0.1 passenger.test
 127.0.0.1 mycook.passenger.test
@@ -122,12 +130,12 @@ function install_node_and_modules()
 		install_node_and_modules=1
 		if [[ -e /host_cache ]]; then
 			if [[ ! -e /host_cache/node-v0.10.20-linux-x64.tar.gz ]]; then
-				run curl --fail -o /host_cache/node-v0.10.20-linux-x64.tar.gz \
-					http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+				run curl --fail -L -o /host_cache/node-v0.10.20-linux-x64.tar.gz \
+					https://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
 			fi
 			run tar xzf /host_cache/node-v0.10.20-linux-x64.tar.gz
 		else
-			run curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+			run curl --fail -L -O https://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
 			run tar xzf node-v0.10.20-linux-x64.tar.gz
 		fi
 		export PATH=`pwd`/node-v0.10.20-linux-x64/bin:$PATH
@@ -177,10 +185,24 @@ if [[ "$TEST_CXX" = 1 ]]; then
 fi
 
 if [[ "$TEST_RUBY" = 1 ]]; then
-	retry_run 3 rake_test_install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
+	retry_run 3 rake_test_install_deps BASE_DEPS=yes
 	run bundle exec drake -j$COMPILE_CONCURRENCY test:ruby
 fi
 
+if [[ "$TEST_USH" = 1 ]]; then
+	retry_run 3 rake_test_install_deps BASE_DEPS=yes USH_BUNDLES=yes
+	export PASSENGER_CONFIG="$PWD/bin/passenger-config"
+	run "$PASSENGER_CONFIG" install-standalone-runtime --auto
+
+	pushd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core
+	bundle exec rake spec:travis
+	popd
+
+	pushd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails
+	bundle exec rake spec:travis GEM_BUNDLE_PATH="$DEPS_TARGET"
+	popd
+fi
+
 if [[ "$TEST_NODE" = 1 ]]; then
 	install_node_and_modules
 	run bundle exec drake -j$COMPILE_CONCURRENCY test:node

data/dev/index_cxx_dependencies.rb

@@ -0,0 +1,206 @@
+#!/usr/bin/env ruby
+require 'pp'
+
+SEARCH_PATHS = [
+  "src",
+  "src/agent",
+  "src/cxx_supportlib",
+  "src/cxx_supportlib/vendor-copy",
+  "src/cxx_supportlib/vendor-modified",
+  "test/cxx"
+]
+SCAN_FILES = Dir[
+  "src/**/*.{c,cpp,h,hpp}",
+  "test/oxt/**/*.{c,cpp,h,hpp}",
+  "test/cxx/**/*.{c,cpp,h,hpp}"
+]
+EXCLUDE_FILES = Dir[
+  "src/cxx_supportlib/vendor-copy/**/*",
+  "src/cxx_supportlib/vendor-modified/**/*"
+]
+EXCLUDE_FILES_INDEX = Hash[EXCLUDE_FILES.map { |v| [v, true] }]
+EXCLUDE_NAMES = %w{
+  string
+  vector
+  map
+  list
+  set
+  exception
+  utility
+  stdexcept
+  iterator
+  iostream
+  ostream
+  sstream
+  fstream
+  algorithm
+  iomanip
+  ios
+  memory
+  new
+  unordered_map
+  typeinfo
+  deque
+  queue
+  limits
+  hash_map
+  ext/hash_map
+  cctype
+  cassert
+  cstdio
+  cstdlib
+  cstddef
+  cstdarg
+  cstring
+  ctime
+  csignal
+  cmath
+  cerrno
+  climits
+
+  stdio.h
+  stdio_ext.h
+  stdlib.h
+  stdint.h
+  stddef.h
+  string.h
+  limits.h
+  ctype.h
+  assert.h
+  errno.h
+  time.h
+  alloca.h
+  features.h
+  cxxabi.h
+
+  unistd.h
+  signal.h
+  pthread.h
+  pwd.h
+  port.h
+  grp.h
+  fcntl.h
+  sched.h
+  execinfo.h
+  poll.h
+  dirent.h
+  utime.h
+  libgen.h
+  netdb.h
+  Availability.h
+  selinux/selinux.h
+  BaseTsd.h
+  libkern/OSAtomic.h
+
+  httpd.h
+  unixd.h
+  nginx.h
+  util_script.h
+  ev++.h
+  ev.h
+  uv.h
+  zlib.h
+  version.h
+}
+EXCLUDE_NAMES_INDEX = Hash[EXCLUDE_NAMES.map { |v| [v, true] }]
+EXCLUDE_NAME_REGEXP = %r{
+  ^(
+    sys/
+    |mach/
+    |netinet/
+    |inet/
+    |vm/
+    |arpa/
+    |linux/
+    |tr1/
+    |curl/
+    |ruby
+    |apr_
+    |ap_
+    |http_
+    |ngx_
+  ).+
+}x
+
+def extract_dependencies(source)
+  result = []
+  File.open(source, "r") do |f|
+    f.each do |line|
+      next if line !~ /^[\s\t]*#include (<.+?>|".+?")/
+
+      raw_name = $1
+      name = raw_name.gsub(/["<>]/, "")
+      next if name_excluded?(name)
+
+      if raw_name =~ /"(.+)"/
+        dependency = search_include_file($1, File.dirname(source))
+      elsif raw_name =~ /<(.+)>/
+        dependency = search_include_file($1)
+      else
+        STDERR.puts "Warning: ignoring invalid include statement in #{source}: #{line.strip}"
+        dependency = nil
+      end
+
+      if dependency
+        if !EXCLUDE_FILES_INDEX.has_key?(dependency)
+          result << dependency
+        end
+      else
+        STDERR.puts "Warning: cannot find include file #{raw_name} (referenced from #{source})"
+      end
+    end
+  end
+  result
+end
+
+def search_include_file(name, first_search_path = nil)
+  if first_search_path
+    search_paths = [first_search_path] + SEARCH_PATHS
+  else
+    search_paths = SEARCH_PATHS
+  end
+  search_paths.each do |path|
+    if File.exist?("#{path}/#{name}")
+      return "#{path}/#{name}"
+    end
+  end
+  nil
+end
+
+def name_excluded?(name)
+  EXCLUDE_NAMES_INDEX.has_key?(name) || EXCLUDE_NAME_REGEXP =~ name
+end
+
+def generate_basic_map
+  result = {}
+  (SCAN_FILES - EXCLUDE_FILES).each do |source_file|
+    result[source_file] = extract_dependencies(source_file)
+  end
+  result
+end
+
+def gather_all_dependencies_recursively(source_file, basic_map, result)
+  deps = basic_map[source_file]
+  if deps
+    deps.each do |dep|
+      result[dep] = true
+      gather_all_dependencies_recursively(dep, basic_map, result)
+    end
+  end
+end
+
+def generate_full_map(basic_map)
+  result = {}
+  basic_map.each_pair do |source_file, deps|
+    gather_results = {}
+    gather_all_dependencies_recursively(
+      source_file, basic_map, gather_results)
+    result[source_file] = gather_results.keys
+  end
+  result
+end
+
+result = generate_full_map(generate_basic_map)
+puts "# Autogenerated by dev/index_cxx_dependencies.rb"
+puts "CXX_DEPENDENCY_MAP ="
+PP.pp(result, STDOUT, 1)