passenger 4.0.13 → 4.0.14

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSDPHCAAoJECrHRaUKISqMLiEH/A4OA7fXNqA3/aIzUn5coY6J
-MMmrKyTHGxL743dWP2ja28TCIoq41TfDUsWodPbVVUSXQOfOOP83Inz9xa4JB9mw
-cCU47RgmsFKsDtiwsXA0JLAtynzMMC1bk4doVWI7dh8pfckKDfwk4MvS5aMoCfyr
-98Irb7YO7hrsGAdk6NU60HghxnF661TnSTdN4IJLImQDGeuXIxRBSvE5HY13cUOO
-9zi+UiGHTSq/1ZKs06NV+OjYXijD4H5U+a8yX/Oxz1mZTKg6/4bHWp16CshphDjp
-9KqEfXgU9M+izSamX9xy3AIcJgpw8pg/PPvIljXdryUf2IAkPwcgF5ZwJhtAXfE=
-=1Fig
+iQEcBAABAgAGBQJSEm1+AAoJECrHRaUKISqMwjAIAJrI1rdd3Cxrencb3E/rKc2R
+Fdb0rEgFsPDGSa/D51kAhma2jzxjkGzQUS9k6DCrs9Qfmb5G9PkLaPjh1dIMT0zA
+PhLuhZu4wjxrcwlrZsKxljOq1R+t9IYdjYNKgzwHbF51dM2yTrHmAAuCI4ZS44WD
+2RnLomVLPmIsRVm7wxmtlMl1gUrVs2U1r259tF2+z4XS+VVOqM9bhgpFcY2Mj7Bg
+f0PFi+aXYpSjl1QwI7eyYdA/TLvOSbSRO9FuLvG3jnN4JI0/vzndS1+gRn5ToykI
+7q4PfQPVhA/R6b05HcRfrXX+l9WNWFh1duuTAmfvi5jydoIpgY/ROmIAeitPkak=
+=2H4W
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,13 @@
+Release 4.0.14
+--------------
+
+ * Fixed a bug in Passenger Standalone's source compiler, for the specific
+   case when the downloaded Nginx binary doesn't work, and compilation
+   of the Nginx binary did not succeed the first time (e.g. because of
+   missing dependencies).
+ * Precompiled Ruby native extensions are now automatically downloaded.
+
+
 Release 4.0.13
 --------------
 

data/ext/common/Constants.h

@@ -70,7 +70,7 @@
 
 	#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
 
-	#define PASSENGER_VERSION "4.0.13"
+	#define PASSENGER_VERSION "4.0.14"
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 1
 

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.13'
+	VERSION_STRING = '4.0.14'
 	
 	PREFERRED_NGINX_VERSION = '1.4.2'
 	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'

data/lib/phusion_passenger/native_support.rb

@@ -129,10 +129,61 @@ private
 	end
 
 	def download_binary_and_load
-		# TODO
-		return false
+		if !PhusionPassenger.installed_from_release_package?
+			return
+		end
+		if ENV['PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY'] == '0'
+			STDERR.puts "*** Phusion Passenger: PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY set, " +
+				"not downloading precompiled binary"
+			return
+		end
+		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
+			"the current Ruby interpreter. Downloading precompiled binary from the Phusion server " +
+			"(set PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY=0 to disable)..."
+		
+		require 'phusion_passenger/platform_info/ruby'
+		require 'phusion_passenger/utils/tmpio'
+		PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |dir|
+			Dir.chdir(dir) do
+				basename = "rubyext-#{archdir}.tar.gz"
+				if !download(basename, dir)
+					return false
+				end
+
+				sh "tar", "xzf", basename
+				sh "rm", "-f", basename
+				STDERR.puts "Checking whether downloaded binary is usable..."
+
+				File.open("test.rb", "w") do |f|
+					f.puts(%Q{
+						require File.expand_path('passenger_native_support')
+						f = File.open("test.txt", "w")
+						PhusionPassenger::NativeSupport.writev(f.fileno, ["hello", "\n"])
+					})
+				end
+
+				if sh_nonfatal("#{PlatformInfo.ruby_command} -I. test.rb") &&
+				   File.exist?("test.txt") &&
+				   File.read("test.txt") == "hello\n"
+					STDERR.puts "Binary is usable."
+					File.unlink("test.rb")
+					File.unlink("test.txt")
+					result = try_directories(installation_target_dirs) do |target_dir|
+						files = Dir["#{dir}/*"]
+						STDERR.puts "# Installing " + files.map{ |n| File.basename(n) }.join(' ')
+						FileUtils.cp(files, target_dir)
+						require "#{target_dir}/#{library_name}"
+						[true, false]
+					end
+					return result
+				else
+					STDERR.puts "Binary is not usable."
+					return false
+				end
+			end
+		end
 	end
