passenger 3.0.0 → 3.0.1

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -22,18 +22,11 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/operating_system'
 
 module PhusionPassenger
 
 module PlatformInfo
-	def self.cc
-		return ENV['CC'] || "gcc"
-	end
-	
-	def self.cxx
-		return ENV['CXX'] || "g++"
-	end
-	
 	def self.gnu_make
 		gmake = find_command('gmake')
 		if !gmake
@@ -78,6 +71,11 @@ module PlatformInfo
 	end
 	memoize :compiler_visibility_flag_generates_warnings?, true
 	
+	def self.has_math_library?
+		return try_link(:c, "int main() { return 0; }\n", '-lmath')
+	end
+	memoize :has_math_library?, true
+	
 	# Compiler flags that should be used for compiling every C/C++ program,
 	# for portability reasons. These flags should be specified as last
 	# when invoking the compiler.
@@ -139,6 +137,10 @@ module PlatformInfo
 			# http://groups.google.com/group/phusion-passenger/browse_thread/thread/aad4bd9d8d200561
 			flags << '-DBOOST_SP_USE_PTHREADS'
 		end
+		
+		flags << '-DHAS_SFENCE' if supports_sfence_instruction?
+		flags << '-DHAS_LFENCE' if supports_lfence_instruction?
+		
 		return flags.compact.join(" ").strip
 	end
 	memoize :portability_cflags, true
@@ -148,10 +150,12 @@ module PlatformInfo
 	# when invoking the linker.
 	def self.portability_ldflags
 		if RUBY_PLATFORM =~ /solaris/
-			return '-lxnet -lrt -lsocket -lnsl -lpthread'
+			result = '-lxnet -lrt -lsocket -lnsl -lpthread'
 		else
-			return '-lpthread'
+			result = '-lpthread'
 		end
+		flags << ' -lmath' if has_math_library?
+		return result
 	end
 	memoize :portability_ldflags
 	
@@ -174,28 +178,6 @@ module PlatformInfo
 			return nil
 		end
 	end
