passenger 4.0.33 → 4.0.34

data/build/rpm.rb

@@ -15,24 +15,28 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 RPM_NAME = "passenger"
-RPMBUILD_ROOT = File.expand_path("~/rpmbuild")
 MOCK_OFFLINE = boolean_option('MOCK_OFFLINE', false)
 ALL_RPM_DISTROS = {
 	"el6" => { :mock_chroot_name => "epel-6", :distro_name => "Enterprise Linux 6" },
 	"amazon" => { :mock_chroot_name => "epel-6", :distro_name => "Amazon Linux" }
 }
 
-desc "Build gem for use in RPM building"
-task 'rpm:gem' do
-	rpm_source_dir = "#{RPMBUILD_ROOT}/SOURCES"
-	sh "gem build #{PACKAGE_NAME}.gemspec"
-	sh "cp #{PACKAGE_NAME}-#{PACKAGE_VERSION}.gem #{rpm_source_dir}/"
+task 'rpm:sources' => ['package:set_official', 'package:tarball'] do
+	basename = "#{PACKAGE_NAME}-#{VERSION_STRING}"
+	nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
+
+	sh "cp #{PKG_DIR}/#{basename}.tar.gz rpm/* #{rpmbuild_root}/SOURCES/"
+	if File.exist?("#{rpmbuild_root}/SOURCES/nginx-#{nginx_version}.tar.gz")
+		puts "Local Nginx tarball already exists."
+	else
+		sh "curl -L -o #{rpmbuild_root}/SOURCES/nginx-#{nginx_version}.tar.gz http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
+	end
 end
 
 desc "Build RPM for local machine"
-task 'rpm:local' => 'rpm:gem' do
+task 'rpm:local' => 'rpm:sources' do
 	distro_id = `./rpm/get_distro_id.py`.strip
-	rpm_spec_dir = "#{RPMBUILD_ROOT}/SPECS"
+	rpm_spec_dir = "#{rpmbuild_root}/SPECS"
 	spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
 	spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
 
@@ -50,7 +54,7 @@ task 'rpm:local:uninstall' do
 end
 
 task 'rpm:local:reinstall' => 'rpm:local:uninstall' do
-	rpm_spec_dir = "#{RPMBUILD_ROOT}/RPMS"
+	rpm_spec_dir = "#{rpmbuild_root}/RPMS"
 	files = []
 	["passenger", "mod_passenger", "passenger-devel", "passenger-doc", "passenger-native-libs", "passenger-debuginfo"].each do |package_name|
 		files << Dir["#{rpm_spec_dir}/*/#{package_name}-#{PACKAGE_VERSION}-*.rpm"].first
@@ -65,7 +69,7 @@ end
 def create_rpm_build_task(distro_id, mock_chroot_name, distro_name)
 	desc "Build RPM for #{distro_name}"
 	task "rpm:#{distro_id}" => 'rpm:gem' do
-		rpm_spec_dir = "#{RPMBUILD_ROOT}/SPECS"
+		rpm_spec_dir = "#{rpmbuild_root}/SPECS"
 		spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
 		spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
 		maybe_offline = MOCK_OFFLINE ? "--offline" : nil
@@ -80,7 +84,7 @@ def create_rpm_build_task(distro_id, mock_chroot_name, distro_name)
 		sh "mock --verbose #{maybe_offline} " +
 			"-r #{mock_chroot_name}-x86_64 " +
 			"--resultdir '#{PKG_DIR}/#{distro_id}' " +
-			"rebuild #{RPMBUILD_ROOT}/SRPMS/#{RPM_NAME}-#{PACKAGE_VERSION}-1#{distro_id}.src.rpm"
+			"rebuild #{rpmbuild_root}/SRPMS/#{RPM_NAME}-#{PACKAGE_VERSION}-1#{distro_id}.src.rpm"
 	end
 end
 
@@ -117,3 +121,8 @@ task "rpm:publish" do
 	sh "#{rsync} #{PKG_DIR}/yumgems/ #{server}:#{remote_dir}/new/"
 	sh "ssh #{server} 'rm -rf #{remote_dir}/previous && mv #{remote_dir}/latest #{remote_dir}/previous && mv #{remote_dir}/new #{remote_dir}/latest'"
 end
