passenger 4.0.0.rc4 → 4.0.0.rc6

data.tar.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABAgAGBQJRZAnsAAoJECrHRaUKISqMxSwH/2cB1DU2Tbi9rlKSzaENWXZO
+iagprli5Fzy2KS2b8U/37b8/XJfUs8aDcXM/mE90B3duFPv+HCL9kuTYDPRDHTQq
+l4mlqLdUJLo0tODh4+yW41LUntq2e433e7/67BS6B0VGzyNv8oT7IRf5htmUC7Cj
+vju3qkf2cdDU2k3WyR5P3rut5TFpN2pFaVr4pLTjYoctT3gVOeLKRQ4hDDugaWR8
+XnVU9R4T/1gKrDbV26WY1exf6A3EIpVhUN8MtfMYL7q8cZ6qlBBlzVV3rEd+WC4R
+S5hip9LfgniNl7+jsXtceyPUXWluvf6v9qfa9aK3HmdCsLoKpVkBQsbDMX8PCYw=
+=Sv5D
+-----END PGP SIGNATURE-----

data/.travis.yml

@@ -4,10 +4,10 @@ env:
   - TEST_FULL_COMPILE=1
   - TEST_CXX=1
   - TEST_CXX=1 SUDO=1
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3
-  - TEST_NGINX=1
-  - TEST_APACHE2=1
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
+  - TEST_NGINX=1 TEST_RUBYGEMS_VERSION=1.8.25
+  - TEST_APACHE2=1 TEST_RUBYGEMS_VERSION=1.8.25
 
 before_install:
   - sudo apt-get install apache2-mpm-worker apache2-threaded-dev

data/NEWS

@@ -1,3 +1,49 @@
+Release 4.0.0 release candidate 6
+---------------------------------
+
+ * WebSocket support on Nginx. Requires Nginx >= 1.3.15.
+ * Improved RVM support.
+ * Performance optimizations.
+ * Various bug fixes.
+
+
+Release 4.0.0 release candidate 5
+---------------------------------
+
+ * The default config snippet for Apache has changed! It must now contain a
+   `PassengerDefaultRuby` option. The installer has been updated to output
+   this option. The `PassengerRuby` option still exists, but it's only used
+   for configuring different Ruby interpreters in different contexts. Please
+   refer to the manual for more information.
+ * We now provide GPG digital signatures for all file releases by Phusion.
+   More information can be found in the manual.
+ * `passenger-status` now displays process memory usage and time when it
+   was last used. The latter fixes issue #853.
+ * Exceptions in Rack application objects are now caught to prevent
+   application processes from exiting.
+ * The `passenger-config` tool now supports the `--ruby-command` argument,
+   which helps the user with figuring out the correct Ruby command to use
+   in case s/he wants to use multiple Ruby interpreters. The manual has
+   also been updated to mention this tool.
+ * Fixed streaming responses on Apache.
+ * Worked around an OS X Unix domain socket bug. Fixes issue #854.
+ * Out-of-Band Garbage Collection now works properly when the application
+   has disabled garbage collection. Fixes issue #859.
+ * Fixed support for /usr/bin/python on OS X. Fixes issue #855.
+ * Fixed looping-without-sleeping in the ApplicationPool garbage collector
+   if PassengerPoolIdleTime is set to 0. Fixes issue #858.
+ * Fixed some process memory usage measurement bugs.
+ * Fixed process memory usage measurement on NetBSD. Fixes issue #736.
+ * Fixed a file descriptor leak in the Out-of-Band Work feature. Fixes issue #864.
+ * The PassengerPreStart helper script now uses the default Ruby
+   interpreter specified in the web server configuration, and no longer
+   requires a `ruby` command to be in `$PATH`.
+ * Updated preferred PCRE version to 8.32.
+ * Worked around some RVM bugs.
+ * The ngx_http_stub_status_module is now enabled by default.
+ * Performance optimizations.
+
+
 Release 4.0.0 release candidate 4
 ---------------------------------
 

data/bin/passenger-config

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -38,6 +38,7 @@ def help
 	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 "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
 	puts "  --version                  Show version number."
 end
 
@@ -68,6 +69,35 @@ when "--compiled"
 	else
 		exit 1
 	end
