passenger 4.0.23 → 4.0.24

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.23'
+	VERSION_STRING = '4.0.24'
 	
 	PREFERRED_NGINX_VERSION = '1.4.3'
 	NGINX_SHA256_CHECKSUM = 'ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'

data/lib/phusion_passenger/apache2/config_options.rb

@@ -42,6 +42,12 @@
 #  * min_value - If `type` is :integer, then this specifies the minimum
 #                allowed value. When nil (the default), there is no minimum.
 #  * desc - A description for this configuration option. Required.
+#  * header - The name of the corresponding CGI header. By default CGI header
+#             generation code is automatically generated, using the configuration
+#             option's name in uppercase as the CGI header name.
+#             Setting this to nil will disable auto-generation of CGI header
+#             generation code. You are then responsible for writing CGI header
+#             passing code yourself in Hooks.cpp.
 
 APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 	{
@@ -50,6 +56,16 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:desc => "The Ruby interpreter to use.",
 		:header_expression => "config->ruby ? config->ruby : serverConfig.defaultRuby"
 	},
+	{
+		:name => "PassengerPython",
+		:type => :string,
+		:desc => "The Python interpreter to use."
+	},
+	{
+		:name => "PassengerNodejs",
+		:type => :string,
+		:desc => "The Node.js command to use."
+	},
 	{
 		:name => "PassengerMinInstances",
 		:type => :integer,
@@ -69,6 +85,13 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:context => ["ACCESS_CONF", "RSRC_CONF"],
 		:desc => "The group that Ruby applications must run as."
 	},
+	{
+		:name => "PassengerErrorOverride",
+		:type => :flag,
+		:context => ["OR_ALL"],
+		:desc    => "Allow Apache to handle error response.",
+		:header  => nil
+	},
 	{
 		:name => "PassengerMaxRequests",
 		:type => :integer,

data/lib/phusion_passenger/constants.rb

@@ -37,6 +37,7 @@ module PhusionPassenger
 		DEFAULT_LOG_LEVEL = 0
 		DEFAULT_RUBY = "ruby"
 		DEFAULT_PYTHON = "python"
+		DEFAULT_NODEJS = "node"
 		DEFAULT_MAX_POOL_SIZE = 6
 		DEFAULT_POOL_IDLE_TIME = 300
 		DEFAULT_START_TIMEOUT = 90_000
@@ -80,7 +81,8 @@ module PhusionPassenger
 			"--without-http_scgi_module " <<
 			"--without-http_uwsgi_module " <<
 			"--with-http_gzip_static_module " <<
-			"--with-http_stub_status_module"
+			"--with-http_stub_status_module " <<
+			"--with-http_ssl_module"
 	end
 
 	SharedConstants.constants.each do |name|

data/lib/phusion_passenger/nginx/config_options.rb

@@ -100,6 +100,10 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:name  => 'passenger_python',
 		:type  => :string
 	},
