passenger 4.0.20 → 4.0.21

data/build/common_library.rb

@@ -34,7 +34,7 @@ require 'phusion_passenger/common_library'
 # Defines tasks for compiling a static library containing Boost and OXT.
 def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 	output_file = "#{output_dir}.a"
-	flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
 	
 	if false && boolean_option('RELEASE')
 		# Disable RELEASE support. Passenger Standalone wants to link to the
@@ -125,11 +125,16 @@ if USE_VENDORED_LIBEV
 		"ext/libev/Makefile.am"
 	]
 	file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
+		cc = PlatformInfo.cc
+		cxx = PlatformInfo.cxx
 		# Disable all warnings: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-		cflags = "#{EXTRA_CXXFLAGS} -w"
+		cflags = "#{EXTRA_CFLAGS} -w"
 		sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if !File.directory?(LIBEV_OUTPUT_DIR)
 		sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure " +
-			"--disable-shared --enable-static CFLAGS='#{cflags}' orig_CFLAGS=1"
+			"--disable-shared --enable-static " +
+			# libev's configure script may select a different default compiler than we
+			# do, so we force our compiler choice.
+			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
 	end
 	
 	libev_sources = Dir["ext/libev/{*.c,*.h}"]
@@ -172,12 +177,17 @@ if USE_VENDORED_LIBEIO
 		"ext/libeio/Makefile.am"
 	]
 	file LIBEIO_OUTPUT_DIR + "Makefile" => dependencies do
+		cc = PlatformInfo.cc
+		cxx = PlatformInfo.cxx
 		# Disable all warnings. The author has a clear standpoint on that:
 		# http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-		cflags = "#{EXTRA_CXXFLAGS} -w"
+		cflags = "#{EXTRA_CFLAGS} -w"
 		sh "mkdir -p #{LIBEIO_OUTPUT_DIR}" if !File.directory?(LIBEIO_OUTPUT_DIR)
 		sh "cd #{LIBEIO_OUTPUT_DIR} && sh #{LIBEIO_SOURCE_DIR}configure " +
-			"--disable-shared --enable-static CFLAGS='#{cflags}'"
+			"--disable-shared --enable-static " +
+			# libeio's configure script may select a different default compiler than we
+			# do, so we force our compiler choice.
+			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}'"
 	end
 	
 	libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
@@ -219,7 +229,7 @@ end
 
 
 libboost_oxt_cflags = ""
-libboost_oxt_cflags << " -faddress-sanitizer" if USE_ASAN
+libboost_oxt_cflags << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 libboost_oxt_cflags.strip!
 LIBBOOST_OXT = define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt", libboost_oxt_cflags)
 COMMON_LIBRARY.define_tasks(libboost_oxt_cflags)

data/build/cplusplus_support.rb

@@ -53,11 +53,11 @@ def run_compiler(*command)
 	end
 end
 
-def compile_c(source, flags = "#{EXTRA_PRE_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+def compile_c(source, flags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_CFLAGS}")
 	run_compiler "#{CC} #{flags} -c #{source}"
 end
 
-def compile_cxx(source, flags = "#{EXTRA_PRE_CXXFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+def compile_cxx(source, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_CXXFLAGS}")
 	run_compiler "#{CXX} #{flags} -c #{source}"
 end
 
@@ -73,15 +73,15 @@ def create_static_library(target, sources)
 	sh "ranlib #{target}"
 end
 
-def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}")
 	run_compiler "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_LDFLAGS}#{EXTRA_CFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_C_LDFLAGS}")
 	run_compiler "#{CC} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}")
 	if PlatformInfo.os_name == "macosx"
 		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
 	else

data/build/cxx_tests.rb

@@ -26,15 +26,15 @@
 TEST_CXX_CFLAGS = "-Iext -Iext/common " <<
 	"#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
 	"#{TEST_COMMON_CFLAGS}"
