passenger 3.0.0 → 3.0.1

data/DEVELOPERS.TXT

@@ -27,7 +27,8 @@ The following software is optional:
 
 Run the following command to compile everything:
 
- rake
+ rake apache
+ rake nginx
 
 == Directory structure
 
@@ -43,7 +44,9 @@ The most important directories are:
 [ ext/common ]
   Source code shared by the Apache and Nginx modules.
 [ bin ]
-  Executables.
+  User executables.
+[ helper-scripts ]
+  Scripts used during runtime, but not directly executed by the user.
 [ doc ]
   Various documentation.
 [ test ]
@@ -62,14 +65,14 @@ Less important directories:
   functionality necessary for writing robust server software. It provides
   things like support for interruptable system calls and portable backtraces
   for C++. Boost was modified to make use of the functionality provided by OXT.
-[ benchmark ]
-  Benchmark tools.
+[ dev ]
+  Tools for Phusion Passenger developers. Not used during production.
+[ resources ]
+  Various resource files, used during production.
 [ debian ]
   Debian packaging files.
 [ man ]
   Man pages.
-[ misc ]
-  Miscellaneous tools.
 [ build ]
   Rake tasks used by the build system.
 

data/NEWS

@@ -1,3 +1,53 @@
+Release 3.0.1
+-------------
+
+ * MUCH faster compilation
+   We've applied code aggregation techniques, allowing Phusion Passenger
+   to be compiled much quicker now. For example, compiling the Nginx
+   component (not Nginx itself) on a MacBook Pro now takes only 29
+   seconds instead of 51 seconds, an improvement of 75%! Compiling the
+   Apache module on a slower Dell Inspiron now takes 39 seconds instead of
+   1 minute 22 seconds, or 110% faster!
+ * Fixed malfunction after web server restart
+   On Linux systems that have a non-standard filesystem on /tmp, Phusion
+   Passenger could malfunction after restarting the web server because of
+   a bug that's only triggered on certain filesystems. Issue #569.
+ * Boost upgraded to version 1.44.0.
+   We were on 1.42.0.
+ * Much improved startup error messages
+   Phusion Passenger performs many extensive checks during startup to ensure
+   integrity. However the error message in some situation could be vague.
+   These startup error messages have now been improved dramatically, so that
+   if something goes wrong during startup you will now more likely know why.
+ * Curl < 7.12.1 is now supported
+   The previous version fails to compile with Curl versions earlier than
+   7.12.1. Issue #556.
+ * passenger-make-enterprisey fixed
+   This is the command that people can run after donating. It allows people
+   to slightly modify Phusion Passenger's display name as a joke. In 3.0.0 it
+   was broken because of a typo. This has been fixed.
+ * Removed passenger-stress-test
+   This tool was used during the early life of Phusion Passenger for stress
+   testing websites. Its performance has never been very good and there are
+   much better tools for stress testing, so this tool has now been removed.
+ * [Apache] RailsEnv and RackEnv configuration options are now equivalent
+   In previous versions, RailsEnv only had effect on Rails 1 and Rails 2 apps
+   while RackEnv only had effect on Rack apps. Because Rails 3 apps are
+   considered Rack apps, setting RailsEnv had no effect on Rails 3 apps.
+   Because this is confusing to users, we've now made RailsEnv and RackEnv
+   equivalent. Issue #579.
+ * [Nginx] Fixed compilation problems on systems with unpowerful shells
+   Most notably Solaris. Its default shell does not support some basic
+   constructs that we used in the Nginx configure script.
+ * [Nginx] Upgraded default Nginx version to to 0.8.53
+   The previous default was 0.8.52.
+ * [Nginx] passenger_enabled now only accepts 'on' or 'off' values
+   Previously it would recognize any value not equal to 'on' as meaning
+   'off'. This caused confusion among users who thought they could also
+   specify 'true', so we now throw a proper error if the value is
+   unrecognized. Fixes issue #583.
+
+
 Release 3.0.0
 -------------
 

data/Rakefile

@@ -20,9 +20,9 @@ source_root = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(source_root)
 $LOAD_PATH.unshift("#{source_root}/lib")
 
+require "#{source_root}/config" if File.exist?("#{source_root}/config.rb")
 require 'build/basics'
 require 'build/config'
-require "#{source_root}/config" if File.exist?("#{source_root}/config.rb")
 require 'build/common_library'
 require 'build/ruby_extension'
 require 'build/agents'
@@ -36,6 +36,7 @@ require 'build/cxx_tests'
 require 'build/ruby_tests'
 require 'build/integration_tests'
 require 'build/misc'
+require 'build/rpm'
 
 
 #### Default tasks

data/bin/passenger-install-apache2-module

@@ -154,11 +154,11 @@ private
 		color_puts '<banner>Compiling and installing Apache 2 module...</banner>'
 		puts "cd #{PASSENGER_ROOT}"
 		if ENV['TRACE']
-			puts "#{PlatformInfo.rake_command} --trace clean apache2"
-			return sh("#{PlatformInfo.rake_command} --trace apache2:clean apache2 CACHING=no")
+			puts "#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes"
+			return sh("#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes")
 		else