-
-private
-	def self.try_compile(language, source, flags = nil)
-		if language == :c
-			compiler = cc
-		elsif language == :cxx
-			compiler = cxx
-		else
-			raise ArgumentError,"Unsupported language '#{language}'"
-		end
-		filename = File.join("/tmp/passenger-compile-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
-			return system("(#{compiler} #{flags} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.o") rescue nil
-		end
-	end
-	private_class_method :try_compile
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/curl.rb

@@ -31,6 +31,11 @@ module PlatformInfo
 		if result.empty?
 			return nil
 		else
+			version = `curl-config --vernum`.strip
+			if version >= '070c01'
+				# Curl >= 7.12.1 supports curl_easy_reset()
+				result << " -DHAS_CURL_EASY_RESET"
+			end
 			return result
 		end
 	end
@@ -47,7 +52,7 @@ module PlatformInfo
 	memoize :curl_libs
 	
 	def self.curl_supports_ssl?
-		features = `(curl-config --features) 2>/dev/null`
+		features = `(curl-config --feature) 2>/dev/null`
 		return features =~ /SSL/
 	end
 	memoize :curl_supports_ssl?

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -46,6 +46,113 @@ module PlatformInfo
 			return "so"
 		end
 	end
+	
+	# Returns a list of all CPU architecture names that the current machine CPU
+	# supports. If there are multiple such architectures then the first item in
+	# the result denotes that OS runtime's main/preferred architecture.
+	#
+	# This function normalizes some names. For example x86 is always reported
+	# as "x86" regardless of whether the OS reports it as "i386" or "i686".
+	# x86_64 is always reported as "x86_64" even if the OS reports it as "amd64".
+	#
+	# Please note that even if the CPU supports multiple architectures, the
+	# operating system might not. For example most x86 CPUs nowadays also
+	# support x86_64, but x86_64 Linux systems require various x86 compatibility
+	# libraries to be installed before x86 executables can be run. This function
+	# does not detect whether these compatibility libraries are installed.
+	# The only guarantee that you have is that the OS can run executables in
+	# the architecture denoted by the first item in the result.
+	#
+	# For example, on x86_64 Linux this function can return ["x86_64", "x86"].
+	# This indicates that the CPU supports both of these architectures, and that
+	# the OS's main/preferred architecture is x86_64. Most executables on the
+	# system are thus be x86_64. It is guaranteed that the OS can run x86_64
+	# executables, but not x86 executables per se.
+	#
+	# Another example: on MacOS X this function can return either
+	# ["x86_64", "x86"] or ["x86", "x86_64"]. The former result indicates
+	# OS X 10.6 (Snow Leopard) and beyond because starting from that version
+	# everything is 64-bit by default. The latter result indicates an OS X
+	# version older than 10.6.
+	def self.cpu_architectures
+		if os_name == "macosx"
+			arch = `uname -p`.strip
+			if arch == "i386"
+				# Macs have been x86 since around 2007. I think all of them come with
+				# a recent enough Intel CPU that supports both x86 and x86_64, and I
+				# think every OS X version has both the x86 and x86_64 runtime installed.
+				major, minor, *rest = `sw_vers -productVersion`.strip.split(".")
+				major = major.to_i
+				minor = minor.to_i
+				if major >= 10 || (major == 10 && minor >= 6)
+					# Since Snow Leopard x86_64 is the default.
+					["x86_64", "x86"]
+				else
+					# Before Snow Leopard x86 was the default.
+					["x86", "x86_64"]
+				end
+			else
+				arch
+			end
+		else
+			arch = `uname -p`.strip
+			# On some systems 'uname -p' returns something like
+			# 'Intel(R) Pentium(R) M processor 1400MHz'.
+			if arch == "unknown" || arch =~ / /
+				arch = `uname -m`.strip
+			end
+			if arch =~ /^i.86$/
+				arch = "x86"
+			elsif arch == "amd64"
+				arch = "x86_64"
+			end
+			
+			if arch == "x86"
+				# Most x86 operating systems nowadays are probably running on
+				# a CPU that supports both x86 and x86_64, but we're not gonna
+				# go through the trouble of checking that. The main architecture
+				# is what we usually care about.
+				["x86"]
+			elsif arch == "x86_64"
+				# I don't think there's a single x86_64 CPU out there
+				# that doesn't support x86 as well.
+				["x86_64", "x86"]
+			else
+				[arch]
+			end
+		end
+	end
+	memoize :cpu_architectures, true
+	
+	# Returns whether the OS's main CPU architecture supports the
+	# x86/x86_64 sfence instruction.
+	def self.supports_sfence_instruction?
+		arch = cpu_architectures[0]
+		return arch == "x86_64" || (arch == "x86" &&
+			try_compile_and_run(:c, %Q{
+				int
+				main() {
+					__asm__ __volatile__ ("sfence" ::: "memory");
+					return 0;
+				}
+			}))
+	end
+	memoize :supports_sfence_instruction?, true
+	
+	# Returns whether the OS's main CPU architecture supports the
+	# x86/x86_64 lfence instruction.
+	def self.supports_lfence_instruction?
+		arch = cpu_architectures[0]
+		return arch == "x86_64" || (arch == "x86" &&
+			try_compile_and_run(:c, %Q{
+				int
+				main() {
+					__asm__ __volatile__ ("lfence" ::: "memory");
+					return 0;
+				}
+			}))
+	end
+	memoize :supports_lfence_instruction?, true
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/public_api.rb

@@ -41,11 +41,11 @@ class << self
 		end
 	end
 	
-	def install_framework_extensions!
+	def install_framework_extensions!(*args)
 		require 'rails/version' if defined?(::Rails) && !defined?(::Rails::VERSION)
 		if defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
 			require 'phusion_passenger/rails3_extensions/init'
-			Rails3Extensions.init!(_spawn_options)
+			Rails3Extensions.init!(_spawn_options, *args)
 		end
 	end
 	

data/lib/phusion_passenger/rails3_extensions/init.rb

@@ -55,7 +55,7 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 		end
 		
 		if defined?(ActionDispatch::ShowExceptions)
-			Rails::Application.middleware.insert_after(
+			Rails.application.middleware.insert_after(
 				ActionDispatch::ShowExceptions,
 				ExceptionLogger, analytics_logger)
 		end
@@ -78,7 +78,10 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 	
 	def process_action(event)
 		log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
-		log.message("View rendering time: #{(event.payload[:view_runtime] * 1000).to_i}") if log
+		if log
+			view_runtime = event.payload[:view_runtime]
+			log.message("View rendering time: #{(view_runtime * 1000).to_i}") if view_runtime
+		end
 	end
 	
 	def sql(event)

data/lib/phusion_passenger/standalone/command.rb

@@ -171,6 +171,9 @@ private
 	end
 	
 	def write_nginx_config_file
+		require 'phusion_passenger/platform_info/ruby'
+		ensure_directory_exists(@temp_dir)
+		
 		File.open(@config_filename, 'w') do |f|
 			f.chmod(0644)
 			template_filename = File.join(TEMPLATES_DIR, "standalone", "config.erb")
@@ -195,7 +198,7 @@ private
 		else
 			nginx_bin = "#{nginx_dir}/sbin/nginx"
 		end
-		return "#{nginx_bin} -c '#{@config_filename}'"
+		return "#{nginx_bin} -c '#{@config_filename}' -p '#{@temp_dir}/'"
 	end
 	
 	# Returns the port on which to ping Nginx.
@@ -218,7 +221,8 @@ private
 	
 	def create_nginx_controller(extra_options = {})
 		require_daemon_controller
-		@config_filename = "/tmp/passenger-standalone.#{$$}.conf"
+		@temp_dir        = "/tmp/passenger-standalone.#{$$}"
+		@config_filename = "#{@temp_dir}/config"
 		opts = {
 			:identifier    => 'Nginx',
 			:before_start  => method(:write_nginx_config_file),

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -33,8 +33,8 @@ class PackageRuntimeCommand < Command
 	def run
 		destdir = File.expand_path("passenger-standalone")
 		description =
-			"Package the Phusion Passenger Standalone runtime into the specified directory. If\n" <<
-			"DIRECTORY is not given then #{destdir} will be used."
+			"Package the Phusion Passenger Standalone runtime into the specified directory.\n" <<
+			"If DIRECTORY is not given then #{destdir} will be used."
 		parse_options!("package [directory]", description) do |opts|
 			opts.on("--nginx-version VERSION", String,
 				wrap_desc("Nginx version to use as core (default: #{@options[:nginx_version]})")) do |value|

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -420,7 +420,7 @@ private
 		# Then compile it.
 		yield(0, 1, 2, "Preparing Phusion Passenger...")
 		Dir.chdir(@support_dir) do
-			run_rake_task!("nginx CACHING=no") do |progress, total|
+			run_rake_task!("nginx RELEASE=yes") do |progress, total|
 				yield(progress, total, 2, "Compiling Phusion Passenger...")
 			end
 		end
@@ -429,7 +429,16 @@ private
 	def install_nginx_from_source(source_dir)
 		require 'phusion_passenger/platform_info/compiler'
 		Dir.chdir(source_dir) do
-			command = "sh ./configure '--prefix=#{@nginx_dir}' --without-pcre " <<
+			# 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
+			# locations. For Phusion Passenger Standalone we do not
+			# care at all what the Nginx configured prefix is because
+			# we pass it its resource locations during runtime, so
+			# work around the problem by configure Nginx with prefix
+			# /tmp.
+			command = "sh ./configure --prefix=/tmp " <<
+				"--without-pcre " <<
 				"--without-http_rewrite_module " <<
 				"--without-http_fastcgi_module " <<
 				"'--add-module=#{@support_dir}/ext/nginx'"
@@ -455,9 +464,12 @@ private
 				exit 1
 			end
 			
-			command = "#{PlatformInfo.gnu_make} install"
-			run_command_with_throbber(command, "Copying files...") do |status_text|
-				yield(1, 1, status_text)
+			yield(1, 1, 'Copying files...')
+			if !system("mkdir -p '#{@nginx_dir}/sbin'") ||
+			   !system("cp -pR objs/nginx '#{@nginx_dir}/sbin/'")
+				STDERR.puts
+				STDERR.puts "*** ERROR: unable to copy Nginx binaries."
+				exit 1
 			end
 		end
 	end

data/lib/phusion_passenger/standalone/start_command.rb

@@ -98,8 +98,8 @@ class StartCommand < Command
 			stop_threads
 		end
 	ensure
-		if @config_filename
-			File.unlink(@config_filename) rescue nil
+		if @temp_dir
+			FileUtils.rm_rf(@temp_dir) rescue nil
 		end
 		@plugin.call_hook(:cleanup)
 	end
@@ -157,13 +157,17 @@ private
 				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
 				@options[:spawn_method] = value
 			end
-			opts.on("--analytics",
-				wrap_desc("Enable analytics support")) do
-				@options[:analytics] = true
+			opts.on("--union-station-gateway HOST:PORT", String,
+				wrap_desc("Specify Union Station Gateway host and port")) do |value|
+				host, port = value.split(":", 2)
+				port = port.to_i
+				port = 443 if port == 0
+				@options[:union_station_gateway_address] = host
+				@options[:union_station_gateway_port] = port.to_i
 			end
-			opts.on("--debugger",
-				wrap_desc("Enable debugger support")) do
-				@options[:debugger] = true
+			opts.on("--union-station-key KEY", String,
+				wrap_desc("Specify Union Station key")) do |value|
+				@options[:union_station_key] = value
 			end
 			
 			opts.separator ""
@@ -320,10 +324,6 @@ private
 				end
 			end
 		end
-		
-		nginx_version = @options[:nginx_version]
-		@temp_dir = "#{home}/#{LOCAL_DIR}/standalone/#{runtime_version_string}/nginx-#{nginx_version}/temp"
-		ensure_directory_exists(@temp_dir)
 	end
 	
 	def ensure_directory_exists(dir)

data/lib/phusion_passenger/standalone/stop_command.rb

@@ -58,9 +58,9 @@ class StopCommand < Command
 			STDERR.puts "If you know that Phusion Passenger Standalone *is* running then one of these"
 			STDERR.puts "might be the cause of this error:"
 			STDERR.puts
-			STDERR.puts " * The Phusion Passenger Standalone instance that you want to stop isn't running on"
-			STDERR.puts "   port #{@options[:port]}, but on another port. If this is the case then you should"
-			STDERR.puts "   specify the right port with --port."
+			STDERR.puts " * The Phusion Passenger Standalone instance that you want to stop isn't running"
+			STDERR.puts "   on port #{@options[:port]}, but on another port. If this is the case then you"
+			STDERR.puts "   should specify the right port with --port."
 			STDERR.puts "   If the instance is listening on a Unix socket file instead of a TCP port,"
 			STDERR.puts "   then please specify the PID file's filename with --pid-file."
 			STDERR.puts " * The instance that you want to stop has stored its PID file in a non-standard"

data/lib/phusion_passenger/standalone/utils.rb

@@ -33,8 +33,12 @@ private
 	end
 	
 	def runtime_version_string
-		require_platform_info_binary_compatibility
-		return "#{VERSION_STRING}-#{PlatformInfo.passenger_binary_compatibility_id}"
+		if PhusionPassenger.natively_packaged?
+			return "natively-packaged"
+		else
+			require_platform_info_binary_compatibility
+			return "#{VERSION_STRING}-#{PlatformInfo.passenger_binary_compatibility_id}"
+		end
 	end
 end
 

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -1,3 +1,29 @@
+#####################################################
+#
+#       !!!!!!! WARNING, READ THIS !!!!!!!
+#
+#
+#  The fact that Phusion Passenger uses Nginx
+#  internally is considered to be an implementation
+#  detail that the user should not bother with.
+#  We may arbitrarily replace the Nginx core with
+#  something else in the future.
+#
+#  As such, we do not support any kind of custom
+#  Nginx configuration in Phusion Passenger Standalone.
+#  If you need additional Nginx modules or if you need
+#  special Nginx configuration or whatever then you
+#  should use Phusion Passenger for Nginx, NOT
+#  Phusion Passenger Standalone.
+#
+#  You are strongly discouraged from editing this file
+#  and treating Phusion Passenger Standalone as an easy
+#  way to start Nginx. We will not provide any support
+#  for this.
+# 
+#####################################################
+
+
 master_process on;
 worker_processes 1;
 daemon on;
@@ -10,9 +36,7 @@ events {
 }
 
 http {
-    include '<%= nginx_dir %>/conf/mime.types';
-    client_body_temp_path '<%= @temp_dir %>/client';
-    proxy_temp_path '<%= @temp_dir %>/proxy';
+    include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types';
     passenger_ruby <%= PlatformInfo.ruby_command %>;
     passenger_root '<%= passenger_root %>';
     passenger_abort_on_startup_error on;
@@ -21,6 +45,12 @@ http {
     passenger_min_instances <%= @options[:min_instances] %>;
     <% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %>
     
+    <% if @options[:union_station_gateway_address] %>
+        union_station_gateway_address <%= @options[:union_station_gateway_address] %>;
+        union_station_gateway_port <%= @options[:union_station_gateway_port] %>;
+        union_station_gateway_cert -;
+    <% end %>
+    
     default_type application/octet-stream;
     client_max_body_size 50m;
     access_log off;
@@ -55,8 +85,10 @@ http {
         rails_env <%= app[:env] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
-        <% if app[:analytics] %>passenger_analytics on;<% end %>
-        <% if app[:debugger] %>passenger_debugger on;<% end %>
+        <% if app[:union_station_key] %>
+            passenger_analytics on;
+            union_station_key <%= app[:union_station_key] %>;
+        <% end %>
     }
     <% end %>
 }