+when "--ruby-command"
+	require 'phusion_passenger/platform_info/ruby'
+	ruby = PhusionPassenger::PlatformInfo.ruby_command
+	puts "passenger-config was invoked through the following Ruby interpreter:"
+	puts "  Command: #{ruby}"
+	STDOUT.write "  Version: "
+	STDOUT.flush
+	system("/bin/sh -c '#{ruby} -v'")
+	puts "  To use in Apache: PassengerRuby #{ruby}"
+	puts "  To use in Nginx : passenger_ruby #{ruby}"
+	puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
+	puts
+
+	ruby = PhusionPassenger::PlatformInfo.find_command('ruby')
+	if ruby
+		puts "The following Ruby interpreter was found first in $PATH:"
+		puts "  Command: #{ruby}"
+		STDOUT.write "  Version: "
+		STDOUT.flush
+		system("/bin/sh -c '#{ruby} -v'")
+		puts "  To use in Apache: PassengerRuby #{ruby}"
+		puts "  To use in Nginx : passenger_ruby #{ruby}"
+		puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
+	else
+		puts "No Ruby interpreter found in $PATH."
+	end
+	puts
+	puts "## Notes for RVM users"
+	puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
 when "--version"
 	puts PhusionPassenger::VERSION_STRING
 else

data/bin/passenger-install-apache2-module

@@ -170,7 +170,7 @@ private
 		if bare
 			puts "LoadModule passenger_module #{PhusionPassenger.apache2_module_path}"
 			puts "PassengerRoot #{PhusionPassenger.source_root}"
-			puts "PassengerRuby #{PlatformInfo.ruby_command}"
+			puts "PassengerDefaultRuby #{PlatformInfo.ruby_command}"
 		else
 			puts
 			line

data/bin/passenger-install-nginx-module

@@ -412,6 +412,7 @@ private
 		command = "sh ./configure --prefix='#{prefix}' "
 		command << "--with-http_ssl_module "
 		command << "--with-http_gzip_static_module "
+		command << "--with-http_stub_status_module "
 		command << "--with-cc-opt='-Wno-error' "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "

data/build/common_library.rb

@@ -21,6 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'phusion_passenger/platform_info/compiler'
 require 'phusion_passenger/platform_info/cxx_portability'
 
 ########## Phusion Passenger common library ##########
@@ -151,6 +152,9 @@ else
 	task :libev  # do nothing
 end
 
+# Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
+LIBEV_CFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+
 
 ########## libeio ##########
 

data/build/cplusplus_support.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,12 +23,33 @@
 
 # Rake functions for compiling/linking C++ stuff.
 