+	{
+		:name  => 'passenger_nodejs',
+		:type  => :string
+	},
 	{
 		:name  => 'passenger_app_env',
 		:type  => :string,

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -32,6 +32,8 @@ module PlatformInfo
 	def self.os_name
 		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
+		elsif rb_config['target_os'] == "linux-"
+			return "linux"
 		else
 			return rb_config['target_os']
 		end

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
+require 'etc'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'
 
@@ -323,6 +324,29 @@ module PlatformInfo
 			return "sudo"
 		end
 	end
+
+	# Returns a `sudo` or `rvmsudo` command that spawns a shell, depending
+	# on whether the current Ruby interpreter is managed by RVM.
+	def self.ruby_sudo_shell_command(args = nil)
+		if in_rvm?
+			shell = ENV['SHELL'].to_s
+			if shell.empty?
+				begin
+					user = Etc.getpwuid(0)
+				rescue ArgumentError
+					user = nil
+				end
+				shell = user.shell if user
+				shell = "bash" if !shell || shell.empty?
+			end
+			result = "rvmsudo "
+			result << "#{args} " if args
+			result << shell
+			return result
+		else
+			return "sudo -s #{args}".strip
+		end
+	end
 	
 	# Locates a Ruby tool command, e.g. 'gem', 'rake', 'bundle', etc. Instead of
 	# naively looking in $PATH, this function uses a variety of search heuristics

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -25,7 +25,6 @@ require 'phusion_passenger/utils/file_system_watcher'
 module PhusionPassenger
 module Standalone
 
-# Security note: can run arbitrary ruby code by evaluating passenger.conf
 class AppFinder
 	attr_accessor :dirs
 	attr_reader :apps
@@ -34,42 +33,44 @@ class AppFinder
 		return File.exist?("#{dir}/config.ru") ||
 			File.exist?("#{dir}/config/environment.rb") ||
 			File.exist?("#{dir}/passenger_wsgi.py") ||
-			File.exist?("#{dir}/passenger_node.js")
+			File.exist?("#{dir}/app.js") ||
+			File.exist?("#{dir}/.meteor")
 	end
 	
 	def initialize(dirs, options = {})
 		@dirs = dirs
-		@options = options
+		@options = options.dup
+	end
+
+	def global_options
+		return @options
 	end
 	
 	def scan
 		apps = []
 		watchlist = []
 		
-		app_root = find_app_root
-		apps << {
-			:server_names => ["_"],
-			:root => app_root
-		}
-		watchlist << app_root
-		watchlist << "#{app_root}/config" if File.exist?("#{app_root}/config")
-		watchlist << "#{app_root}/passenger.conf" if File.exist?("#{app_root}/passenger.conf")
-		
-		apps.sort! do |a, b|
-			a[:root] <=> b[:root]
-		end
-		apps.map! do |app|
-			config_filename = File.join(app[:root], "passenger.conf")
+		if single_mode?
+			app_root = find_app_root
+			apps << {
+				:server_names => ["_"],
+				:root => app_root
+			}
+			watchlist << app_root
+			watchlist << "#{app_root}/config" if File.exist?("#{app_root}/config")
+			watchlist << "#{app_root}/passenger-standalone.json" if File.exist?("#{app_root}/passenger-standalone.json")
+			
+			config_filename = File.join(app_root, "passenger-standalone.json")
 			if File.exist?(config_filename)
-				local_options = load_config_file(:local_config, config_filename)
-				merged_options = @options.merge(app)
-				merged_options.merge!(local_options)
-				merged_options
-			else
+				global_options = load_config_file!(:global_config, config_filename)
+				@options.merge!(global_options)
+			end
+
+			apps.map! do |app|
 				@options.merge(app)
 			end
 		end
-		
+
 		@apps = apps
 		@watchlist = watchlist
 		return apps
@@ -112,10 +113,21 @@ class AppFinder
 	ensure
 		watcher.close if watcher
 	end
+
+	def single_mode?
+		return true
+	end
+	
+	def multi_mode?
+		return !single_mode?
+	end
 	
 	##################
 
 private
+	class ConfigLoadError < StandardError
+	end
+
 	def find_app_root
 		if @dirs.empty?
 			return File.expand_path(".")
@@ -124,9 +136,37 @@ private
 		end
 	end
 	
+	def load_config_file!(context, filename)
+		require 'phusion_passenger/utils/json' if !defined?(PhusionPassenger::Utils::JSON)
+		begin
+			data = File.open(filename, "r:utf-8") do |f|
+				f.read
+			end
+		rescue SystemCallError => e
+			raise ConfigLoadError, "cannot load config file #{filename} (#{e})"
+		end
+
+		begin
+			config = PhusionPassenger::Utils::JSON.parse(data)
+		rescue => e
+			raise ConfigLoadError, "cannot parse config file #{filename} (#{e})"
+		end
+		if !config.is_a?(Hash)
+			raise ConfigLoadError, "cannot parse config file #{filename} (it does not contain an object)"
+		end
+
+		result = {}
+		config.each_pair do |key, val|
+			result[key.to_sym] = val
+		end
+		return result
+	end
+
 	def load_config_file(context, filename)
-		require 'phusion_passenger/standalone/config_file' unless defined?(ConfigFile)
-		return ConfigFile.new(context, filename).options
+		return load_config_file!(context, filename)
+	rescue ConfigLoadError => e
+		STDERR.puts "*** Warning: #{e.message}"
+		return {}
 	end
 	
 	def looks_like_app_directory?(dir)

data/lib/phusion_passenger/standalone/command.rb

@@ -32,7 +32,7 @@ class Command
 	DEFAULT_OPTIONS = {
 		:address       => '0.0.0.0',
 		:port          => 3000,
-		:env           => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development',
+		:environment   => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development',
 		:max_pool_size => 6,
 		:min_instances => 1,
 		:spawn_method  => Kernel.respond_to?(:fork) ? 'smart' : 'direct',

data/lib/phusion_passenger/standalone/start_command.rb

@@ -58,10 +58,11 @@ class StartCommand < Command
 			@options[:nginx_version])
 		ensure_runtime_installed
 		exit if @options[:runtime_check_only]
-		determine_various_resource_locations
 		require_app_finder
 		@app_finder = AppFinder.new(@args, @options)
 		@apps = @app_finder.scan
+		@options = @app_finder.global_options
+		determine_various_resource_locations
 		@plugin.call_hook(:found_apps, @apps)
 
 		extra_controller_options = {}
@@ -141,8 +142,8 @@ private
 
 			opts.separator ""
 			opts.on("-e", "--environment ENV", String,
-				wrap_desc("Framework environment (default: #{@options[:env]})")) do |value|
-				@options[:env] = value
+				wrap_desc("Framework environment (default: #{@options[:environment]})")) do |value|
+				@options[:environment] = value
 			end
 			opts.on("-R", "--rackup FILE", String,
 				wrap_desc("If Rack application detected, run this rackup file")) do |value|
