passenger 3.0.21 → 3.9.1.beta

data/DEVELOPERS.TXT

@@ -5,30 +5,27 @@
 The tests need the following software installed:
 
 * All the usual Phusion Passenger dependencies.
-* Ruby on Rails 1.2.x
-* Ruby on Rails 2.0.x
 * Ruby on Rails 2.2.x
 * Ruby on Rails 2.3.x
 * Ruby on Rails 3.0.x
 * rspec >= 1.1.2
 * mime-types >= 1.15
 * sqlite3-ruby
+* json
 * daemon_controller >= 1.0.0
 
 The following software is optional:
 
 * RCov, for code coverage
 * RDoc, for generating HTML Ruby API documentation
-* Doxygen, for generating HTML C++ API documentation
-* dot (part of Graphviz), for generating diagrams in HTML API documentation
-* The font "Bitstream Vera Sans", used in the class diagrams. See http://www.gnome.org/fonts
 * AsciiDoc >= 8.2.5, for converting various doc/*.txt documents to HTML
+* BlueCloth, for convering various doc/*.txt.md documents to HTML
 
 == Compiling Phusion Passenger
 
 Run the following command to compile everything:
 
- rake apache
+ rake apache2
  rake nginx
 
 == Directory structure
@@ -69,7 +66,7 @@ Less important directories:
 [ dev ]
   Tools for Phusion Passenger developers. Not used during production.
 [ resources ]
-  Various resource files, used during production.
+  Various non-executable resource files, used during production.
 [ debian ]
   Debian packaging files.
 [ man ]
@@ -109,6 +106,3 @@ Notes:
 == Documentation
 
 Various developer documents can be found in 'doc/*.html'.
-
-The Ruby part's API reference is located in 'doc/rdoc/'.
-The C++ part's API reference is located in 'doc/cxxapi/'.

data/NEWS

@@ -1,31 +1,23 @@
-Release 3.0.21
---------------
-
- * Rebootstrapped the libev configure to fix compilation problems on Solaris 11.
- * Fixed support for RVM mixed mode installations. Fixes issue #828.
- * Fixed encoding problems in Phusion Passenger Standalone.
- * Changed preferred Nginx version to 1.2.9.
- * Catch exceptions raised by Rack application objects.
- * Fix for CVE-2013-2119. Details can be found in the announcement for version 4.0.5.
- * Version 3.0.20 was pulled because its fixes were incomplete.
-
-
-Release 3.0.19
---------------
-
- * Nginx security fix: do not display Nginx version when
-   server_tokens are off.
- * Fixed compilation problems on some systems.
- * Fixed some Union Station-related bugs.
-
-
-Release 3.0.18
---------------
+Release 3.9.1
+-------------
 
- * Fixed compilation problems on Fedora 17.
- * Fixed Union Station compatibility with Rails 3.2.
- * Phusion Passenger Enterprise Standalone now supports rolling
-   restarts and deployment error resistance.
+This is the first beta of Phusion Passenger 4. The changes are numerous.
+
+ * Support for multiple Ruby versions.
+ * The internals now use evented I/O.
+ * Real-time response buffering.
+ * Improved zero-copy architecture.
+ * Rewritten ApplicationPool and process spawning subsystem.
+ * Multithreading within Ruby apps (Phusion Passenger Enterprise only).
+ * Python WSGI support lifted to "beta" status.
+ * More protection against stuck processes.
+ * Automatically picks up environment variables from your bashrc.
+ * Allows setting environment variables directly in Apache.
+ * Automatic asset pipeline support in Standalone.
+ * Deleting restart.txt no longer triggers a restart.
+ * More stable Union Station support.
+ * Many internal robustness improvements.
+ * Better relocatability without wasting space.
 
 
 Release 3.0.17

data/Rakefile

@@ -1,7 +1,5 @@
-# kate: syntax ruby
-
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008, 2009, 2010, 2011  Phusion
+#  Copyright (C) 2008, 2009, 2010, 2011, 2012  Phusion
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -22,22 +20,24 @@ $LOAD_PATH.unshift("#{source_root}/lib")
 
 require "#{source_root}/config" if File.exist?("#{source_root}/config.rb")
 require 'build/basics'
-require 'build/config'
-require 'build/common_library'
-require 'build/ruby_extension'
-require 'build/agents'
-require 'build/apache2'
-require 'build/nginx'
-require 'build/documentation'
-require 'build/packaging'
-require 'build/test_basics'
-require 'build/oxt_tests'
-require 'build/cxx_tests'
-require 'build/ruby_tests'
-require 'build/integration_tests'
-require 'build/misc'
-require 'build/rpm'
-
+if boolean_option('ONLY_RUBY')
+	require 'build/ruby_extension'
+else
+	require 'build/ruby_extension'
+	require 'build/common_library'
+	require 'build/agents'
+	require 'build/apache2'
+	require 'build/nginx'
+	require 'build/documentation'
+	require 'build/packaging'
+	require 'build/test_basics'
+	require 'build/oxt_tests'
+	require 'build/cxx_tests'
+	require 'build/ruby_tests'
+	require 'build/integration_tests'
+	require 'build/misc'
+	require 'build/rpm'
+end
 
 #### Default tasks
 
@@ -50,6 +50,7 @@ end
 desc "Remove compiled files"
 task :clean do
 	sh "rm -rf build/cache"
+	sh "rm -rf libout"
 end
 
 desc "Remove all generated files"

data/bin/passenger

@@ -22,11 +22,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
+PhusionPassenger.locate_directories
 
 require 'rubygems' rescue nil
-require 'phusion_passenger'
 require 'phusion_passenger/standalone/main'
 
 PhusionPassenger::Standalone::Main.run!(ARGV)

data/bin/passenger-config

@@ -22,22 +22,52 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
+
+require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/compiler'
 
 def help
 	puts "Tool for showing Passenger configuration information."
-	puts "Usage: passenger-config <OPTIONS>"
+	puts "Usage: passenger-config <OPTION>"
 	puts
 	puts "Options:"
-	puts "  --root      Show Passenger's root directory."
-	puts "  --version   Show Passenger's version number."
+	puts "  --root                     Show Phusion Passenger's root directory."
+	puts "  --nginx-libs               Show Nginx runtime library flags."
+	puts "  --compiled                 Check whether runtime libraries are compiled."
+	puts "  --version                  Show version number."
+end
+
+def common_library
+	require 'phusion_passenger/common_library'
+	return COMMON_LIBRARY.
+		only(*NGINX_LIBS_SELECTOR).
+		set_output_dir("#{PhusionPassenger.source_root}/libout/common/libpassenger_common")
 end
 
 case ARGV[0]
 when "--root"
-	puts PhusionPassenger::SOURCE_ROOT
+	puts PhusionPassenger.source_root
+when "--nginx-libs"
+	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.source_root}/libout/common/libboost_oxt.a"
+	if PhusionPassenger::PlatformInfo.has_math_library?
+		text << " -lm"
+	end
+	puts text
+when "--compiled"
+	common_library.link_objects.each do |filename|
+		if !File.exist?(filename)
+			exit 1
+		end
+	end
+	if File.exist?("#{PhusionPassenger.source_root}/libout/common/libboost_oxt.a")
+		exit 0
+	else
+		exit 1
+	end
 when "--version"
 	puts PhusionPassenger::VERSION_STRING
 else

data/bin/passenger-install-apache2-module

@@ -25,6 +25,7 @@
 PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
 $LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 
 # The Apache executable may be located in an 'sbin' folder. We add
 # the 'sbin' folders to $PATH just in case. On some systems
@@ -40,7 +41,6 @@ require 'phusion_passenger/abstract_installer'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
-	include PhusionPassenger::PlatformInfo
 	
 	def dependencies
 		result = [
@@ -74,10 +74,10 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def users_guide
-		return "#{DOCDIR}/Users guide Apache.html"
+		return "#{PhusionPassenger.doc_dir}/Users guide Apache.html"
 	end
 	
-	def install!
+	def run_steps
 		if PhusionPassenger.natively_packaged?
 			check_dependencies || exit(1)
 			show_apache2_config_snippets
@@ -151,7 +151,7 @@ private
 	def install_apache2_module
 		puts
 		line
-		color_puts '<banner>Compiling and installing Apache 2 module...</banner>'
+		puts '<banner>Compiling and installing Apache 2 module...</banner>'
 		puts "cd #{PASSENGER_ROOT}"
 		if ENV['TRACE']
 			puts "#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes"
@@ -164,20 +164,20 @@ private
 	
 	def show_apache2_config_snippets(bare = false)
 		if bare
-			puts "LoadModule passenger_module #{APACHE2_MODULE}"
-			puts "PassengerRoot #{PASSENGER_ROOT}"
+			puts "LoadModule passenger_module #{PhusionPassenger.apache2_module_path}"
+			puts "PassengerRoot #{PhusionPassenger.source_root}"
 			puts "PassengerRuby #{PlatformInfo.ruby_command}"
 		else
 			puts
 			line
 			render_template 'apache2/config_snippets',
-				:module_location => APACHE2_MODULE,
-				:passenger_root => PASSENGER_ROOT,
+				:module_location => PhusionPassenger.apache2_module_path,
+				:passenger_root => PhusionPassenger.source_root,
 				:ruby => PlatformInfo.ruby_command
-			if PhusionPassenger.natively_packaged?
-				wait(10)
-			else
+			if PhusionPassenger.originally_packaged?
 				wait
+			else
+				wait(10)
 			end
 		end
 	end
@@ -233,5 +233,5 @@ installer = Installer.new(options)
 if options[:snippet]
 	installer.send(:show_apache2_config_snippets, true)
 else
-	installer.start
+	installer.run
 end

data/bin/passenger-install-nginx-module

@@ -22,19 +22,19 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-passenger_root = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{passenger_root}/lib")
+source_root = File.expand_path("..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
+
 require 'optparse'
 require 'fileutils'
-require 'tmpdir'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/dependencies'
 require 'phusion_passenger/abstract_installer'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
-	include PhusionPassenger::PlatformInfo
 	
 	def dependencies
 		result = [
@@ -57,15 +57,22 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def users_guide
-		return "#{DOCDIR}/Users guide Nginx.html"
+		return "#{PhusionPassenger.doc_dir}/Users guide Nginx.html"
 	end
 	
-	def install!
-		Dir.chdir(SOURCE_ROOT)
+	def run_steps
+		# Make sure the configure script finds the correct
+		# passenger-config command.
+		ENV['PATH'] = PhusionPassenger.bin_dir + ":" + ENV['PATH']
+
+		if PhusionPassenger.natively_packaged?
+			not_available_when_natively_packaged
+			exit(2)
+		end
+		
 		show_welcome_screen
 		check_dependencies || exit(1)
-		
-		check_whether_we_can_write_to(SOURCE_ROOT) || exit(1)
+		check_whether_we_can_write_to(PhusionPassenger.source_root) || exit(1)
 		
 		download_and_install = should_we_download_and_install_nginx_automatically?
 		if pcre_is_installed?
@@ -92,7 +99,9 @@ class Installer < PhusionPassenger::AbstractInstaller
 		end
 		check_whether_we_can_write_to(nginx_prefix) || exit(1)
 		nginx_config_already_exists_before_installing = nginx_config_exists?(nginx_prefix)
-		compile_passenger_support_files || exit(1)
+		if PhusionPassenger.originally_packaged?
+			compile_passenger_support_files || exit(1)
+		end
 		if install_nginx(nginx_source_dir, nginx_prefix, extra_nginx_configure_flags)
 			if nginx_config_already_exists_before_installing || !locate_nginx_config_file(nginx_prefix)
 				show_passenger_config_snippets(nginx_prefix)
@@ -109,15 +118,21 @@ class Installer < PhusionPassenger::AbstractInstaller
 	def before_install
 		super
 		myself = `whoami`.strip
-		@working_dir = Dir.mktmpdir("passenger.")
+		@working_dir = "/tmp/#{myself}-passenger-#{Process.pid}"
+		FileUtils.rm_rf(@working_dir)
+		FileUtils.mkdir_p(@working_dir)
 	end
 	
 	def after_install
 		super
-		FileUtils.remove_entry_secure(@working_dir) if @working_dir
+		FileUtils.rm_rf(@working_dir)
 	end
 
 private
+	def not_available_when_natively_packaged
+		render_template 'nginx/not_available_when_natively_packaged'
+	end
+
 	def show_welcome_screen
 		render_template 'nginx/welcome', :version => VERSION_STRING
 		wait
@@ -125,8 +140,10 @@ private
 	
 	def compile_passenger_support_files
 		new_screen
-		color_puts "<banner>Compiling Passenger support files...</banner>"
-		return sh("#{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
+		puts "<banner>Compiling Passenger support files...</banner>"
+		Dir.chdir(PhusionPassenger.source_root) do
+			return sh("#{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
+		end
 	end
 	
 	def should_we_download_and_install_nginx_automatically?
@@ -136,20 +153,20 @@ private
 		puts
 		
 		if @auto_download
-			color_puts "<b>=> Proceeding with choice 1.</b>"
+			puts "<b>=> Proceeding with choice 1.</b>"
 			return true
 		elsif @nginx_source_dir
-			color_puts "<b>=> Proceeding with choice 2.</b>"
+			puts "<b>=> Proceeding with choice 2.</b>"
 			return false
 		else
 			choice = prompt("Enter your choice (1 or 2) or press Ctrl-C to abort") do |input|
 				if input == "1" || input == "2"
 					true
 				elsif input.empty?
-					color_puts "<red>No choice has been given.</red>"
+					puts "<red>No choice has been given.</red>"
 					false
 				else
-					color_puts "<red>'#{input}' is not a valid choice.</red>"
+					puts "<red>'#{input}' is not a valid choice.</red>"
 					false
 				end
 			end
@@ -159,7 +176,7 @@ private
 	
 	def download_and_extract_pcre
 		new_screen
-		color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
+		puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 		
 		url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
 		dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
@@ -167,7 +184,7 @@ private
 		
 		if download(url, tarball)
 			Dir.chdir(@working_dir) do
-				color_puts "<banner>Extracting PCRE source tarball...</banner>"
+				puts "<banner>Extracting PCRE source tarball...</banner>"
 				if sh("tar", "xzvf", tarball)
 					return "#{@working_dir}/#{dirname}"
 				else
@@ -189,7 +206,7 @@ private
 	
 	def download_and_extract_nginx
 		new_screen
-		color_puts "<banner>Downloading Nginx...</banner>"
+		puts "<banner>Downloading Nginx...</banner>"
 		
 		url = "http://www.nginx.org/download/nginx-#{PREFERRED_NGINX_VERSION}.tar.gz"
 		dirname = "nginx-#{PREFERRED_NGINX_VERSION}"
@@ -197,7 +214,7 @@ private
 		
 		if download(url, tarball)
 			Dir.chdir(@working_dir) do
-				color_puts "<banner>Extracting Nginx source tarball...</banner>"
+				puts "<banner>Extracting Nginx source tarball...</banner>"
 				if sh("tar", "xzvf", tarball)
 					return "#{@working_dir}/#{dirname}"
 				else
@@ -219,17 +236,17 @@ private
 	
 	def ask_for_nginx_install_prefix
 		new_screen
-		color_puts "<banner>Where do you want to install Nginx to?</banner>"
+		puts "<banner>Where do you want to install Nginx to?</banner>"
 		puts
 		if @prefix
-			color_puts "<b>=> #{@prefix}</b>"
+			puts "<b>=> #{@prefix}</b>"
 			return @prefix
 		else
 			prefix = prompt("Please specify a prefix directory [/opt/nginx]") do |input|
 				if input.empty? || input =~ %r(/)
 					true
 				else
-					color_puts "<red>Please specify an absolute path.</red>"
+					puts "<red>Please specify an absolute path.</red>"
 					false
 				end
 			end
@@ -242,10 +259,10 @@ private
 	
 	def ask_for_nginx_source_dir
 		new_screen
-		color_puts "<banner>Where is your Nginx source code located?</banner>"
+		puts "<banner>Where is your Nginx source code located?</banner>"
 		puts
 		if @nginx_source_dir
-			color_puts "<b>=> #{@nginx_source_dir}</b>"
+			puts "<b>=> #{@nginx_source_dir}</b>"
 			return @nginx_source_dir
 		else
 			return prompt("Please specify the directory") do |input|
@@ -253,11 +270,11 @@ private
 					if File.exist?("#{input}/src/core/nginx.c")
 						true
 					else
-						color_puts "<red>'#{input}' does not look like an Nginx source directory.</red>"
+						puts "<red>'#{input}' does not look like an Nginx source directory.</red>"
 						false
 					end
 				else
-					color_puts "<red>Please specify an absolute path.</red>"
+					puts "<red>Please specify an absolute path.</red>"
 					false
 				end
 			end
@@ -274,10 +291,10 @@ private
 			if @extra_configure_flags
 				if @extra_configure_flags == "none"
 					extra_args = ""
-					color_puts "<b>=> No extra configure flags.</b>"
+					puts "<b>=> No extra configure flags.</b>"
 				else
 					extra_args = @extra_configure_flags
-					color_puts "<b>=> #{extra_args}</b>"
+					puts "<b>=> #{extra_args}</b>"
 				end
 				return extra_args
 			else
@@ -291,7 +308,7 @@ private
 					if input.empty? || input == "yes" || input == "no"
 						true
 					else
-						color_puts "<red>Please enter 'yes' or 'no'.</red>"
+						puts "<red>Please enter 'yes' or 'no'.</red>"
 						false
 					end
 				end
@@ -324,7 +341,7 @@ private
 	def install_nginx(source_dir, prefix, extra_configure_flags)
 		Dir.chdir(source_dir) do
 			new_screen
-			color_puts "<banner>Compiling and installing Nginx...</banner>"
+			puts "<banner>Compiling and installing Nginx...</banner>"
 			if !sh(build_nginx_configure_command(prefix, extra_configure_flags)) ||
 			   !sh("make") ||
 			   !sh("make install")
@@ -338,7 +355,7 @@ private
 		new_screen
 		render_template 'nginx/config_snippets',
 			:config_file => locate_nginx_config_file(prefix),
-			:passenger_root => SOURCE_ROOT,
+			:passenger_root => PhusionPassenger.source_root,
 			:ruby => PlatformInfo.ruby_command
 		wait
 	end
@@ -374,7 +391,7 @@ private
 		contents = File.read(config_file)
 		contents.sub!(/^http \{/,
 			"http {\n" <<
-			"    passenger_root #{SOURCE_ROOT};\n" <<
+			"    passenger_root #{PhusionPassenger.source_root};\n" <<
 			"    passenger_ruby #{PlatformInfo.ruby_command};\n")
 		File.open(config_file, 'w') do |f|
 			f.write(contents)
@@ -383,7 +400,7 @@ private
 		new_screen
 		render_template 'nginx/config_snippets_inserted',
 			:config_file => config_file,
-			:passenger_root => SOURCE_ROOT,
+			:passenger_root => PhusionPassenger.source_root,
 			:ruby => PlatformInfo.ruby_command
 		wait
 	end
@@ -398,7 +415,7 @@ private
 		elsif !pcre_is_installed?
 			command << "--without-http_rewrite_module "
 		end
-		command << "--add-module='#{SOURCE_ROOT}/ext/nginx' #{extra_configure_flags}"
+		command << "--add-module='#{PhusionPassenger.source_root}/ext/nginx' #{extra_configure_flags}"
 		command.strip!
 		return command
 	end
@@ -475,4 +492,4 @@ if options[:auto_download] && options[:nginx_source_dir]
 	exit 1
 end
 
-Installer.new(options).start
+Installer.new(options).run