passenger 4.0.25 → 4.0.26

data/ext/apache2/SetHeaders.cpp

@@ -79,3 +79,7 @@
 		addHeader(r, output, "PASSENGER_LOAD_SHELL_ENVVARS", config->loadShellEnvvars);
 	
 
+	
+		addHeader(output, "PASSENGER_STARTUP_FILE", config->startupFile);
+	
+

data/ext/common/Constants.h

@@ -80,7 +80,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.25"
+	#define PASSENGER_VERSION "4.0.26"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Utils.cpp

@@ -284,7 +284,6 @@ extractDirName(const StaticString &path) {
 
 StaticString
 extractDirNameStatic(const StaticString &path) {
-	breakpoint();
 	if (path.empty()) {
 		return StaticString(".", 1);
 	}

data/ext/common/Utils/VariantMap.h

@@ -106,7 +106,7 @@ public:
 		}
 		
 		/** The key that wasn't found. */
-		string getKey() const {
+		const string &getKey() const {
 			return key;
 		}
 	};

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

@@ -27,11 +27,13 @@
 
 #include <sys/types.h>
 #include <string>
+#include <boost/shared_ptr.hpp>
 #include <Utils/VariantMap.h>
 
 namespace Passenger {
 
 using namespace std;
+using namespace boost;
 
 
 struct AgentOptions {
@@ -99,6 +101,8 @@ struct AgentOptions {
 	}
 };
 
+typedef boost::shared_ptr<AgentOptions> AgentOptionsPtr;
+
 
 } // namespace Passenger
 

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

@@ -603,8 +603,15 @@ public:
 int
 main(int argc, char *argv[]) {
 	TRACE_POINT();
-	AgentOptions options(initializeAgent(argc, argv, "PassengerHelperAgent"));
-	if (options.testBinary) {
+	AgentOptionsPtr options;
+	try {
+		options = boost::make_shared<AgentOptions>(
+			initializeAgent(argc, argv, "PassengerHelperAgent"));
+	} catch (const VariantMap::MissingKeyException &e) {
+		fprintf(stderr, "Option required: %s\n", e.getKey().c_str());
+		return 1;
+	}
+	if (options->testBinary) {
 		printf("PASS\n");
 		exit(0);
 	}
@@ -614,7 +621,7 @@ main(int argc, char *argv[]) {
 	
 	try {
 		UPDATE_TRACE_POINT();
-		Server server(FileDescriptor(FEEDBACK_FD), options);
+		Server server(FileDescriptor(FEEDBACK_FD), *options);
 		P_WARN("PassengerHelperAgent online, listening at unix:" <<
 			server.getRequestSocketFilename());
 		

data/ext/nginx/ContentHandler.c

@@ -325,9 +325,6 @@ create_request(ngx_http_request_t *r)
     passenger_loc_conf_t          *slcf;
     passenger_context_t           *context;
     ngx_http_script_len_code_pt    lcode;
-    #if (NGX_HTTP_SSL)
-        ngx_http_ssl_srv_conf_t   *ssl_conf;
-    #endif
     
     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
@@ -403,8 +400,7 @@ create_request(ngx_http_request_t *r)
     }
     
     #if (NGX_HTTP_SSL)
-        ssl_conf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
-        if (ssl_conf->enable) {
+        if (r->http_connection->ssl) {
             len += sizeof("HTTPS") + sizeof("on");
         }
     #endif
@@ -575,8 +571,7 @@ create_request(ngx_http_request_t *r)
     }
     
     #if (NGX_HTTP_SSL)
-        ssl_conf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
-        if (ssl_conf->enable) {
+        if (r->http_connection->ssl) {
             b->last = ngx_copy(b->last, "HTTPS", sizeof("HTTPS"));
             b->last = ngx_copy(b->last, "on", sizeof("on"));
         }

data/helper-scripts/download_binaries/extconf.rb

@@ -62,17 +62,19 @@ FileUtils.mkdir_p(PhusionPassenger.download_cache_dir)
 Dir.chdir(PhusionPassenger.download_cache_dir)
 
 # Initiate downloads
+require 'phusion_passenger/utils/download'
+require 'logger'
 def download(name)
 	if !File.exist?(name)
 		url = "#{PhusionPassenger::BINARIES_URL_ROOT}/#{PhusionPassenger::VERSION_STRING}/#{name}"
 		cert = PhusionPassenger.binaries_ca_cert_path
 		puts "Attempting to download #{url} into #{Dir.pwd}"
 		File.unlink("#{name}.tmp") rescue nil
-		if PhusionPassenger::PlatformInfo.find_command("wget")
-			result = system("wget", "--tries=3", "-O", "#{name}.tmp", "--ca-certificate=#{cert}", url)
-		else
-			result = system("curl", url, "-f", "-L", "-o", "#{name}.tmp", "--cacert", cert)
-		end
+		logger = Logger.new(STDOUT)
+		logger.level = Logger::WARN
+		logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
+		result = PhusionPassenger::Utils::Download.download(url, "#{name}.tmp",
+			:cacert => cert, :logger => logger)
 		if result
 			File.rename("#{name}.tmp", name)
 		else

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.25'
+	VERSION_STRING = '4.0.26'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/abstract_installer.rb

@@ -27,7 +27,9 @@ require 'phusion_passenger/console_text_template'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'
 require 'phusion_passenger/utils/ansi_colors'
+require 'phusion_passenger/utils/download'
 require 'fileutils'
+require 'logger'
 require 'etc'
 
 # IMPORTANT: do not directly or indirectly require native_support; we can't compile
@@ -415,28 +417,11 @@ protected
 	end
 	
 	def download(url, output, options = {})
-		if options[:use_cache] && cache_dir = PhusionPassenger.download_cache_dir
-			basename = url.sub(/.*\//, '')
-			if File.exist?("#{cache_dir}/#{basename}")
-				puts "Copying #{basename} from #{cache_dir}..."
-				FileUtils.cp("#{cache_dir}/#{basename}", output)
-				return true
-			end
-		end
-
-		args = []
-		if PlatformInfo.find_command("wget")
-			if options[:cacert]
-				args << "--ca-certificate=#{options[:cacert]}"
-			end
-			return sh("wget", "--tries=3", "-O", output, url, *args)
-		else
-			if options[:cacert]
-				args << "--cacert"
-				args << options[:cacert]
-			end
-			return sh("curl", url, "-f", "-L", "-o", output, *args)
-		end
+		logger = Logger.new(STDOUT)
+		logger.level = Logger::WARN
+		logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
+		options[:logger] = logger
+		return PhusionPassenger::Utils::Download.download(url, output, options)
 	end
 
 	def list_parent_directories(dir)

data/lib/phusion_passenger/admin_tools/memory_stats.rb

@@ -88,7 +88,7 @@ class MemoryStats
 	# Phusion Passenger is not running.
 	def passenger_processes
 		@passenger_processes ||= list_processes(:match =>
-			/((^| )Passenger |(^| )Rails:|(^| )Rack:|PassengerHelperAgent|PassengerWatchdog|PassengerLoggingAgent|wsgi-loader.py)/)
+			/((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py)/)
 	end
 	
 	# Returns the sum of the memory usages of all given processes.

data/lib/phusion_passenger/apache2/config_options.rb

@@ -131,5 +131,25 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:name => "PassengerLoadShellEnvvars",
 		:type => :flag,
 		:desc => "Whether to load environment variables from the shell before running the application."
+	},
+	{
+		:name    => "PassengerBufferUpload",
+		:type    => :flag,
+		:context => ["OR_ALL"],
+		:desc    => "Whether to buffer file uploads.",
+		:header  => nil
+	},
+	{
+		:name    => 'PassengerAppType',
+		:type    => :string,
+		:context => ["OR_ALL"],
+		:desc    => "Force specific application type.",
+		:header  => nil
+	},
+	{
+		:name    => 'PassengerStartupFile',
+		:context => ["OR_ALL"],
+		:desc    => "Force specific startup file.",
+		:type    => :string
 	}
 ]

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -124,13 +124,9 @@ protected
 	end
 
 	def run_steps
-		show_welcome_screen if @nginx_dir
 		check_whether_os_is_broken
 		check_for_download_tool
 		download_or_compile_binaries
-		puts
-		puts "<green><b>All done!</b></green>"
-		puts
 	end
 
 	def before_install
@@ -149,19 +145,17 @@ protected
 	end
 
 private
-	def show_welcome_screen
-		render_template 'standalone/welcome',
-			:version => @nginx_version,
-			:dir => @nginx_dir
-		puts
-	end
-
 	def check_for_download_tool
+		require 'phusion_passenger/platform_info/depcheck'
+		PlatformInfo::Depcheck.load('depcheck_specs/utilities')
+		result = PlatformInfo::Depcheck.find('download-tool').check
+		# Don't output anything if there is a download tool.
+		# We want to be as quiet as possible.
+		return if result && result[:found]
+
 		puts "<banner>Checking for basic prerequities...</banner>"
 		puts
 
-		require 'phusion_passenger/platform_info/depcheck'
-		PlatformInfo::Depcheck.load('depcheck_specs/utilities')
 		runner = PlatformInfo::Depcheck::ConsoleRunner.new
 		runner.add('download-tool')
 
@@ -195,6 +189,7 @@ private
 					"because --no-compile-runtime is given."
 				exit(1)
 			end
+			puts
 			check_dependencies(false) || exit(1)
 			puts
 			if should_compile_support_binaries
@@ -234,29 +229,29 @@ private
 	def download_support_binaries
 		return false if !should_download_binaries?
 
-		puts "<banner>Downloading Passenger support binaries for your platform, if available...</banner>"
+		puts " --> Downloading #{PROGRAM_NAME} support binaries for your platform"
 		basename = "support-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
 		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
 		tarball  = "#{@working_dir}/#{basename}"
 		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
-			puts "<b>No binaries are available for your platform. But don't worry, the " +
-				"necessary binaries will be compiled from source instead.</b>"
-			puts
+			puts "     No binaries are available for your platform. Will compile them from source"
 			return false
 		end
 		
 		FileUtils.mkdir_p(@support_dir)
 		Dir.mkdir("#{@working_dir}/support")
 		Dir.chdir("#{@working_dir}/support") do
-			puts "Extracting tarball..."
-			return false if !extract_tarball(tarball)
+			if !extract_tarball(tarball)
+				@stderr.puts " *** Error: cannot extract tarball"
+				return false
+			end
 			return false if !check_support_binaries
 		end
 
 		if system("mv '#{@working_dir}/support'/* '#{@support_dir}'/")
 			return true
 		else
-			@stderr.puts "Error: could not move extracted files to the support directory"
+			@stderr.puts " *** Error: could not move extracted files to the support directory"
 			return false
 		end
 	rescue Interrupt
@@ -265,42 +260,42 @@ private
 
 	def check_support_binaries
 		["PassengerWatchdog", "PassengerHelperAgent", "PassengerLoggingAgent"].each do |exe|
-			puts "Checking whether the downloaded #{exe} binary is usable..."
+			puts "     Checking whether the downloaded #{exe.sub(/^Passenger/, '')} binary is usable"
 			output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./agents/#{exe} --test-binary 1`
 			if !$? || $?.exitstatus != 0 || output != "PASS\n"
-				@stderr.puts "Binary #{exe} is not usable."
+				@stderr.puts "      --> Not usable, will compile from source"
 				return false
 			end
 		end
-		puts "All support binaries are usable."
+		puts "     All good"
 		return true
 	end
 
 	def download_nginx_binary
 		return false if !should_download_binaries?
 
-		puts "<banner>Downloading Nginx binary for your platform, if available...</banner>"
-		basename = "nginx-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
+		puts " --> Downloading web helper for your platform"
+		basename = "webhelper-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
 		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
 		tarball  = "#{@working_dir}/#{basename}"
 		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
-			puts "<b>No binary available for your platform. But don't worry, the " +
-				"necessary binary will be compiled from source instead.</b>"
-			puts
+			puts "     No binary are available for your platform. Will compile them from source"
 			return false
 		end
 
 		FileUtils.mkdir_p(@nginx_dir)
 		Dir.mkdir("#{@working_dir}/nginx")
 		Dir.chdir("#{@working_dir}/nginx") do
-			puts "Extracting tarball..."
 			result = extract_tarball(tarball)
-			return false if !result
+			if !result
+				@stderr.puts " *** Error: cannot extract tarball"
+				return false
+			end
 			if check_nginx_binary
 				if system("mv '#{@working_dir}/nginx'/* '#{@nginx_dir}'/")
 					return true
 				else
-					@stderr.puts "Error: could not move extracted Nginx binary to the right directory"
+					@stderr.puts " *** Error: could not move extracted web helper binary to the right directory"
 					return false
 				end
 			else
@@ -312,20 +307,20 @@ private
 	end
 
 	def check_nginx_binary
-		puts "Checking whether the downloaded binary is usable..."
-		output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./nginx -v 2>&1`
+		puts "     Checking whether the downloaded binary is usable"
+		output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./PassengerWebHelper -v 2>&1`
 		if $? && $?.exitstatus == 0 && output =~ /nginx version:/
-			puts "Nginx binary is usable."
+			puts "     All good"
 			return true
 		else
-			@stderr.puts "Nginx binary is not usable."
+			@stderr.puts "      --> Not usable, will compile from source"
 			return false
 		end
 	end
 
 	def download_and_extract_nginx_sources
 		begin_progress_bar
-		puts "Downloading Nginx..."
+		puts "Downloading web helper source code..."
 		if @nginx_tarball
 			tarball  = @nginx_tarball
 		else
@@ -343,13 +338,14 @@ private
 			begin_progress_bar
 			begin
 				result = extract_tarball(tarball) do |progress, total|
-					show_progress(progress / total * 0.1, 1.0, 1, 1, "Extracting Nginx sources...")
+					show_progress(progress / total * 0.1, 1.0, 1, 1, "Extracting web helper source...")
 				end
 			rescue Exception
 				puts
 				raise
 			end
 			if result
+				rename_nginx_proctitle("#{@working_dir}/#{nginx_sources_name}")
 				return "#{@working_dir}/#{nginx_sources_name}"
 			else
 				puts
@@ -361,16 +357,25 @@ private
 		exit 2
 	end
 
+	def rename_nginx_proctitle(source_dir)
+		filename = "#{source_dir}/src/os/unix/ngx_setproctitle.c"
+		if File.exist?(filename)
+			source = File.open(filename, "r") { |f| f.read }
+			source.gsub!('"nginx: "', '"PassengerWebHelper: "')
+			File.open(filename, "w") { |f| f.write(source) }
+		end
+	end
+
 	def compile_support_binaries
 		begin_progress_bar
-		show_progress(0, 1, 1, 1, "Preparing Phusion Passenger...")
+		show_progress(0, 1, 1, 1, "Preparing #{PROGRAM_NAME}...")
 		Dir.chdir(PhusionPassenger.source_root) do
 			args = "nginx_without_native_support" +
 				" CACHING=false" +
 				" OUTPUT_DIR='#{@support_dir}'"
 			begin
 				run_rake_task!(args) do |progress, total|
-					show_progress(progress, total, 1, 1, "Compiling Phusion Passenger...")
+					show_progress(progress, total, 1, 1, "Compiling #{PROGRAM_NAME}...")
 				end
 			ensure
 				puts
@@ -398,6 +403,7 @@ private
 		install_nginx_from_source(nginx_source_dir) do |progress, total, status_text|
 			show_progress(0.1 + progress / total.to_f * 0.9, 1.0, 1, 1, status_text)
 		end
+		puts
 	end
 	
 	def check_whether_we_can_write_to(dir)
@@ -451,7 +457,7 @@ private
 	def begin_progress_bar
 		if !@begun
 			@begun = true
-			puts "<banner>Installing Phusion Passenger Standalone...</banner>"
+			puts "<banner>Installing #{PROGRAM_NAME} Standalone...</banner>"
 		end
 	end
 	
@@ -578,37 +584,51 @@ private
 			command << "#{shell} ./configure --prefix=/tmp " <<
 				"#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " <<
 				"'--add-module=#{PhusionPassenger.nginx_module_source_dir}'"
-			run_command_with_throbber(command, "Preparing Nginx...") do |status_text|
+			run_command_with_throbber(command, "Preparing web helper...") do |status_text|
 				yield(0, 1, status_text)
 			end
 			
 			backlog = ""
-			total_lines = `#{PlatformInfo.gnu_make} --dry-run`.split("\n").size
+
+			# Capture and index the `make --dry-run` output for
+			# progress determination.
+			total_lines = 0
+			dry_run_output = {}
+			`#{PlatformInfo.gnu_make} --dry-run`.split("\n").each do |line|
+				total_lines += 1
+				dry_run_output[line] = true
+			end
+
 			IO.popen("#{PlatformInfo.gnu_make} 2>&1", "r") do |io|
 				progress = 1
 				while !io.eof?
 					line = io.readline
 					backlog << line
-					yield(progress, total_lines, "Compiling Nginx core...")
-					progress += 1
+					# If the output is part of what we saw when dry-running,
+					# then increase progress bar. Otherwise it could be compiler
+					# warnings or something, so ignore those.
+					if dry_run_output[line.chomp]
+						yield(progress, total_lines, "Compiling web helper...")
+						progress += 1
+					end
 				end
 			end
 			if $?.exitstatus != 0
 				@stderr.puts
-				@stderr.puts "*** ERROR: unable to compile Nginx."
+				@stderr.puts "*** ERROR: unable to compile web helper."
 				@stderr.puts backlog
 				exit 1
 			end
 			
 			yield(1, 1, 'Copying files...')
-			if !system("cp -pR objs/nginx '#{@nginx_dir}/'")
+			if !system("cp -pR objs/nginx '#{@nginx_dir}/PassengerWebHelper'")
 				@stderr.puts
-				@stderr.puts "*** ERROR: unable to copy Nginx binary."
+				@stderr.puts "*** ERROR: unable to copy web helper binary."
 				exit 1
 			end
-			if !strip_binary("#{@nginx_dir}/nginx")
+			if !strip_binary("#{@nginx_dir}/PassengerWebHelper")
 				@stderr.puts
-				@stderr.puts "*** ERROR: unable to strip debugging symbols from the Nginx binary."
+				@stderr.puts "*** ERROR: unable to strip debugging symbols from the web helper binary."
 				exit 1
 			end
 		end