-TEST_CXX_CFLAGS << " -faddress-sanitizer" if USE_ASAN
+TEST_CXX_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 TEST_CXX_LDFLAGS = "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
 	"#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
 	"#{PlatformInfo.curl_libs} " <<
 	"#{PlatformInfo.zlib_libs} " <<
 	"#{PlatformInfo.portability_ldflags}"
 TEST_CXX_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
-TEST_CXX_LDFLAGS << " -faddress-sanitizer" if USE_ASAN
-TEST_CXX_LDFLAGS << " #{EXTRA_LDFLAGS}"
+TEST_CXX_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
+TEST_CXX_LDFLAGS << " #{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS}"
 TEST_CXX_LDFLAGS.strip!
 TEST_CXX_OBJECTS = {
 	'test/cxx/CxxTestMain.o' => %w(

data/build/documentation.rb

@@ -35,7 +35,7 @@ Packaging::ASCII_DOCS.each do |target|
 				type = "nginx"
 				juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz"
 			elsif target =~ /standalone/i
-				type = nil
+				type = "standalone"
 				juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy"
 			else
 				type = nil

data/build/misc.rb

@@ -84,23 +84,8 @@ task :news_as_html do
 	require 'cgi'
 	contents, items = extract_latest_news_contents_and_items
 	
-	puts "<dl>"
+	puts "<ul>"
 	items.each do |item|
-		item.strip!
-		
-		# Does this item have a header? It does if it consists of multiple lines, and
-		# the next line is capitalized.
-		lines = item.split("\n")
-		if lines.size > 1 && lines[1].strip[0..0] == lines[1].strip[0..0].upcase
-			puts "<dt>#{lines[0]}</dt>"
-			lines.shift
-			item = lines.join("\n")
-			item.strip!
-		end
-		
-		# Split into paragraphs. Empty lines are paragraph dividers.
-		paragraphs = item.split(/^ *$/m)
-		
 		def format_paragraph(text)
 			# Get rid of newlines: convert them into spaces.
 			text.gsub!("\n", ' ')
@@ -121,27 +106,10 @@ task :news_as_html do
 			end
 			text
 		end
-		
-		if paragraphs.size > 1
-			STDOUT.write("<dd>")
-			paragraphs.each do |paragraph|
-				paragraph.gsub!(/\A\n+/, '')
-				paragraph.gsub!(/\n+\Z/, '')
-				
-				if (paragraph =~ /\A       /)
-					# Looks like a code block.
-					paragraph.gsub!(/^       /m, '')
-					puts "<pre lang=\"ruby\">#{CGI.escapeHTML(paragraph)}</pre>"
-				else
-					puts "<p>#{format_paragraph(paragraph)}</p>"
-				end
-			end
-			STDOUT.write("</dd>\n")
-		else
-			puts "<dd>#{format_paragraph(item)}</dd>"
-		end
+
+		puts "<li>" + format_paragraph(item.strip) + "</li>"
 	end
-	puts "</dl>"
+	puts "</ul>"
 end
 
 desc "Convert the NEWS items for the latest release to Markdown"
@@ -200,7 +168,6 @@ task :compile_app => dependencies do
 		create_executable(exe, source,
 			"-DSTANDALONE " <<
 			"-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
-			"#{PlatformInfo.portability_cflags} " <<
 			"#{EXTRA_CXXFLAGS} " <<
 			"#{COMMON_LIBRARY.link_objects_as_string} " <<
 			"#{LIBBOOST_OXT} " <<

data/build/node_tests.rb

@@ -0,0 +1,29 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+### Node.js components tests ###
+
+desc "Run unit tests for the Node.js libraries"
+task 'test:node' do
+	sh "cd test && env NODE_PATH=#{PhusionPassenger.node_libdir} ../node_modules/.bin/mocha -R spec node/*_spec.js"
+end

data/build/oxt_tests.rb

@@ -25,7 +25,7 @@
 
 TEST_OXT_CFLAGS = "-I../../ext -I../support #{TEST_COMMON_CFLAGS}"
 TEST_OXT_LDFLAGS = "#{TEST_BOOST_OXT_LIBRARY} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
-TEST_OXT_LDFLAGS << " -faddress-sanitizer" if USE_ASAN
+TEST_OXT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 TEST_OXT_OBJECTS = {
 	'oxt_test_main.o' => %w(oxt_test_main.cpp),
 	'backtrace_test.o' => %w(backtrace_test.cpp counter.hpp),

data/build/packaging.rb

@@ -172,11 +172,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b mxcl:master"
 
 			puts "Initiating building of Debian packages"
-			command = "cd /srv/passenger_apt_automation && " +
-				"chpst -l /tmp/passenger_apt_automation.lock " +
-				"/tools/silence-unless-failed " +
-				"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
-			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+			Rake::Task['package:initiate_debian_building'].invoke
 
 			puts "Building OS X binaries..."
 			sh "cd ../passenger_autobuilder && " +
@@ -201,11 +197,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			sh "ssh psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
 
 			puts "Initiating building of Debian packages"
-			command = "cd /srv/passenger_apt_automation && " +
-				"chpst -l /tmp/passenger_apt_automation.lock " +
-				"/tools/silence-unless-failed " +
-				"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
-			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+			Rake::Task['package:initiate_debian_building'].invoke
 
 			sh "cd ../passenger_autobuilder && " +
 				"git pull && " +
@@ -291,6 +283,27 @@ task 'package:sign' do
 	end
 end
 
+task 'package:initiate_debian_building' do
+	version        = PhusionPassenger::VERSION_STRING
+	is_enterprise  = PhusionPassenger::PACKAGE_NAME =~ /enterprise/
+	is_open_source = !is_enterprise
+
+	if is_open_source
+		command = "cd /srv/passenger_apt_automation && " +
+			"chpst -l /tmp/passenger_apt_automation.lock " +
+			"/tools/silence-unless-failed " +
+			"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
+	else
+		git_url = `git config remote.origin.url`.strip
+		command = "cd /srv/passenger_apt_automation && " +
+			"chpst -l /tmp/passenger_apt_automation.lock " +
+			"/tools/silence-unless-failed " +
+			"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
+	end
+
+	sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+end
+
 desc "Remove gem, tarball and signatures"
 task 'package:clean' do
 	require 'phusion_passenger'
@@ -319,6 +332,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
 	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
+	fake_nodelibdir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
 	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
 	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
@@ -341,6 +355,10 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_rubylibdir}/"
 	sh "cp -R #{PhusionPassenger.ruby_libdir}/phusion_passenger #{fake_rubylibdir}/"
 
+	# Node.js sources
+	sh "mkdir -p #{fake_nodelibdir}"
+	sh "cp -R #{PhusionPassenger.node_libdir}/phusion_passenger #{fake_nodelibdir}/"
+
 	# Phusion Passenger common libraries
 	sh "mkdir -p #{fake_libdir}"
 	sh "cp -R #{PhusionPassenger.lib_dir}/common #{fake_libdir}/"
@@ -432,6 +450,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 		f.puts "include_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
 		f.puts "doc_dir=/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
 		f.puts "ruby_libdir=/usr/lib/ruby/vendor_ruby"
+		f.puts "node_libdir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
 		f.puts "apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so"
 		f.puts "ruby_extension_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
 		f.puts "nginx_module_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"

data/build/preprocessor.rb

@@ -181,7 +181,8 @@ private
 		"precise"  => "12.04",
 		"quantal"  => "12.10",
 		"raring"   => "13.04",
-		"saucy"    => "13.10"
+		"saucy"    => "13.10",
+		"trusty"   => "14.04"
 	}
 	DEBIAN_DISTRIBUTIONS = {
 		"squeeze"  => "20110206",

data/build/test_basics.rb

@@ -25,10 +25,10 @@ TEST_BOOST_OXT_LIBRARY = LIBBOOST_OXT
 TEST_COMMON_LIBRARY    = COMMON_LIBRARY
 
 TEST_COMMON_CFLAGS = "-DTESTING_APPLICATION_POOL " <<
-	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	"#{EXTRA_CXXFLAGS}"
 
 desc "Run all unit tests and integration tests"
-task :test => ['test:oxt', 'test:cxx', 'test:ruby', 'test:integration']
+task :test => ['test:oxt', 'test:cxx', 'test:ruby', 'test:node', 'test:integration']
 
 desc "Clean all compiled test files"
 task 'test:clean' do
@@ -47,10 +47,16 @@ desc "Install developer dependencies"
 task 'test:install_deps' do
 	gem_install = PlatformInfo.gem_command + " install --no-rdoc --no-ri"
 	gem_install = "#{PlatformInfo.ruby_sudo_command} #{gem_install}" if boolean_option('SUDO')
-	sh "#{gem_install} rails -v 2.3.15"
-	sh "#{gem_install} bundler rspec mime-types daemon_controller json rack"
-	sh "#{gem_install} mizuho bluecloth" if boolean_option('DOCTOOLS', true)
-	if boolean_option('RAILS_BUNDLES', true)
+	default = boolean_option('DEVDEPS_DEFAULT', true)
+
+	if boolean_option('BASE_DEPS', default)
+		sh "#{gem_install} rails -v 2.3.15"
+		sh "#{gem_install} bundler rspec mime-types daemon_controller json rack"
+	end
+	if boolean_option('DOCTOOLS', default)
+		sh "#{gem_install} mizuho bluecloth"
+	end
+	if boolean_option('RAILS_BUNDLES', default)
 		sh "cd test/stub/rails3.0 && bundle install"
 		sh "cd test/stub/rails3.1 && bundle install"
 		sh "cd test/stub/rails3.2 && bundle install"
@@ -61,4 +67,7 @@ task 'test:install_deps' do
 		    sh "cd test/stub/rails4.0 && bundle install"
                 end
 	end
+	if boolean_option('NODE_MODULES', default)
+		sh "npm install mocha should sinon"
+	end
 end

data/debian.template/locations.ini.template

@@ -8,6 +8,7 @@ resources_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
 include_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/include
 doc_dir=/usr/share/doc/passenger
 ruby_libdir=/usr/lib/ruby/vendor_ruby
+node_libdir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/node
 apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so
 ruby_extension_source_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ruby_extension_source
 nginx_module_source_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ngx_http_passenger_module

data/debian.template/passenger.install.template

@@ -4,6 +4,7 @@ usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/templates/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/standalone_default_root/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ruby_extension_source/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/node/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.types
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.crt
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.txt

data/dev/copy_boost_headers.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,18 +30,22 @@ ESSENTIALS = [
 	"boost/smart_ptr/detail/sp_counted_*",
 	"boost/smart_ptr/detail/atomic_count*",
 	"boost/smart_ptr/detail/spinlock*",
+	"boost/atomic",
+	"boost/unordered*",
 	"boost/thread",
 	"libs/thread/src",
 	"libs/system/src",
 	"boost/date_time/gregorian/formatters_limited.hpp",
 	"boost/date_time/date_formatting_limited.hpp",
+	"boost/type_traits/make_signed.hpp",
 	"boost/type_traits/detail/*",
 	"boost/non_type.hpp",
 	"boost/detail/fenv.hpp",
 	"boost/foreach.hpp"
 ]
 EXCLUDE = [
-	"libs/thread/src/win32/*"
+	"libs/thread/src/win32/*",
+	"boost/atomic/detail/windows.hpp"
 ]
 PROGRAM_SOURCE = %q{
 	#include <boost/shared_ptr.hpp>
@@ -55,7 +59,7 @@ PROGRAM_SOURCE = %q{
 	#include <boost/bind.hpp>
 	#include <boost/date_time/posix_time/posix_time.hpp>
 	#include <boost/foreach.hpp>
-	#include <boost/lambda/lambda.hpp>
+	#include <boost/unordered_map.hpp>
 }
 
 require 'fileutils'

data/dev/run_travis.sh

@@ -3,6 +3,7 @@ set -e
 
 export VERBOSE=1
 export TRACE=1
+export DEVDEPS_DEFAULT=no
 export rvmsudo_secure_path=1
 
 sudo sh -c 'cat >> /etc/hosts' <<EOF
@@ -38,19 +39,30 @@ function apt_get_update() {
 	fi
 }
 
-function install_test_deps_without_rails_bundles()
+function install_test_deps_with_doctools()
 {
-	if [[ "$install_test_deps_without_rails_bundles" = "" ]]; then
-		install_test_deps_without_rails_bundles=1
-		run rake test:install_deps RAILS_BUNDLES=no
+	if [[ "$install_test_deps_with_doctools" = "" ]]; then
+		install_test_deps_with_doctools=1
+		run rake test:install_deps BASE_DEPS=yes DOCTOOLS=yes
 	fi
 }
 
-function install_test_deps_without_rails_bundles_without_doctools()
+function install_base_test_deps()
 {
-	if [[ "$install_test_deps_without_rails_bundles_without_doctools" = "" ]]; then
-		install_test_deps_without_rails_bundles_without_doctools=1
-		rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
+	if [[ "$install_base_test_deps" = "" ]]; then
+		install_base_test_deps=1
+		rake test:install_deps BASE_DEPS=yes
+	fi
+}
+
+function install_node_and_modules()
+{
+	if [[ "$install_node_and_modules" = "" ]]; then
+		install_node_and_modules=1
+		curl -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+		tar xzvf node-v0.10.20-linux-x64.tar.gz
+		export PATH=`pwd`/node-v0.10.20-linux-x64/bin:$PATH
+		run rake test:install_deps NODE_MODULES=yes
 	fi
 }
 
@@ -82,18 +94,23 @@ if [[ "$TEST_RUBYGEMS_VERSION" != "" ]]; then
 fi
 
 if [[ "$TEST_CXX" = 1 ]]; then
-	run rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
+	run rake test:install_deps BASE_DEPS=yes
 	run rake test:cxx
 	run rake test:oxt
 fi
 
 if [[ "$TEST_RUBY" = 1 ]]; then
-	run rake test:install_deps DOCTOOLS=no
+	run rake test:install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
 	run rake test:ruby
 fi
 
+if [[ "$TEST_NODE" = 1 ]]; then
+	install_node_and_modules
+	run rake test:node
+fi
+
 if [[ "$TEST_NGINX" = 1 ]]; then
-	run rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
+	install_base_test_deps
 	run ./bin/passenger-install-nginx-module --auto --prefix=/tmp/nginx --auto-download
 	run rake test:integration:nginx
 fi
@@ -102,14 +119,13 @@ if [[ "$TEST_APACHE2" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends \
 		apache2-mpm-worker apache2-threaded-dev
-	install_test_deps_without_rails_bundles_without_doctools
+	install_base_test_deps
 	run ./bin/passenger-install-apache2-module --auto
 	run rake test:integration:apache2
 fi
 
 if [[ "$TEST_STANDALONE" = 1 ]]; then
-	apt_get_update
-	install_test_deps_without_rails_bundles_without_doctools
+	install_base_test_deps
 	run rake test:integration:standalone
 fi
 
@@ -119,7 +135,7 @@ if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
 		devscripts debhelper rake apache2-mpm-worker apache2-threaded-dev \
 		ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev rubygems libev-dev gdebi-core \
 		source-highlight
-	install_test_deps_without_rails_bundles
+	install_test_deps_with_doctools
 	run rake debian:dev debian:dev:reinstall
 	run rake test:integration:native_packaging \
 		LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
@@ -131,6 +147,6 @@ fi
 if [[ "$TEST_SOURCE_PACKAGING" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends source-highlight
-	install_test_deps_without_rails_bundles
+	install_test_deps_with_doctools
 	run rspec -f s -c test/integration_tests/source_packaging_test.rb
 fi