@@ -486,7 +487,7 @@ private
 		puts "=============== Phusion Passenger Standalone web server started ==============="
 		puts "PID file: #{@options[:pid_file]}"
 		puts "Log file: #{@options[:log_file]}"
-		puts "Environment: #{@options[:env]}"
+		puts "Environment: #{@options[:environment]}"
 		puts "Accessible via: #{listen_url}"
 
 		puts
@@ -563,7 +564,7 @@ private
 	def watch_log_files_in_background
 		@apps.each do |app|
 			thread = Thread.new do
-				watch_log_file("#{app[:root]}/log/#{@options[:env]}.log")
+				watch_log_file("#{app[:root]}/log/#{@options[:environment]}.log")
 			end
 			@threads << thread
 			@interruptable_threads << thread

data/resources/templates/installer_common/run_installer_as_root.txt.erb

@@ -7,4 +7,7 @@ This installer must be able to write to the following directory:
 But it can't do that, because you're running the installer as <b><%= `whoami`.strip %></b>.
 Please re-run this installer using <%= @sudo %>:
 
-  <b><%= @sudo_e %> <%= @ruby %> <%= @installer %></b>
+  <b>export ORIG_PATH="$PATH"
+  <%= @sudo_s_e %>
+  export PATH="$ORIG_PATH"
+  <%= @ruby %> <%= @installer %></b>

data/resources/templates/standalone/config.erb

@@ -92,7 +92,7 @@ http {
         root '<%= app[:root] %>/public';
         passenger_app_root '<%= app[:root] %>';
         passenger_enabled on;
-        rails_env <%= app[:env] %>;
+        passenger_app_env <%= app[:environment] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;
         <% if app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
         <% if app[:thread_count] != DEFAULT_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -1704,6 +1704,24 @@ namespace tut {
 		);
 	}
 
+	TEST_METHOD(78) {
+		// Test restarting while a previous restart was already being finalized.
+		// The previous finalization should abort.
+		Options options = createOptions();
+		initPoolDebugging();
+		debug->spawning = false;
+		pool->get(options, &ticket);
+
+		ensure_equals(pool->restartSuperGroupsByAppRoot(options.appRoot), 1u);
+		debug->debugger->recv("About to end restarting");
+		ensure_equals(pool->restartSuperGroupsByAppRoot(options.appRoot), 1u);
+		debug->debugger->recv("About to end restarting");
+		debug->messages->send("Finish restarting");
+		debug->messages->send("Finish restarting");
+		debug->debugger->recv("Restarting done");
+		debug->debugger->recv("Restarting aborted");
+	}
+
 	// TODO: Persistent connections.
 	// TODO: If one closes the session before it has reached EOF, and process's maximum concurrency
 	//       has already been reached, then the pool should ping the process so that it can detect

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.23
+  version: 4.0.24
+  prerelease: 
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: daemon_controller
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -3010,26 +3017,27 @@ 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: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A fast and robust web server and application server for Ruby, Python and
   Node.js
 test_files: []