+
+
+def rpmbuild_root
+	@rpmbuild_root ||= File.expand_path("~/rpmbuild")
+end

data/build/ruby_tests.rb

@@ -33,9 +33,8 @@ task 'test:ruby' => dependencies do
 			require 'shellwords'
 			maybe_grep = "-e #{Shellwords.escape(maybe_grep)}"
 		end
-		Dir.chdir("test") do
-			ruby "#{PlatformInfo.rspec} -c -f s -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
-		end
+		command = "#{PlatformInfo.rspec} -c -f s -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
+		sh "cd test && exec #{command}"
 	end
 end
 

data/build/test_basics.rb

@@ -54,6 +54,15 @@ task 'test:install_deps' do
 		sh "#{gem_install} bundler rspec daemon_controller json rack"
 	end
 	if boolean_option('DOCTOOLS', default)
+		begin
+			require 'nokogiri'
+		rescue LoadError
+			if RUBY_VERSION < '1.9'
+				sh "#{gem_install} nokogiri -v 1.5.9"
+			else
+				sh "#{gem_install} nokogiri"
+			end
+		end
 		sh "#{gem_install} mizuho bluecloth"
 	end
 	if boolean_option('RAILS_BUNDLES', default)

data/debian.template/passenger.conf

@@ -1,4 +1,6 @@
+### Begin automatically installed Phusion Passenger config snippet ###
 <IfModule mod_passenger.c>
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
   PassengerDefaultRuby /usr/bin/ruby
 </IfModule>
+### End automatically installed Phusion Passenger config snippet ###

data/debian.template/passenger.load

@@ -1 +1,3 @@
+### Begin automatically installed Phusion Passenger load snippet ###
 LoadModule passenger_module /usr/lib/apache2/modules/mod_passenger.so
+### End automatically installed Phusion Passenger load snippet ###

data/dev/run_travis.sh

@@ -120,7 +120,8 @@ if [[ "$TEST_APACHE2" = 1 ]]; then
 	run sudo apt-get install -y --no-install-recommends \
 		apache2-mpm-worker apache2-threaded-dev
 	install_base_test_deps
-	run ./bin/passenger-install-apache2-module --auto
+	run ./bin/passenger-install-apache2-module --auto #--no-update-config
+	run rvmsudo ./bin/passenger-install-apache2-module --auto --no-compile
 	run rake test:integration:apache2
 fi
 
@@ -137,10 +138,7 @@ if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
 		source-highlight
 	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 \
-		NATIVE_PACKAGING_METHOD=deb \
-		SUDO=1
+	run rake test:integration:native_packaging SUDO=1
 	run env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
 		rake test:integration:apache2 SUDO=1
 fi

data/dev/test_rpm_packaging.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -ex
+
+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
+
+# Don't care about the docs.
+for F in "Users guide.html" "Users guide Apache.html" "Users guide Nginx.html" "Users guide Standalone.html" "Packaging.html" "Security of user switching support.html" "Architectural overview.html"; do
+	if [[ ! -f "doc/$F" ]]; then
+		echo > "doc/$F"
+	fi
+done
+
+cp test/config.json.rpm-automation test/config.json
+
+rake test:install_deps DEVDEPS_DEFAULT=false BASE_DEPS=true RAILS_BUNDLES=true
+rake rpm:local rpm:local:reinstall
+rake test:integration:native_packaging SUDO=1
+env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
+	rake test:integration:apache2 \
+	SUDO=1

data/doc/Users guide Apache.idmap.txt

@@ -64,13 +64,15 @@
 
 2.10.3. Forcing location of command line tools and dependencies	=>	forcing-location-of-certain-command-line-tools-1hym30u
 
-2.11. Working with the Apache configuration file	=>	locating-the-apache-configuration-file-1fterqv
+2.11. Dealing with multiple Apache installations	=>	dealing-with-multiple-apache-installations-ks5nkz
 
-2.12. Disabling without uninstalling	=>	unloading-disabling-phusion-passenger-from-apache-without-uninstalling-it-s1axnx
+2.12. Working with the Apache configuration file	=>	locating-the-apache-configuration-file-1fterqv
 