+def run_compiler(*command)
+	require 'phusion_passenger/utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
+	show_command = command.join(' ')
+	puts show_command
+	if !system(*command)
+		if $? && $?.exitstatus == 4
+			# This probably means the compiler ran out of memory.
+			msg = "<b>" +
+			      "-----------------------------------------------\n" +
+			      "Your compiler failed with the exit status 4. This " +
+			      "probably means that it ran out of memory. To solve " +
+			      "this problem, try increasing your swap space: " +
+			      "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+			      "</b>"
+			fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+		else
+			fail "Command failed with status (#{$? ? $?.exitstatus : 1}): [#{show_command}]"
+		end
+	end
+end
+
 def compile_c(source, flags = "#{EXTRA_PRE_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
-	sh "#{CC} #{flags} -c #{source}"
+	run_compiler "#{CC} #{flags} -c #{source}"
 end
 
 def compile_cxx(source, flags = "#{EXTRA_PRE_CXXFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
-	sh "#{CXX} #{flags} -c #{source}"
+	run_compiler "#{CXX} #{flags} -c #{source}"
 end
 
 def create_static_library(target, sources)
@@ -44,11 +65,11 @@ def create_static_library(target, sources)
 end
 
 def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
-	sh "#{CXX} #{sources} -o #{target} #{linkflags}"
+	run_compiler "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
 def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
-	sh "#{CC} #{sources} -o #{target} #{linkflags}"
+	run_compiler "#{CC} #{sources} -o #{target} #{linkflags}"
 end
 
 def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
@@ -57,5 +78,5 @@ def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTR
 	else
 		shlib_flag = "-shared"
 	end
-	sh "#{CXX} #{shlib_flag} #{sources} -fPIC -o #{target} #{flags}"
+	run_compiler "#{CXX} #{shlib_flag} #{sources} -fPIC -o #{target} #{flags}"
 end

data/build/cxx_tests.rb

@@ -220,7 +220,7 @@ task 'test:cxx' => dependencies do
 		command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
 	end
 	if boolean_option('SUDO')
-		command = "sudo #{command}"
+		command = "#{PlatformInfo.ruby_sudo_command} #{command}"
 	end
 	if boolean_option('REPEAT')
 		if boolean_option('GDB')

data/build/misc.rb

@@ -49,8 +49,7 @@ task :sloccount do
 	end
 end
 
-desc "Convert the NEWS items for the latest release to HTML"
-task :news_as_html do
+def extract_latest_news_contents_and_items
 	# The text is in the following format:
 	#
 	#   Release x.x.x
@@ -58,21 +57,31 @@ task :news_as_html do
 	#
 	#    * Text.
 	#    * More text.
-	# * A header.
+	#    * A header.
 	#      With yet more text.
 	#   
 	#   Release y.y.y
 	#   -------------
 	#   .....
-	require 'cgi'
 	contents = File.read("NEWS")
 	
 	# We're only interested in the latest release, so extract the text for that.
 	contents =~ /\A(Release.*?)^(Release|Older releases)/m
+	contents = $1
+	contents.sub!(/\A.*?\n-+\n+/m, '')
+	contents.sub!(/\n+\Z/, '')
 	
 	# Now split the text into individual items.
-	items = $1.split(/^ \*/)
-	items.shift  # Delete the 'Release x.x.x' header.
+	items = contents.split(/^ \* /)
+	items.shift while items.first == ""
+
+	return [contents, items]
+end
+
+desc "Convert the NEWS items for the latest release to HTML"
+task :news_as_html do
+	require 'cgi'
+	contents, items = extract_latest_news_contents_and_items
 	
 	puts "<dl>"
 	items.each do |item|
@@ -134,6 +143,19 @@ task :news_as_html do
 	puts "</dl>"
 end
 
+desc "Convert the NEWS items for the latest release to Markdown"
+task :news_as_markdown do
+	contents, items = extract_latest_news_contents_and_items
+
+	# Auto-link to issue tracker.
+	contents.gsub!(/(bug|issue) #(\d+)/i) do
+		url = "http://code.google.com/p/phusion-passenger/issues/detail?id=#{$2}"
+		%Q([#{$1} ##{$2}](#{url}))
+	end
+
+	puts contents
+end
+
 dependencies = [
 	COMMON_LIBRARY.link_objects,
 	LIBBOOST_OXT,

data/build/packaging.rb

@@ -23,8 +23,36 @@
 
 task :clobber => 'package:clean'
 
-desc "Build the gem and tarball"
-task 'package' => ['package:gem', 'package:tarball']
+desc "Build, sign & upload gem & tarball"
+task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
+	require 'phusion_passenger'
+	basename   = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
+	version    = PhusionPassenger::VERSION_STRING
+	is_enterprise  = basename =~ /enterprise/
+	is_open_source = !is_enterprise
+	tag_prefix     = is_open_source ? 'release' : 'enterprise'
+
+	sh "git tag -s #{tag_prefix}-#{version} -u 0A212A8C -m 'Release #{version}'"
+
+	puts "Proceed with pushing tag to remote Git repo and uploading the gem and signatures? [y/n]"
+	if STDIN.readline == "y\n"
+		sh "git push origin #{tag_prefix}-#{version}"
+		if is_open_source
+			sh "scp pkg/#{basename}.{gem.asc,tar.gz.asc} app@shell.phusion.nl:/u/apps/signatures/phusion-passenger/"
+			sh "./dev/googlecode_upload.py -p phusion-passenger -s 'Phusion Passenger #{version}' pkg/passenger-#{version}.tar.gz"
+			sh "gem push pkg/passenger-#{version}.gem"
+			puts "--------------"
+			puts "All done. Please update the version number in the Phusion Passenger website."
+		else
+			dir = "/u/apps/passenger_website/shared"
+			subdir = string_option('NAME', version)
+			sh "scp pkg/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
+			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
+		end
+	else
+		puts "Did not upload anything."
+	end
+end
 
 task 'package:check' do
 	require 'phusion_passenger'
@@ -35,16 +63,14 @@ task 'package:check' do
 	end
 end
 
-desc "Build the gem"
-task 'package:gem' => [:doc, 'package:check'] do
+task 'package:gem' => Packaging::ASCII_DOCS + ['package:check'] do
 	require 'phusion_passenger'
-	sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec"
+	sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec --sign --key 0x0A212A8C"
 	sh "mkdir -p pkg"
 	sh "mv #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem pkg/"
 end
 
-desc "Build the tarball"
-task 'package:tarball' => [:doc, 'package:check'] do
+task 'package:tarball' => Packaging::ASCII_DOCS + ['package:check'] do
 	require 'phusion_passenger'
 	require 'fileutils'
 
@@ -69,11 +95,47 @@ task 'package:tarball' => [:doc, 'package:check'] do
 	sh "rm -rf pkg/#{basename}"
 end
 
-desc "Remove gem and tarball"
+task 'package:sign' do
+	require 'phusion_passenger'
+
+	if File.exist?(File.expand_path("~/.gnupg/gpg-agent.conf")) || ENV['GPG_AGENT_INFO']
+		puts "It looks like you're using gpg-agent, so skipping automatically password caching."
+	else
+		begin
+			require 'highline'
+		rescue LoadError
+			abort "Please run `gem install highline` first."
+		end
+		h = HighLine.new
+		password = h.ask("Password for software-signing@phusion.nl GPG key: ") { |q| q.echo = false }
+		passphrase_opt = "--passphrase-file .gpg-password"
+	end
+	
+	begin
+		if password
+			File.open(".gpg-password", "w", 0600) do |f|
+				f.write(password)
+			end
+		end
+		version = PhusionPassenger::VERSION_STRING
+		["passenger-#{version}.gem",
+		 "passenger-#{version}.tar.gz",
+		 "passenger-enterprise-server-#{version}.gem",
+		 "passenger-enterprise-server-#{version}.tar.gz"].each do |name|
+			if File.exist?("pkg/#{name}")
+				sh "gpg --sign --detach-sign #{passphrase_opt} --local-user software-signing@phusion.nl --armor pkg/#{name}"
+			end
+		end
+	ensure
+		File.unlink('.gpg-password') if File.exist?('.gpg-password')
+	end
+end
+
+desc "Remove gem, tarball and signatures"
 task 'package:clean' do
 	require 'phusion_passenger'
-	sh "rm -f #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem"
-	sh "rm -f #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.tar.gz"
+	basename = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
+	sh "rm -f pkg/#{basename}.{gem,gem.asc,tar.gz,tar.gz.asc}"
 end
 
 desc "Create a fakeroot, useful for building native packages"
@@ -158,58 +220,3 @@ task 'package:debian' => 'package:check' do
 	
 	sh "debuild"
 end
-
-desc "Sign all packaged files"
-task 'package:sign' => 'package:check' do
-	require 'phusion_passenger'
-	begin
-		require 'highline'
-	rescue LoadError
-		abort "Please run `gem install highline` first."
-	end
-	h = HighLine.new
-	password = h.ask("Password for software-signing@phusion.nl GPG key: ") { |q| q.echo = false }
-	begin
-		File.open(".gpg-password", "w", 0600) do |f|
-			f.write(password)
-		end
-		version = PhusionPassenger::VERSION_STRING
-		["passenger-#{version}.gem",
-		 "passenger-#{version}.tar.gz",
-		 "passenger-enterprise-server-#{version}.gem",
-		 "passenger-enterprise-server-#{version}.tar.gz"].each do |name|
-			if File.exist?("pkg/#{name}")
-				sh "gpg --sign --detach-sign --passphrase-file .gpg-password --local-user software-signing@phusion.nl --armor pkg/#{name}"
-			end
-		end
-	ensure
-		File.unlink('.gpg-password') if File.exist?('.gpg-password')
-	end
-end
-
-desc "Upload packages and signatures"
-task 'package:upload' => ['package', 'package:sign'] do
-	require 'phusion_passenger'
-	version = PhusionPassenger::VERSION_STRING
-
-	signatures = []
-	["passenger-#{version}.gem.asc",
-	 "passenger-#{version}.tar.gz.asc",
-	 "passenger-enterprise-server-#{version}.gem.asc",
-	 "passenger-enterprise-server-#{version}.tar.gz.asc"].each do |name|
-		if File.exist?("pkg/#{name}")
-			signatures << "pkg/#{name}"
-		end
-	end
-	sh "scp #{signatures.join(' ')} app@shell.phusion.nl:/u/apps/signatures/phusion-passenger/"
-
-	if File.exist?("pkg/passenger-#{version}.gem")
-		#sh "gem push pkg/passenger-#{version}.gem"
-	end
-
-	if File.exist?("pkg/passenger-#{version}.tar.gz")
-		puts "--------------"
-		puts "All done. Please upload pkg/passenger-#{version}.tar.gz " +
-			"to RubyForge and update the version number in the Phusion Passenger website."
-	end
-end