passenger 4.0.19 → 4.0.20

data/lib/phusion_passenger/nginx/config_options.rb

@@ -229,6 +229,10 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:name  => 'passenger_spawn_method',
 		:type  => :string
 	},
+	{
+		:name  => 'passenger_load_shell_envvars',
+		:type  => :flag
+	},
 	{
 		:name  => 'union_station_key',
 		:type  => :string

data/lib/phusion_passenger/platform_info/apache.rb

@@ -399,7 +399,12 @@ module PlatformInfo
 	# The C compiler flags that are necessary to compile an Apache module.
 	# Also includes APR and APU compiler flags if with_apr_flags is true.
 	def self.apache2_module_cflags(with_apr_flags = true)
-		flags = ["-fPIC"]
+		flags = [""]
+		if cc_is_sun_studio?
+			flags << "-KPIC"
+		else
+			flags << "-fPIC"
+		end
 		if with_apr_flags
 			flags << apr_flags
 			flags << apu_flags

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/operating_system'
 
 module PhusionPassenger
 
@@ -106,11 +107,32 @@ private
 
 public
 	def self.cc
-		return string_env('CC', 'gcc')
+		return string_env('CC', default_cc)
 	end
 	
 	def self.cxx
-		return string_env('CXX', 'g++')
+		return string_env('CXX', default_cxx)
+	end
+
+	def self.default_cc
+		# OS X Mavericks (10.9) switched from GCC to Clang as the default compiler,
+		# i.e. as an alias for 'cc'. Since the Nginx by default uses 'cc' as the compiler,
+		# we'll have to do that too. Otherwise we'll get C++ linker errors because Nginx
+		# is compiled with Clang while Phusion Passenger is compiled with GCC.
+		# https://code.google.com/p/phusion-passenger/issues/detail?id=950
+		if PlatformInfo.os_name == "macosx"
+			return 'cc'
+		else
+			return 'gcc'
+		end
+	end
+
+	def self.default_cxx
+		if PlatformInfo.os_name == "macosx"
+			return 'c++'
+		else
+			return 'g++'
+		end
 	end
 
 	def self.cc_is_clang?
@@ -123,6 +145,11 @@ public
 	end
 	memoize :cxx_is_clang?
 
+	def self.cc_is_sun_studio?
+		`#{cc} -V 2>&1` =~ /Sun C/ || `#{cc} -flags 2>&1` =~ /Sun C/
+	end
+	memoize :cc_is_sun_studio?
+
 
 	# Looks for the given C or C++ header. This works by invoking the compiler and
 	# searching in the compiler's header search path. Returns its full filename,

data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb

@@ -1,5 +1,5 @@
-define 'gcc' do
-  name "GNU C compiler"
+define 'cc' do
+  name "C compiler"
   website "http://gcc.gnu.org/"
   define_checker do
     require 'phusion_passenger/platform_info/compiler'
@@ -23,8 +23,8 @@ define 'gcc' do
   end
 end
 
-define 'g++' do
-  name "GNU C++ compiler"
+define 'c++' do
+  name "C++ compiler"
   website "http://gcc.gnu.org/"
   define_checker do
     require 'phusion_passenger/platform_info/compiler'

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -255,19 +255,23 @@ module PlatformInfo
 			matching_path = $LOAD_PATH.find_all do |item|
 				item.include?("rvm/gems/")
 			end
-			if matching_path
+			if matching_path && !matching_path.empty?
 				subpath = matching_path.to_s.gsub(/^.*rvm\/gems\//, '')
 				result = subpath.split('/').first
 				return result if result
 			end
-			
+
 			# On Ruby 1.9, $LOAD_PATH does not contain any gem paths until
 			# at least one gem has been required so the above can fail.
 			# We're out of options now, we can't detect the gem set.
 			# Raise an exception so that the user knows what's going on
 			# instead of having things fail in obscure ways later.
 			STDERR.puts "Unable to autodetect the currently active RVM gem " +
-				"set name. Please contact this program's author for support."
+				"set name. This could happen if you ran this program using 'sudo' " +
+				"instead of 'rvmsudo'. When using RVM, you're always supposed to " +
+				"use 'rvmsudo' instead of 'sudo!'.\n\n" +
+				"Please try rerunning this program using 'rvmsudo'. If that " +
+				"doesn't help, please contact this program's author for support."
 			exit 1
 		end
 		return nil

data/lib/phusion_passenger/public_api.rb

@@ -42,10 +42,10 @@ class << self
 	end
 	
 	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!(PhusionPassenger::App.options, *args)
+		require 'active_support/version' if defined?(::ActiveSupport) && !defined?(::ActiveSupport::VERSION)
+		if defined?(::ActiveSupport) && ::ActiveSupport::VERSION::MAJOR >= 3
+			require 'phusion_passenger/active_support3_extensions/init'
+			ActiveSupport3Extensions.init!(PhusionPassenger::App.options, *args)
 		end
 	end
 

data/lib/phusion_passenger/standalone/command.rb

@@ -222,6 +222,16 @@ private
 			puts output if debugging?
 		end
 	end
+
+	def serialize_strset(*items)
+		if "".respond_to?(:force_encoding)
+			items = items.map { |x| x.force_encoding('binary') }
+			null  = "\0".force_encoding('binary')
+		else
+			null  = "\0"
+		end
+		return [items.join(null)].pack('m*').gsub("\n", "").strip
+	end
 	
 	def determine_nginx_start_command
 		if @options[:nginx_bin]

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -99,8 +99,8 @@ protected
 			'depcheck_specs/utilities'
 		]
 		ids = [
-			'gcc',
-			'g++',
+			'cc',
+			'c++',
 			'gmake',
 			'ruby-openssl',
 			'rubygems',

data/lib/phusion_passenger/standalone/start_command.rb

@@ -106,16 +106,12 @@ class StartCommand < Command
 		ensure
 			begin_shutdown
 			begin
-				stop_touching_temp_dir_in_background if should_wait_until_nginx_has_exited?
 				stop_threads
 			ensure
 				finalize_shutdown
 			end
 		end
 	ensure
-		if @temp_dir
-			FileUtils.remove_entry_secure(@temp_dir) rescue nil
-		end
 		@plugin.call_hook(:cleanup)
 	end
 
@@ -402,6 +398,10 @@ private
 		return !@options[:daemonize]
 	end
 
+	def should_cleanup_temp_dir?
+		return @temp_dir && !@options[:daemonize]
+	end
+
 	# Returns the URL that Nginx will be listening on.
 	def listen_url
 		if @options[:socket_file]
@@ -570,10 +570,16 @@ private
 	end
 
 	def touch_temp_dir_in_background
-		require 'shellwords'
-		script = Shellwords.escape("#{PhusionPassenger.helper_scripts_dir}/touch-dir.sh")
-		dir    = Shellwords.escape(@temp_dir)
-		@toucher = IO.popen("sh #{script} #{dir}", "r")
+		result = system("#{@runtime_locator.find_agents_dir}/TempDirToucher",
+			@temp_dir,
+			"--cleanup",
+			"--daemonize",
+			"--pid-file", "#{@temp_dir}/temp_dir_toucher.pid",
+			"--log-file", @options[:log_file])
+		if !result
+			error "Cannot start #{@runtime_locator.find_agents_dir}/TempDirToucher"
+			exit 1
+		end
 	end
 
 	def begin_shutdown

data/lib/phusion_passenger/utils/unseekable_socket.rb

@@ -115,6 +115,12 @@ class UnseekableSocket
 	rescue => e
 		raise annotate(e)
 	end
+
+	def write_nonblock(string)
+		@socket.write_nonblock(string)
+	rescue => e
+		raise annotate(e)
+	end
 	
 	def writev(components)
 		@socket.writev(components)
@@ -134,6 +140,24 @@ class UnseekableSocket
 		raise annotate(e)
 	end if IO.method_defined?(:writev3)
 	
+	def send(*args)
+		@socket.send(*args)
+	rescue => e
+		raise annotate(e)
+	end
+
+	def sendmsg(*args)
+		@socket.sendmsg(*args)
+	rescue => e
+		raise annotate(e)
+	end
+
+	def sendmsg_nonblock(*args)
+		@socket.sendmsg_nonblock(*args)
+	rescue => e
+		raise annotate(e)
+	end
+
 	def puts(*args)
 		@socket.puts(*args)
 	rescue => e
@@ -165,6 +189,13 @@ class UnseekableSocket
 	rescue => e
 		raise annotate(e)
 	end
+
+	def read_nonblock(*args)
+		raise EOFError, "end of file reached" if @simulate_eof
+		@socket.read_nonblock(*args)
+	rescue => e
+		raise annotate(e)
+	end
 	
 	def readpartial(*args)
 		raise EOFError, "end of file reached" if @simulate_eof
@@ -179,6 +210,27 @@ class UnseekableSocket
 	rescue => e
 		raise annotate(e)
 	end
+
+	def recv(*args)
+		raise EOFError, "end of file reached" if @simulate_eof
+		@socket.recv(*args)
+	rescue => e
+		raise annotate(e)
+	end
+
+	def recvfrom(*args)
+		raise EOFError, "end of file reached" if @simulate_eof
+		@socket.recvfrom(*args)
+	rescue => e
+		raise annotate(e)
+	end
+
+	def recvfrom_nonblock(*args)
+		raise EOFError, "end of file reached" if @simulate_eof
+		@socket.recvfrom_nonblock(*args)
+	rescue => e
+		raise annotate(e)
+	end
 	
 	def each(&block)
 		return if @simulate_eof

data/resources/templates/standalone/config.erb

@@ -11,6 +11,16 @@ daemon on;
 error_log '<%= @options[:log_file] %>' <% if debugging? %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
 
+<% if Process.euid == 0 %>
+    <% if @options[:user] %>
+        <%# Run workers as the given user. The master process will always run as root and will be able to bind to any port. %>
+        user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
+    <% else %>
+        <%# Prevent running Nginx workers as nobody. %>
+        user <%= current_user %> <%= default_group_for(current_user) %>;
+    <% end %>
+<% end %>
+
 events {
     worker_connections 1024;
 }
@@ -21,6 +31,7 @@ http {
     passenger_ruby <%= PlatformInfo.ruby_command %>;
     passenger_root '<%= location_config_filename %>';
     passenger_abort_on_startup_error on;
+    passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@temp_dir}/temp_dir_toucher.pid") %>;
     passenger_user_switching off;
     passenger_max_pool_size <%= @options[:max_pool_size] %>;
     passenger_min_instances <%= @options[:min_instances] %>;

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.19
-  prerelease: 
+  version: 4.0.20
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: daemon_controller
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +98,7 @@ files:
 - build/test_basics.rb
 - lib/phusion_passenger.rb
 - lib/phusion_passenger/abstract_installer.rb
+- lib/phusion_passenger/active_support3_extensions/init.rb
 - lib/phusion_passenger/admin_tools/memory_stats.rb
 - lib/phusion_passenger/admin_tools/server_instance.rb
 - lib/phusion_passenger/admin_tools.rb
@@ -145,7 +139,6 @@ files:
 - lib/phusion_passenger/public_api.rb
 - lib/phusion_passenger/rack/out_of_band_gc.rb
 - lib/phusion_passenger/rack/thread_handler_extension.rb
-- lib/phusion_passenger/rails3_extensions/init.rb
 - lib/phusion_passenger/request_handler/thread_handler.rb
 - lib/phusion_passenger/request_handler.rb
 - lib/phusion_passenger/ruby_core_enhancements.rb
@@ -317,7 +310,6 @@ files:
 - helper-scripts/rack-loader.rb
 - helper-scripts/rack-preloader.rb
 - helper-scripts/system-memory-stats.py
-- helper-scripts/touch-dir.sh
 - helper-scripts/wsgi-loader.py
 - helper-scripts/wsgi-preloader.py
 - ext/common/agents/Base.cpp
@@ -348,6 +340,7 @@ files:
 - ext/common/Utils/SystemTime.cpp
 - ext/common/Utils.cpp
 - ext/common/agents/EnvPrinter.c
+- ext/common/agents/TempDirToucher.c
 - ext/common/Utils/Blowfish.c
 - ext/common/Utils/fib.c
 - ext/common/Account.h
@@ -2110,19 +2103,26 @@ files:
 - ext/boost/type_traits/decay.hpp
 - ext/boost/type_traits/detail/bool_trait_def.hpp
 - ext/boost/type_traits/detail/bool_trait_undef.hpp
+- ext/boost/type_traits/detail/common_type_imp.hpp
 - ext/boost/type_traits/detail/cv_traits_impl.hpp
 - ext/boost/type_traits/detail/false_result.hpp
+- ext/boost/type_traits/detail/has_binary_operator.hpp
+- ext/boost/type_traits/detail/has_postfix_operator.hpp
+- ext/boost/type_traits/detail/has_prefix_operator.hpp
 - ext/boost/type_traits/detail/ice_and.hpp
 - ext/boost/type_traits/detail/ice_eq.hpp
 - ext/boost/type_traits/detail/ice_not.hpp
 - ext/boost/type_traits/detail/ice_or.hpp
 - ext/boost/type_traits/detail/is_function_ptr_helper.hpp
+- ext/boost/type_traits/detail/is_function_ptr_tester.hpp
 - ext/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
+- ext/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
 - ext/boost/type_traits/detail/size_t_trait_def.hpp
 - ext/boost/type_traits/detail/size_t_trait_undef.hpp
 - ext/boost/type_traits/detail/template_arity_spec.hpp
 - ext/boost/type_traits/detail/type_trait_def.hpp
 - ext/boost/type_traits/detail/type_trait_undef.hpp
+- ext/boost/type_traits/detail/wrap.hpp
 - ext/boost/type_traits/detail/yes_no_type.hpp
 - ext/boost/type_traits/function_traits.hpp
 - ext/boost/type_traits/has_nothrow_assign.hpp
@@ -2900,27 +2900,26 @@ files:
 - test/stub/wsgi/tmp/.gitignore
 homepage: https://www.phusionpassenger.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: passenger
-rubygems_version: 1.8.25
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast and robust web server and application server for Ruby, Python and
   Node.js
 test_files: []