-2.13. Uninstalling	=>	uninstalling-phusion-passenger-1qb4ssq
+2.13. Disabling without uninstalling	=>	unloading-disabling-phusion-passenger-from-apache-without-uninstalling-it-s1axnx
 
-2.14. Moving to a different directory	=>	moving-to-a-different-directory-1n0gkwh
+2.14. Uninstalling	=>	uninstalling-phusion-passenger-1qb4ssq
+
+2.15. Moving to a different directory	=>	moving-to-a-different-directory-1n0gkwh
 
 3. Deploying a Ruby on Rails 1.x or 2.x (but NOT Rails >= 3.x) application	=>	deploying-a-ruby-on-rails-1-x-or-2-x-but-not-rails-3-x-application-9r92hi
 

data/doc/users_guide_snippets/installation.txt

@@ -75,15 +75,16 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
 2. Add HTTPS support for APT. Our APT repository is stored on an HTTPS server.
 +
 --------------------------------------------------------------
-sudo apt-get install apt-transport-https
+sudo apt-get install apt-transport-https ca-certificates
 --------------------------------------------------------------
 
-3. Create a file `/etc/apt/sources.list.d/passenger.list` and insert one of the following lines, depending on your distribution.
+3. Create a file `/etc/apt/sources.list.d/passenger.list` and insert **one of** the following lines, depending on your distribution.
 +
 **Open source**:::
 +
 [source,sh]
 --------------------------------------------------------------
+##### !!!! Only add ONE of these lines, not all of them !!!! #####
 # Ubuntu 13.10
 deb https://oss-binaries.phusionpassenger.com/apt/passenger saucy main
 # Ubuntu 12.04
@@ -100,6 +101,7 @@ deb https://oss-binaries.phusionpassenger.com/apt/passenger squeeze main
 +
 [source,sh]
 --------------------------------------------------------------
+##### !!!! Only add ONE of these lines, not all of them !!!! #####
 # Ubuntu 13.10
 deb https://download:YOUR_DOWNLOAD_TOKEN@www.phusionpassenger.com/enterprise_apt saucy main
 # Ubuntu 12.04
@@ -675,6 +677,7 @@ On some systems, C/C++ libraries and headers that Phusion Passenger requires may
 
 NOTE: If you run the installer with `sudo` then environment variables may not be passed properly. Learn more at <<env_vars_and_sudo,Environment variables and sudo>>.
 
+[[forcing_location_of_command_line_tools_and_dependencies]]
 ==== Forcing location of command line tools and dependencies
 
 The Phusion Passenger build system attempts to autodetect many things by locating relevant helper tools. For example, to find out which compiler flags it should use for compiling Apache modules, it locates the `apxs2` command and queries it. To find out which compiler flags it should use for libcurl, it queries the `curl-config` command. These commands may not be in `$PATH`, or even when they are you may want to use a different one.
@@ -706,10 +709,25 @@ $ sudo bash
 	The location of the GNU-compatible `make` tool.
 
 TIP: If you do not know what environment variables are, or how to use them, then please read <<env_vars_and_sudo,Environment variables and sudo>>.
+
 NOTE: If you run the installer with `sudo` then environment variables may not be passed properly. Learn more at <<env_vars_and_sudo,Environment variables and sudo>>.
 
 
 ifdef::apache[]
+[[multiple_apache_installs]]
+=== Dealing with multiple Apache installations
+Some systems have multiple Apache installations. Maybe you already know about that, and you installed multiple Apaches for a reason. Or maybe you did so in the past but then forgot about the other installs. Or maybe someone else -- or some other software -- installed another Apache for you without your knowledge.
+
+Whatever the reason might be, it is important that you know about the existance of multiple Apache installations, and that you decide *which one* you want to use. **Unless you know exactly what you are doing, we recommend that you remove all the Apache installations that you don't intend to use, in order to avoid confusion and problems**. You should end up with only a single Apache installation. Unfortunately, this manual cannot tell you how to remove the other Apache installs: it depends on how you originally installed them. Usually it's a matter of removing the directories that they're located in, and removing their configuration files. But some Apache distributions might bundle an uninstaller. You need to do the proper research on how they ended up there in the first place.
+
+Phusion Passenger provides a tool to check whether you have multiple Apache installations on your system. You can invoke the tool by running `passenger-config --detect-apache2`.
+
+If the existance of multiple Apache installations is intentional, then Phusion Passenger can happily go along with your choice: you simply have to tell `passenger-install-apache2-module` which Apache to install against. There are several ways to specify which Apache you want to install against:
+
+ * By passing the `--apxs2-path` parameter. The `passenger-config --detect-apache2` command will tell you how to use this parameter.
+ * By setting `APXS2`, `HTTPD` and other kinds of environment variables. Please refer to <<forcing_location_of_command_line_tools_and_dependencies,Forcing location of command line tools and dependencies>> for more information.
+
+
 [[working_with_apache_conf]]
 === Working with the Apache configuration file
 