-	
+
 	def compile_and_load
 		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
 			"the current Ruby interpreter. Compiling one..."
@@ -140,6 +191,15 @@ private
 		require 'fileutils'
 		require 'phusion_passenger/platform_info/ruby'
 		
+		target_dir = compile(installation_target_dirs)
+		if target_dir
+			require "#{target_dir}/#{library_name}"
+		else
+			STDERR.puts "Ruby native_support extension not loaded. Continuing without native_support."
+		end
+	end
+
+	def installation_target_dirs
 		target_dirs = []
 		if (output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']) && !output_dir.empty?
 			target_dirs << "#{output_dir}/#{VERSION_STRING}/#{archdir}"
@@ -148,13 +208,33 @@ private
 			target_dirs << "#{native_support_dir_in_source_root}/#{archdir}"
 		end
 		target_dirs << "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
+		return target_dirs
+	end
+
+	def download(name, output_dir)
+		url = "#{PhusionPassenger::BINARIES_URL_ROOT}/#{PhusionPassenger::VERSION_STRING}/#{name}"
+		filename = "#{output_dir}/#{name}"
 		
-		target_dir = compile(target_dirs)
-		if target_dir
-			require "#{target_dir}/#{library_name}"
+		cache_dir = PhusionPassenger.download_cache_dir
+		if File.exist?("#{cache_dir}/#{name}")
+			FileUtils.cp("#{cache_dir}/#{name}", filename, :verbose => true)
+			return true
+		end
+
+		STDERR.puts "Attempting to download #{url} into #{output_dir}"
+		cert = PhusionPassenger.binaries_ca_cert_path
+		File.unlink("#{filename}.tmp") rescue nil
+		if PhusionPassenger::PlatformInfo.find_command("wget")
+			result = system("wget", "--tries=3", "-O", "#{filename}.tmp", "--ca-certificate=#{cert}", url)
 		else
-			STDERR.puts "Ruby native_support extension not loaded. Continuing without native_support."
+			result = system("curl", url, "-f", "-L", "-o", "#{filename}.tmp", "--cacert", cert)
+		end
+		if result
+			File.rename("#{filename}.tmp", filename)
+		else
+			File.unlink("#{filename}.tmp") rescue nil
 		end
+		return result
 	end
 	
 	def mkdir(dir)
@@ -167,6 +247,7 @@ private
 	
 	def sh(*args)
 		if !sh_nonfatal(*args)
+			command_string = args.join(' ')
 			raise "Could not compile #{library_name} (\"#{command_string}\" failed)"
 		end
 	end
@@ -178,33 +259,40 @@ private
 	end
 	
 	def compile(target_dirs)
+		try_directories(target_dirs) do |target_dir|
+			result =
+				sh_nonfatal("#{PlatformInfo.ruby_command} '#{extconf_rb}'") &&
+				sh_nonfatal("make")
+			if result
+				STDERR.puts "Compilation succesful."
+				STDERR.puts "-------------------------------"
+				[target_dir, false]
+			else
+				STDERR.puts "Compilation failed."
+				STDERR.puts "-------------------------------"
+				[nil, false]
+			end
+		end
+	end
+
+	def try_directories(dirs)
 		result = nil
-		target_dirs.each_with_index do |target_dir, i|
+		dirs.each_with_index do |dir, i|
 			begin
-				mkdir(target_dir)
-				File.open("#{target_dir}/.permission_test", "w").close
-				File.unlink("#{target_dir}/.permission_test")
-				STDERR.puts "# cd #{target_dir}"
-				Dir.chdir(target_dir) do
-					result =
-						sh_nonfatal("#{PlatformInfo.ruby_command} '#{extconf_rb}'") &&
-						sh_nonfatal("make")
-					if result
-						STDERR.puts "Compilation succesful."
-						STDERR.puts "-------------------------------"
-						return target_dir
-					else
-						STDERR.puts "Compilation failed."
-						STDERR.puts "-------------------------------"
-						return nil
-					end
+				mkdir(dir)
+				File.open("#{dir}/.permission_test", "w").close
+				File.unlink("#{dir}/.permission_test")
+				STDERR.puts "# cd #{dir}"
+				Dir.chdir(dir) do
+					result, should_retry = yield(dir)
+					return result if !should_retry
 				end
 			rescue Errno::EACCES
 				# If we encountered a permission error, then try
 				# the next target directory. If we get a permission
 				# error on the last one too then propagate the
 				# exception.
-				if i == target_dirs.size - 1
+				if i == dirs.size - 1
 					STDERR.puts "Encountered permission error, " +
 						"but no more directories to try. Giving up."
 					STDERR.puts "-------------------------------"
@@ -220,8 +308,8 @@ private
 				# is set to false. For example, when we're running
 				# in Phusion Passenger Standalone. In this case
 				# just ignore this directory.
-				if i == target_dirs.size - 1
-					STDERR.puts "Encountered permission error, " +
+				if i == dirs.size - 1
+					STDERR.puts "Not a valid directory, " +
 						"but no more directories to try. Giving up."
 					STDERR.puts "-------------------------------"
 					return nil
@@ -234,7 +322,7 @@ private
 	end
 end
 
-end
+end # module PhusionPassenger
 
 if PhusionPassenger::NativeSupportLoader.supported?
 	PhusionPassenger::NativeSupportLoader.new.start

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -161,9 +161,10 @@ private
 		runner = PlatformInfo::Depcheck::ConsoleRunner.new
 		runner.add('download-tool')
 
-		if !runner.check_all
+		result = runner.check_all
+		puts
+		if !result
 			@download_binaries = false
-			puts
 			line
 			puts
 			render_template 'standalone/download_tool_missing',
@@ -267,7 +268,7 @@ private
 				return false
 			end
 		end
-		puts "Binaries are usable."
+		puts "All support binaries are usable."
 		return true
 	end
 
@@ -310,10 +311,10 @@ private
 		puts "Checking whether the downloaded binary is usable..."
 		output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./nginx -v 2>&1`
 		if $? && $?.exitstatus == 0 && output =~ /nginx version:/
-			puts "Binary is usable."
+			puts "Nginx binary is usable."
 			return true
 		else
-			@stderr.puts "Binary is not usable."
+			@stderr.puts "Nginx binary is not usable."
 			return false
 		end
 	end
@@ -556,14 +557,12 @@ private
 		Dir.chdir(source_dir) do
 			shell = PlatformInfo.find_command('bash') || "sh"
 			command = ""
-			if @targets.include?(:support_binaries)
-				output_dir = "#{@support_dir}/common/libpassenger_common"
-				nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
-					set_output_dir(output_dir).
-					link_objects_as_string
-				command << "env PASSENGER_INCLUDEDIR='#{PhusionPassenger.include_dir}'" <<
-					" PASSENGER_LIBS='#{nginx_libs} #{output_dir}/../libboost_oxt.a' "
-			end
+			lib_dir = "#{@lib_dir}/common/libpassenger_common"
+			nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+				set_output_dir(lib_dir).
+				link_objects_as_string
+			command << "env PASSENGER_INCLUDEDIR='#{PhusionPassenger.include_dir}' " <<
+				"PASSENGER_LIBS='#{nginx_libs} #{lib_dir}/../libboost_oxt.a' "
 			# RPM thinks it's being smart by scanning binaries for
 			# paths and refusing to create package if it detects any
 			# hardcoded thats that point to /usr or other important

data/test/integration_tests/standalone_tests.rb

@@ -196,6 +196,50 @@ describe "Passenger Standalone" do
 					test_serving_application(command)
 				end
 
+				specify "if the downloaded support binaries work but the download Nginx binary doesn't, " +
+					"and Nginx compilation doesn't succeed the first time, then Nginx compilation " +
+					"succeeds the second time" do
+					Dir.chdir("#{@webroot}/#{version}") do
+						create_tarball("support-#{compat_id}.tar.gz") do
+							FileUtils.cp_r(Dir["#{PhusionPassenger.source_root}/buildout/*"],
+								".")
+						end
+						create_tarball("nginx-#{nginx_version}-#{compat_id}.tar.gz") do
+							create_file("nginx",
+								"#!/bin/sh\n" +
+								"exit 1\n")
+						end
+					end
+
+					# Temporarily make Passenger Standalone think our runtime is
+					# not compiled.
+					File.rename("#{PhusionPassenger.source_root}/buildout",
+						"#{PhusionPassenger.source_root}/buildout.renamed")
+					begin
+						command = "passenger start " +
+							"--runtime-dir '#{@runtime_dir}' " +
+							"--binaries-url-root '#{@base_url}'"
+						
+						@output = `#{command} --runtime-check-only --no-compile-runtime 2>&1`
+						$?.exitstatus.should_not == 0
+						@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+						@output.should include("All support binaries are usable.")
+						@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+						@output.should include("Nginx binary is not usable.")
+						@output.should include("Refusing to compile the Phusion Passenger Standalone")
+
+						@output = capture_output("#{command} --runtime-check-only")
+						@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+						@output.should include(COMPILING_MESSAGE)
+						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
+						
+						test_serving_application("#{command} --no-compile-runtime")
+					ensure
+						File.rename("#{PhusionPassenger.source_root}/buildout.renamed",
+							"#{PhusionPassenger.source_root}/buildout")
+					end
+				end
+
 				it "starts a server which serves the application" do
 					# The last test already tests this. This empty test here
 					# is merely to show the intent of the tests, and to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSDPHCAAoJECrHRaUKISqMDX8H/2MtD2WgryTYL9nhPxJ7D+1z
-vUcrqf1lngkSLQmyfGDM8DagqbGWt6m1UgKMiCzYwwCQR/rt5EVK2ppkaDSOqKpr
-A/maHy8wStcJj9FN6OY1P4I+SaPyANtUhvAWUB/iI9gy62m7u8pWMlxWP+qsGH8g
-1U8V26frXbpnhm9is7+QrU294nfXdZNMzBaLqZ25NZ9iwwpn5pyx+uspeYFXvqIW
-/lCHtjH/cQArDV9Am8mUdJC4R0Kjt8dW6uXEQDMkP2CuRFbApNDptH+DueSvASJ/
-vfq9zFHRTp13ikntMbnnw5v5PJo8Lw1NXFa/eRhYD7NnAqkkZ9jkOdwwI8JSTvc=
-=jbCp
+iQEcBAABAgAGBQJSEm1+AAoJECrHRaUKISqMbS8H/AqQwpqtfJ2nzmQTlLg9ePVV
+Z1BJbm4OFlbjONYhdtNxg6fCqj5AVIN1qa+pQSnXXMYdIqk8wZbCWjzOpYGFpZpS
+N9ZRiVdFXoCVd/yYE/o9CStTXA5C7p/VFYespyL8qrqrgcjC6OncMOTQnnRl0TJT
+hnMo/MIHS6CoD+0+mvBjyJWzxcgyiWpEShNJ0hPeWsNET/UsQCt8WwTJ99luI+Q7
+SFOZF+PnCg+xkPYkrfxVl4+lCNmV5+KbSuuL9Oa1BJCSsRvu5SMpTgJw2eKVYVy/
+JqfWbTFGWIdlBZuH2VhHCvX5NAJwnZsLze7oTmHOOTYGUKpsZ3WvIMFsuEAsTEA=
+=vDNO
 -----END PGP SIGNATURE-----