passenger 4.0.3 → 4.0.4

data/ext/nginx/ngx_http_passenger_module.h

@@ -48,20 +48,18 @@ extern ngx_module_t ngx_http_passenger_module;
 /**
  * A static schema string to be assigned to Nginx 'upstream' strctures.
  */
-extern ngx_str_t                passenger_schema_string;
+extern ngx_str_t                pp_schema_string;
 
-extern ngx_str_t                passenger_placeholder_upstream_address;
+extern ngx_str_t                pp_placeholder_upstream_address;
 
-/**
- * A CachedFileStat object used for caching stat() calls.
- */
-extern PassengerCachedFileStat  *passenger_stat_cache;
+/** A CachedFileStat object used for caching stat() calls. */
+extern PP_CachedFileStat        *pp_stat_cache;
 
-extern PassengerAppTypeDetector *passenger_app_type_detector;
+extern PP_AppTypeDetector       *pp_app_type_detector;
 
-extern PSG_AgentsStarter        *passenger_agents_starter;
+extern PP_AgentsStarter         *pp_agents_starter;
 
-extern ngx_cycle_t              *passenger_current_cycle;
+extern ngx_cycle_t              *pp_current_cycle;
 
 #endif /* _PASSENGER_NGINX_MODULE_H_ */
 

data/helper-scripts/wsgi-loader.py

@@ -171,10 +171,10 @@ class RequestHandler:
 	
 	if hasattr(socket, '_fileobject'):
 		def wrap_input_socket(self, sock):
-			return socket._fileobject(sock, 'r', 512)
+			return socket._fileobject(sock, 'rb', 512)
 	else:
 		def wrap_input_socket(self, sock):
-			return socket.socket.makefile(sock, 'r', 512)
+			return socket.socket.makefile(sock, 'rb', 512)
 
 	def process_request(self, env, input_stream, output_stream):
 		# The WSGI speculation says that the input parameter object passed needs to

data/lib/phusion_passenger.rb

@@ -29,9 +29,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	PACKAGE_NAME = 'passenger'
-	
-	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '4.0.3'
+	VERSION_STRING = '4.0.4'
 	
 	PREFERRED_NGINX_VERSION = '1.4.1'
 	NGINX_SHA256_CHECKSUM = 'bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'

data/lib/phusion_passenger/admin_tools/server_instance.rb

@@ -26,6 +26,7 @@ require 'fileutils'
 require 'socket'
 require 'ostruct'
 require 'phusion_passenger/admin_tools'
+require 'phusion_passenger/constants'
 require 'phusion_passenger/utils'
 require 'phusion_passenger/message_channel'
 require 'phusion_passenger/message_client'
@@ -34,14 +35,6 @@ module PhusionPassenger
 module AdminTools
 
 class ServerInstance
-	# If you change the structure version then don't forget to change
-	# ext/common/ServerInstanceDir.h too.
-	
-	DIR_STRUCTURE_MAJOR_VERSION = 1
-	DIR_STRUCTURE_MINOR_VERSION = 0
-	GENERATION_STRUCTURE_MAJOR_VERSION = 2
-	GENERATION_STRUCTURE_MINOR_VERSION = 0
-	
 	STALE_TIME_THRESHOLD = 60
 	
 	class StaleDirectoryError < StandardError
@@ -118,9 +111,9 @@ class ServerInstance
 		instances = []
 		
 		Dir["#{AdminTools.tmpdir}/passenger.*"].each do |dir|
-			next if File.basename(dir) !~ /passenger\.#{DIR_STRUCTURE_MAJOR_VERSION}\.(\d+)\.(\d+)\Z/
+			next if File.basename(dir) !~ /passenger\.#{PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION}\.(\d+)\.(\d+)\Z/
 			minor = $1
-			next if minor.to_i > DIR_STRUCTURE_MINOR_VERSION
+			next if minor.to_i > PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
 			
 			begin
 				instances << ServerInstance.new(dir)
@@ -178,7 +171,8 @@ class ServerInstance
 		end
 		major = major.to_i
 		minor = minor.to_i