data/doc/users_guide_snippets/tips.txt

@@ -373,7 +373,7 @@ For your convenience, Phusion Passenger provides a Rack middleware for out-of-ba
 [source, ruby]
 ----------------------------------------------------
 if defined?(PhusionPassenger)
-    require 'phusion_passenger/rack/out_of_band_gc'
+    PhusionPassenger.require_passenger_lib 'rack/out_of_band_gc'
     
     # Trigger out-of-band GC every 5 requests.
     use PhusionPassenger::Rack::OutOfBandGc, 5

data/ext/common/ApplicationPool2/Pool.h

@@ -1284,7 +1284,7 @@ public:
 				boost::shared_ptr<DetachSuperGroupWaitTicket> ticket =
 					boost::make_shared<DetachSuperGroupWaitTicket>();
 				ExceptionPtr exception = copyException(
-					GetAbortedException("The containg SuperGroup was detached."));
+					GetAbortedException("The containing SuperGroup was detached."));
 
 				forceDetachSuperGroup(superGroup, actions,
 					boost::bind(syncDetachSuperGroupCallback, _1, ticket));

data/ext/common/Constants.h

@@ -42,6 +42,8 @@
 
 	#define DEB_DEV_PACKAGE "passenger-dev"
 
+	#define DEB_MAIN_PACKAGE "passenger"
+
 	#define DEB_NGINX_PACKAGE "nginx-extras"
 
 	#define DEFAULT_ANALYTICS_LOG_GROUP ""
@@ -86,7 +88,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.33"
+	#define PASSENGER_VERSION "4.0.34"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -100,6 +102,8 @@
 
 	#define RPM_DEV_PACKAGE "passenger-devel"
 