-			puts "#{PlatformInfo.rake_command} clean apache2"
-			return sh("#{PlatformInfo.rake_command} apache2:clean apache2 CACHING=no")
+			puts "#{PlatformInfo.rake_command} apache2:clean apache2 RELEASE=yes"
+			return sh("#{PlatformInfo.rake_command} apache2:clean apache2 RELEASE=yes")
 		end
 	end
 	

data/bin/passenger-install-nginx-module

@@ -127,7 +127,7 @@ private
 	def compile_passenger_support_files
 		new_screen
 		color_puts "<banner>Compiling Passenger support files...</banner>"
-		return sh("#{PlatformInfo.rake_command} nginx:clean nginx CACHING=no")
+		return sh("#{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
 	end
 	
 	def should_we_download_and_install_nginx_automatically?

data/bin/passenger-make-enterprisey

@@ -67,7 +67,7 @@ else
 			STDERR.puts "Invalid key given. Please try again:"
 		end
 	end
-	if natively_packaged?
+	if PhusionPassenger.natively_packaged?
 		enterprise_file = "/etc/passenger_enterprisey.txt"
 	else
 		enterprise_file = "#{SOURCE_ROOT}/enterprisey.txt"

data/build/agents.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 dependencies = [
 	'ext/common/Watchdog.cpp',
@@ -22,9 +29,9 @@ dependencies = [
 	LIBBOOST_OXT,
 	LIBCOMMON
 ]
-file 'agents/PassengerWatchdog' => dependencies do
-	sh "mkdir -p agents" if !File.directory?("agents")
-	create_executable('agents/PassengerWatchdog',
+file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
+	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 		'ext/common/Watchdog.cpp',
 		"-Iext -Iext/common #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
 		"#{LIBCOMMON} " <<
@@ -50,9 +57,9 @@ dependencies = [
 	LIBBOOST_OXT,
 	:libev
 ]
-file 'agents/PassengerLoggingAgent' => dependencies do
-	sh "mkdir -p agents" if !File.directory?("agents")
-	create_executable('agents/PassengerLoggingAgent',
+file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
+	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	create_executable(AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
 		'ext/common/LoggingAgent/Main.cpp',
 		"-Iext -Iext/common #{LIBEV_CFLAGS} " <<
 		"#{PlatformInfo.curl_flags} " <<
@@ -68,6 +75,6 @@ file 'agents/PassengerLoggingAgent' => dependencies do
 		"#{EXTRA_LDFLAGS}")
 end
 
-task :clean => 'common:clean' do
-	sh "rm -f agents/PassengerWatchdog agents/PassengerLoggingAgent"
+task 'common:clean' do
+	sh "rm -f #{AGENT_OUTPUT_DIR}PassengerWatchdog #{AGENT_OUTPUT_DIR}PassengerLoggingAgent"
 end

data/build/apache2.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 
 # apxs totally sucks. We couldn't get it working correctly
@@ -22,18 +29,17 @@
 #
 # Oh, and libtool sucks too. Do we even need it anymore in 2008?
 
-APACHE2_MODULE_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
-	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+APACHE2_MODULE = APACHE2_OUTPUT_DIR + "mod_passenger.so"
 APACHE2_MODULE_INPUT_FILES = {
-	'ext/apache2/Configuration.o' => %w(
+	APACHE2_OUTPUT_DIR + 'Configuration.o' => %w(
 		ext/apache2/Configuration.cpp
 		ext/apache2/Configuration.h
 		ext/apache2/Configuration.hpp
 		ext/common/Constants.h),
-	'ext/apache2/Bucket.o' => %w(
+	APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
 		ext/apache2/Bucket.cpp
 		ext/apache2/Bucket.h),
-	'ext/apache2/Hooks.o' => %w(
+	APACHE2_OUTPUT_DIR + 'Hooks.o' => %w(
 		ext/apache2/Hooks.cpp
 		ext/apache2/Hooks.h
 		ext/apache2/Configuration.h
@@ -57,23 +63,26 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/common/Utils/Timer.h)
 }
 APACHE2_MODULE_OBJECTS = APACHE2_MODULE_INPUT_FILES.keys
+APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
 
+APACHE2_MODULE_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 APACHE2_HELPER_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
-	"ext/apache2/module_libboost_oxt",
+	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
 APACHE2_MODULE_COMMON_LIBRARY    = define_common_library_task("apache2",
-	"ext/apache2/module_libpassenger_common",
+	APACHE2_OUTPUT_DIR + "module_libpassenger_common",
 	PlatformInfo.apache2_module_cflags)
 
 
 desc "Build Apache 2 module"
 task :apache2 => [
-	'ext/apache2/mod_passenger.so',
-	'agents/apache2/PassengerHelperAgent',
-	'agents/PassengerWatchdog',
-	'agents/PassengerLoggingAgent',
+	APACHE2_MODULE,
+	AGENT_OUTPUT_DIR + 'apache2/PassengerHelperAgent',
+	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
+	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
 	:native_support
 ]
 
@@ -82,9 +91,8 @@ task :apache2 => [
 APACHE2_MODULE_INPUT_FILES.each_pair do |target, sources|
 	file(target => sources) do
 		object_basename = File.basename(target)
-		compile_cxx(sources[0],
-			APACHE2_MODULE_CXXFLAGS +
-			" -o ext/apache2/#{object_basename}")
+		object_filename = APACHE2_OUTPUT_DIR + object_basename
+		compile_cxx(sources[0], "#{APACHE2_MODULE_CXXFLAGS} -o #{object_filename}")
 	end
 end
 
@@ -92,17 +100,15 @@ end
 dependencies = [
 	APACHE2_MODULE_COMMON_LIBRARY,
 	APACHE2_MODULE_BOOST_OXT_LIBRARY,
-	'ext/apache2/mod_passenger.o',
+	APACHE2_MOD_PASSENGER_O,
 	APACHE2_MODULE_OBJECTS
 ].flatten
-file 'ext/apache2/mod_passenger.so' => dependencies do
+file APACHE2_MODULE => dependencies do
 	PlatformInfo.apxs2.nil?      and raise "Could not find 'apxs' or 'apxs2'."
 	PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
 	PlatformInfo.httpd.nil?      and raise "Could not find the Apache web server binary."
 	
-	sources = APACHE2_MODULE_OBJECTS.join(' ')
-	sources << ' ext/apache2/mod_passenger.o'
-	
+	sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
 	linkflags =
 		"#{PlatformInfo.apache2_module_cflags} " <<
 		"#{PlatformInfo.portability_cflags} " <<
@@ -113,14 +119,12 @@ file 'ext/apache2/mod_passenger.so' => dependencies do
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{EXTRA_LDFLAGS} "
 	
-	create_shared_library('ext/apache2/mod_passenger.so',
-		sources, linkflags)
+	create_shared_library(APACHE2_MODULE, sources, linkflags)
 end
 
-file 'ext/apache2/mod_passenger.o' => ['ext/apache2/mod_passenger.c'] do
+file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
 	compile_c('ext/apache2/mod_passenger.c',
-		APACHE2_MODULE_CXXFLAGS +
-		" -o ext/apache2/mod_passenger.o")
+		"#{APACHE2_MODULE_CXXFLAGS} -o #{APACHE2_MOD_PASSENGER_O}")
 end
 
 dependencies = [
@@ -140,9 +144,10 @@ dependencies = [
 	LIBCOMMON,
 	LIBBOOST_OXT
 ]
-file 'agents/apache2/PassengerHelperAgent' => dependencies do
-	sh "mkdir -p agents/apache2" if !File.directory?("agents/apache2")
-	create_executable('agents/apache2/PassengerHelperAgent',
+file AGENT_OUTPUT_DIR + 'apache2/PassengerHelperAgent' => dependencies do
+	dir = "#{AGENT_OUTPUT_DIR}apache2"
+	sh "mkdir -p #{dir}" if !File.directory?(dir)
+	create_executable("#{dir}/PassengerHelperAgent",
 		'ext/apache2/HelperAgent.cpp',
 		"#{APACHE2_HELPER_CXXFLAGS} " <<
 		"#{LIBCOMMON} " <<
@@ -154,12 +159,10 @@ end
 
 task :clean => 'apache2:clean'
 desc "Clean all compiled Apache 2 files"
-task 'apache2:clean' do
-	files = [APACHE2_MODULE_OBJECTS]
-	files += %w(
-		ext/apache2/mod_passenger.o
-		ext/apache2/mod_passenger.so
-		agents/apache2/PassengerHelperAgent
-	)
-	sh("rm", "-rf", *files.flatten)
+task 'apache2:clean' => 'common:clean' do
+	files = APACHE2_MODULE_OBJECTS.dup
+	files << APACHE2_MOD_PASSENGER_O
+	files << APACHE2_MODULE
+	files << AGENT_OUTPUT_DIR + "PassengerHelperAgent"
+	sh("rm", "-rf", *files)
 end

data/build/basics.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2010  Phusion
+#  Copyright (c) 2010 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
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 require 'rubygems'
 require 'pathname'
@@ -59,6 +66,19 @@ end
 
 #################################################
 
+if string_option('OUTPUT_DIR')
+	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
+else
+	OUTPUT_DIR = ""
+end
+AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"
+COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "ext/common") + "/"
+APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "ext/apache2") + "/"
+LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "ext/libev") + "/"
+ruby_extension_archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
+	OUTPUT_DIR + "ext/ruby/" + ruby_extension_archdir) + "/"
+
 LIBEXT = PlatformInfo.library_extension
 
 # Extra linker flags for backtrace_symbols() to generate useful output (see AgentsBase.cpp).
@@ -76,6 +96,10 @@ if boolean_option('STDERR_TO_STDOUT')
 	$stderr = $stdout
 end
 
-if boolean_option('CACHING', true)
-	PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
+if boolean_option('CACHING', true) && !boolean_option('RELEASE')
+	if OUTPUT_DIR.empty?
+		PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
+	else
+		PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
+	end
 end