-		if major != GENERATION_STRUCTURE_MAJOR_VERSION || minor > GENERATION_STRUCTURE_MINOR_VERSION
+		if major != PhusionPassenger::SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION ||
+		   minor > PhusionPassenger::SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION
 			raise UnsupportedGenerationStructureVersionError, "Unsupported generation directory structure version."
 		end
 		

data/lib/phusion_passenger/constants.rb

@@ -21,9 +21,51 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'phusion_passenger'
+
 module PhusionPassenger
 	PASSENGER_ANALYTICS_WEB_LOG = "PASSENGER_ANALYTICS_WEB_LOG".freeze
 	PASSENGER_TXN_ID            = "PASSENGER_TXN_ID".freeze
 	PASSENGER_UNION_STATION_KEY = "PASSENGER_UNION_STATION_KEY".freeze
 	RACK_HIJACK_IO              = "rack.hijack_io".freeze
+
+	# Constants shared between the C++ and Ruby codebase. The C++ Constants.h
+	# is automatically generated by the build system from the following
+	# definitions.
+	module SharedConstants
+		# Default config values
+		DEFAULT_LOG_LEVEL = 0
+		DEFAULT_RUBY = "ruby"
+		DEFAULT_PYTHON = "python"
+		DEFAULT_MAX_POOL_SIZE = 6
+		DEFAULT_POOL_IDLE_TIME = 300
+		DEFAULT_MAX_INSTANCES_PER_APP = 0
+		DEFAULT_WEB_APP_USER = "nobody"
+		DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
+		DEFAULT_ANALYTICS_LOG_GROUP = ""
+		DEFAULT_ANALYTICS_LOG_PERMISSIONS = "u=rwx,g=rx,o=rx"
+		DEFAULT_UNION_STATION_GATEWAY_ADDRESS = "gateway.unionstationapp.com"
+		DEFAULT_UNION_STATION_GATEWAY_PORT = 443
+
+		# Size limits
+		MESSAGE_SERVER_MAX_USERNAME_SIZE = 100
+		MESSAGE_SERVER_MAX_PASSWORD_SIZE = 100
+		POOL_HELPER_THREAD_STACK_SIZE = 1024 * 256
+
+		# Time limits
+		PROCESS_SHUTDOWN_TIMEOUT = 60 # In seconds
+		PROCESS_SHUTDOWN_TIMEOUT_DISPLAY = "1 minute"
+
+		# Versions
+		PASSENGER_VERSION = PhusionPassenger::VERSION_STRING
+		SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 1
+		SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
+		SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION = 2
+		SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION = 0
+
+		# Misc
+		FEEDBACK_FD = 3
+	end
+
+	include SharedConstants
 end

data/lib/phusion_passenger/packaging.rb

@@ -32,6 +32,12 @@ module Packaging
 		'doc/Security of user switching support.html',
 		'doc/Architectural overview.html'
 	]