+	#define RPM_MAIN_PACKAGE "passenger"
+
 	#define RPM_NGINX_PACKAGE "nginx"
 
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 3

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -2203,7 +2203,7 @@ private:
 			data.append("Connection: close\r\n");
 
 			for (it = parser.begin(); it != end; it++) {
-				if (startsWith(it->first, "HTTP_")) {
+				if (startsWith(it->first, "HTTP_") && it->first != "HTTP_CONNECTION") {
 					string subheader = it->first.substr(sizeof("HTTP_") - 1);
 					string::size_type i;
 					for (i = 0; i < subheader.size(); i++) {

data/ext/common/agents/Watchdog/AgentWatcher.cpp

@@ -172,6 +172,16 @@ protected:
 	 */
 	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) = 0;
 	
+	static void killAndDontWait(pid_t pid) {
+		this_thread::disable_interruption di;
+		this_thread::disable_syscall_interruption dsi;
+		// If the process is a process group leader then killing the
+		// group will likely kill all its child processes too.
+		if (syscalls::killpg(pid, SIGTERM) == -1) {
+			syscalls::kill(pid, SIGTERM);
+		}
+	}
+
 	/**
 	 * Kill a process with SIGKILL, and attempt to kill its children too. 
 	 * Then wait until it has quit.
@@ -465,6 +475,16 @@ public:
 		}
 	}
 	
+	virtual bool signalShutdown() {
+		boost::lock_guard<boost::mutex> l(lock);
+		if (pid == 0) {
+			return false;
+		} else {
+			killAndDontWait(pid);
+			return true;
+		}
+	}
+
 	/**
 	 * Force the agent process to shut down. Returns true if it was shut down,
 	 * or false if it wasn't started.

data/ext/common/agents/Watchdog/Main.cpp

@@ -374,6 +374,12 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 			} else {
 				P_DEBUG("All Phusion Passenger agent processes have exited. Forcing all subprocesses to shut down.");
 			}
+			P_DEBUG("Sending SIGTERM");
+			for (it = watchers.begin(); it != watchers.end(); it++) {
+				(*it)->signalShutdown();
+			}
+			usleep(1000000);
+			P_DEBUG("Sending SIGKILL");
 			for (it = watchers.begin(); it != watchers.end(); it++) {
 				(*it)->forceShutdown();
 			}
@@ -415,6 +421,10 @@ static void
 forceAllAgentsShutdown(vector<AgentWatcherPtr> &watchers) {
 	vector<AgentWatcherPtr>::iterator it;
 	
+	for (it = watchers.begin(); it != watchers.end(); it++) {
+		(*it)->signalShutdown();
+	}
+	usleep(1000000);
 	for (it = watchers.begin(); it != watchers.end(); it++) {
 		(*it)->forceShutdown();
 	}

data/ext/ruby/passenger_native_support.c

@@ -863,7 +863,7 @@ void
 Init_passenger_native_support() {
 	struct sockaddr_un addr;
 	
-	/* Only defined on Ruby >= 1.9 */
+	/* Only defined on Ruby >= 1.9.3 */
 	#ifdef RUBY_API_VERSION_CODE
 		if (ruby_api_version[0] != RUBY_API_VERSION_MAJOR
 		 || ruby_api_version[1] != RUBY_API_VERSION_MINOR
@@ -899,20 +899,32 @@ Init_passenger_native_support() {
 			return;
 		}
 	#else
+		/* Ruby 1.8 - 1.9.2 */
+
+		/* We may not have included Ruby 1.8's version.h because of compiler
+		 * header file search paths, so we can't rely on RUBY_VERSION being
+		 * defined.
+		 */
+		#ifdef RUBY_VERSION
+			#define ESTIMATED_RUBY_VERSION RUBY_VERSION
+		#else
+			#ifdef HAVE_RUBY_IO_H
+				#define ESTIMATED_RUBY_VERSION "1.9.1 or 1.9.2"
+			#else
+				#define ESTIMATED_RUBY_VERSION "1.8"
+			#endif
+		#endif
+		#ifdef HAVE_RUBY_IO_H
+			#define ESTIMATED_RUBY_MINOR_VERSION '9'
+		#else
+			#define ESTIMATED_RUBY_MINOR_VERSION '8'
+		#endif
+
 		if (strlen(ruby_version) < sizeof("1.8.7") - 1
 		 || ruby_version[0] != '1'
 		 || ruby_version[1] != '.'
-		 || ruby_version[2] != '8')
+		 || ruby_version[2] != ESTIMATED_RUBY_MINOR_VERSION)
 		{
-			/* We may not have included Ruby 1.8's version.h because of compiler
-			 * header file search paths, so we can't rely on RUBY_VERSION being
-			 * defined.
-			 */
-			#ifdef RUBY_VERSION
-				#define ESTIMATED_RUBY_VERSION RUBY_VERSION
-			#else
-				#define ESTIMATED_RUBY_VERSION "1.8"
-			#endif
 			fprintf(stderr, " --> passenger_native_support was compiled for Ruby %s, "
 				"but you're currently running Ruby %s\n",
 				ESTIMATED_RUBY_VERSION, ruby_version);

data/helper-scripts/classic-rails-loader.rb

@@ -31,7 +31,12 @@ module App
 	def self.format_exception(e)
 		result = "#{e} (#{e.class})"
 		if !e.backtrace.empty?
-			result << "\n  " << e.backtrace.join("\n  ")
+			if e.respond_to?(:html?) && e.html?
+				require 'erb' if !defined?(ERB)
+				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+			else
+				result << "\n  " << e.backtrace.join("\n  ")
+			end
 		end
 		return result
 	end
@@ -65,8 +70,7 @@ module App
 		PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
-		LoaderSharedHelpers.init
-		@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
+		@@options = LoaderSharedHelpers.init(@@options)
 		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
@@ -74,6 +78,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
@@ -133,6 +138,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)