+
+	# Files that must be generated before packaging.
+	PREGENERATED_FILES = [
+		'ext/common/Constants.h',
+		'doc/Packaging.html'
+	] + ASCII_DOCS
 	
 	USER_EXECUTABLES = [
 		'passenger',
@@ -66,7 +72,7 @@ module Packaging
 		'man/*',
 		'debian/*',
 		'helper-scripts/*',
-		'ext/common/**/*.{cpp,c,h,hpp,md}',
+		'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
 		'ext/apache2/*.{cpp,h,hpp,c}',
 		'ext/nginx/*.{c,cpp,h}',
 		'ext/nginx/config',
@@ -95,11 +101,7 @@ module Packaging
 		'test/ruby/**/*',
 		'test/integration_tests/**/*',
 		'test/stub/**/*'
-	
-	# If you're running 'rake package' for the first time, then ASCII_DOCS
-	# files don't exist yet, and so won't be matched by the glob.
-	# So we add these filenames manually.
-	] + ASCII_DOCS
+	]
 	
 	EXCLUDE_GLOB = [
 		'test/stub/rails_apps/3.0/empty/help/**/*',

data/lib/phusion_passenger/platform_info.rb

@@ -245,9 +245,11 @@ public
 		dir = tmpdir
 		filename = "#{dir}/#{basename}"
 		begin
-			File.open(filename, 'w').close
+			File.open(filename, 'w') do |f|
+				f.puts("#!/bin/sh")
+			end
 			File.chmod(0700, filename)
-			if File.executable?(filename)
+			if system(filename)
 				return dir
 			else
 				attempts << { :dir => dir,
@@ -266,9 +268,11 @@ public
 		dir = Dir.pwd
 		filename = "#{dir}/#{basename}"
 		begin
-			File.open(filename, 'w').close
+			File.open(filename, 'w') do |f|
+				f.puts("#!/bin/sh")
+			end
 			File.chmod(0700, filename)
-			if File.executable?(filename)
+			if system(filename)
 				return dir
 			else
 				attempts << { :dir => dir,
@@ -284,7 +288,8 @@ public
 			File.unlink(filename) rescue nil
 		end
 		
-		message = "In order to run certain tests, this program " +
+		message = "ERROR: Cannot find suitable temporary directory\n" +
+			"In order to run certain tests, this program " +
 			"must be able to write temporary\n" +
 			"executable files to some directory. However no such " +
 			"directory can be found. \n" +
@@ -294,7 +299,7 @@ public
 			message << "   #{attempt[:error]}\n"
 		end
 		message << "\nYou can solve this problem by telling this program what directory to write\n" <<
-			"temporary executable files to.\n" <<
+			"temporary executable files to, as follows:\n" <<
 			"\n" <<
 			"  Set the $TMPDIR environment variable to the desired directory's filename and\n" <<
 			"  re-run this program.\n" <<

data/lib/phusion_passenger/standalone/command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 require 'optparse'
 require 'phusion_passenger'
+require 'phusion_passenger/constants'
 require 'phusion_passenger/standalone/utils'
 
 module PhusionPassenger
@@ -207,6 +208,7 @@ private
 				"templates", "standalone", "config.erb")
 			require_erb
 			erb = ERB.new(File.read(template_filename))
+			current_user = Etc.getpwuid(Process.uid).name
 			
 			# The template requires some helper methods which are defined in start_command.rb.
 			output = erb.result(binding)
@@ -236,7 +238,7 @@ private
 	def create_nginx_controller(extra_options = {})
 		require_daemon_controller
 		require 'socket' unless defined?(UNIXSocket)
-		@temp_dir        = "/tmp/passenger-standalone.#{$$}"
+		@temp_dir        = "/tmp/passenger.#{SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION}.#{SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION}.#{$$}"
 		@config_filename = "#{@temp_dir}/config"
 		@location_config_filename = "#{@temp_dir}/locations.ini"
 		if @options[:socket_file]

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -199,7 +199,7 @@ protected
 	def before_install
 		super
 		@plugin.call_hook(:runtime_installer_start, self) if @plugin
-		@working_dir = "/tmp/#{myself}-passenger-standalone-#{Process.pid}"
+		@working_dir = "#{PlatformInfo.tmpexedir}/#{myself}-passenger-standalone-#{Process.pid}"
 		FileUtils.rm_rf(@working_dir)
 		FileUtils.mkdir_p(@working_dir)
 		@download_binaries = true if !defined?(@download_binaries)

data/resources/templates/standalone/config.erb

@@ -10,7 +10,11 @@ worker_processes 1;
 daemon on;
 error_log '<%= @options[:log_file] %>' <% if debugging? %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
-<% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %>
+<% if @options[:user] %>
+    user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
+<% else %>
+    user <%= current_user %> <%= default_group_for(current_user) %>;
+<% end %>
 
 events {
     worker_connections 1024;
@@ -21,11 +25,18 @@ http {
     include '<%= PhusionPassenger.resources_dir %>/mime.types';
     passenger_ruby <%= PlatformInfo.ruby_command %>;
     passenger_root '<%= @location_config_filename %>';
+    passenger_ctl server_instance_dir '<%= @temp_dir %>';
     passenger_abort_on_startup_error on;
     passenger_user_switching off;
     passenger_max_pool_size <%= @options[:max_pool_size] %>;
     passenger_min_instances <%= @options[:min_instances] %>;
-    <% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %>
+    <% if @options[:user] %>
+        passenger_user <%= @options[:user] %>;
+        passenger_default_user <%= @options[:user] %>;
+    <% else %>
+        passenger_user <%= current_user %>;
+        passenger_default_user <%= current_user %>;
+    <% end %>
     <% if debugging? %>passenger_log_level 2;<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
@@ -37,6 +48,7 @@ http {
     <% end %>
     
     default_type application/octet-stream;
+    types_hash_max_size 2048;
     client_max_body_size 1024m;
     access_log off;
     keepalive_timeout 60;

data/test/ruby/admin_tools_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'fileutils'
+require 'phusion_passenger/constants'
 require 'phusion_passenger/utils'
 require 'phusion_passenger/admin_tools'
 require 'phusion_passenger/admin_tools/server_instance'
@@ -17,11 +18,6 @@ end
 describe AdminTools::ServerInstance do
 	include Utils
 	
-	DIR_STRUCTURE_MAJOR_VERSION = AdminTools::ServerInstance::DIR_STRUCTURE_MAJOR_VERSION
-	DIR_STRUCTURE_MINOR_VERSION = AdminTools::ServerInstance::DIR_STRUCTURE_MINOR_VERSION
-	GENERATION_STRUCTURE_MAJOR_VERSION = AdminTools::ServerInstance::GENERATION_STRUCTURE_MAJOR_VERSION
-	GENERATION_STRUCTURE_MINOR_VERSION = AdminTools::ServerInstance::GENERATION_STRUCTURE_MINOR_VERSION
-	
 	before :each do
 		File.chmod(0700, passenger_tmpdir)
 	end
@@ -45,13 +41,13 @@ describe AdminTools::ServerInstance do
 		IO.popen("sleep 999")
 	end
 	
-	def create_instance_dir(pid, major = DIR_STRUCTURE_MAJOR_VERSION, minor = DIR_STRUCTURE_MINOR_VERSION)
+	def create_instance_dir(pid, major = PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION, minor = PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION)
 		dir = "#{passenger_tmpdir}/passenger.#{major}.#{minor}.#{pid}"
 		Dir.mkdir(dir)
 		return dir
 	end
 	
-	def create_generation(dir, number = 0, major = GENERATION_STRUCTURE_MAJOR_VERSION, minor = GENERATION_STRUCTURE_MINOR_VERSION)
+	def create_generation(dir, number = 0, major = PhusionPassenger::SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION, minor = PhusionPassenger::SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION)
 		dir = "#{dir}/generation-#{number}"
 		Dir.mkdir(dir)
 		File.write("#{dir}/structure_version.txt", "#{major}.#{minor}")
@@ -113,7 +109,8 @@ describe AdminTools::ServerInstance do
 			@process1 = spawn_process
 			@process2 = spawn_process
 			
-			dir1 = create_instance_dir(@process1.pid, DIR_STRUCTURE_MAJOR_VERSION, DIR_STRUCTURE_MINOR_VERSION + 1)
+			dir1 = create_instance_dir(@process1.pid, SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION,
+				SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION + 1)
 			create_generation(dir1)
 			dir2 = create_instance_dir(@process2.pid)
 			create_generation(dir2)
@@ -133,8 +130,8 @@ describe AdminTools::ServerInstance do
 			@process1 = spawn_process
 			@process2 = spawn_process
 			dir1 = create_instance_dir(@process1.pid)
-			create_generation(dir1, 0, GENERATION_STRUCTURE_MAJOR_VERSION)
-			create_generation(dir1, 1, GENERATION_STRUCTURE_MAJOR_VERSION + 1)
+			create_generation(dir1, 0, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION)
+			create_generation(dir1, 1, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION + 1)
 			dir2 = create_instance_dir(@process2.pid)
 			create_generation(dir2)
 			
@@ -147,8 +144,9 @@ describe AdminTools::ServerInstance do
 			@process1 = spawn_process
 			@process2 = spawn_process
 			dir1 = create_instance_dir(@process1.pid)
-			create_generation(dir1, 0, GENERATION_STRUCTURE_MAJOR_VERSION)
-			create_generation(dir1, 1, GENERATION_STRUCTURE_MAJOR_VERSION + 1, GENERATION_STRUCTURE_MINOR_VERSION + 1)
+			create_generation(dir1, 0, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION)
+			create_generation(dir1, 1, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION + 1,
+				SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION + 1)
 			dir2 = create_instance_dir(@process2.pid)
 			create_generation(dir2)
 			
@@ -187,7 +185,7 @@ describe AdminTools::ServerInstance do
 		
 		it "doesn't clean up server instance directories for which the major structure version is different" do
 			process1 = spawn_process
-			dir1 = create_instance_dir(process1.pid, DIR_STRUCTURE_MAJOR_VERSION + 1)
+			dir1 = create_instance_dir(process1.pid, SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION + 1)
 			create_generation(dir1)
 			Process.kill('KILL', process1.pid) rescue nil
 			process1.close
@@ -200,7 +198,7 @@ describe AdminTools::ServerInstance do
 		
 		it "doesn't clean up server instance directories for which the major structure version is the same but the minor structure version is larger" do
 			process1 = spawn_process
-			dir1 = create_instance_dir(process1.pid, DIR_STRUCTURE_MAJOR_VERSION, DIR_STRUCTURE_MINOR_VERSION + 1)
+			dir1 = create_instance_dir(process1.pid, SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION, SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION + 1)
 			create_generation(dir1)
 			Process.kill('KILL', process1.pid) rescue nil
 			process1.close
@@ -214,7 +212,7 @@ describe AdminTools::ServerInstance do
 		it "doesn't clean up server instance directories for which the latest generation has a different major version" do
 			process1 = spawn_process
 			dir1 = create_instance_dir(process1.pid)
-			create_generation(dir1, 0, GENERATION_STRUCTURE_MAJOR_VERSION + 1)
+			create_generation(dir1, 0, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION + 1)
 			Process.kill('KILL', process1.pid) rescue nil
 			process1.close
 			
@@ -227,7 +225,7 @@ describe AdminTools::ServerInstance do
 		it "doesn't clean up server instance directories for which the latest generation has the same major version but a larger minor version" do
 			process1 = spawn_process
 			dir1 = create_instance_dir(process1.pid)
-			create_generation(dir1, 0, GENERATION_STRUCTURE_MAJOR_VERSION, GENERATION_STRUCTURE_MINOR_VERSION + 1)
+			create_generation(dir1, 0, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION, SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION + 1)
 			Process.kill('KILL', process1.pid) rescue nil
 			process1.close
 			

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,7 +161,6 @@ files:
 - lib/phusion_passenger/utils/tmpio.rb
 - lib/phusion_passenger/utils/unseekable_socket.rb
 - lib/phusion_passenger/utils.rb
-- lib/phusion_passenger/wsgi/request_handler.py
 - bin/passenger
 - bin/passenger-config
 - bin/passenger-install-apache2-module
@@ -216,6 +215,7 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
+- doc/Packaging.html
 - doc/Packaging.txt.md
 - doc/Security of user switching support.html
 - doc/Security of user switching support.idmap.txt
@@ -396,6 +396,7 @@ files:
 - ext/common/Utils.h
 - ext/common/Utils/CachedFileStat.hpp
 - ext/common/ApplicationPool2/README.md
+- ext/common/Constants.h.erb
 - ext/apache2/Bucket.cpp
 - ext/apache2/Configuration.cpp
 - ext/apache2/Hooks.cpp